diff options
| author | Teus Benschop <teusjannette@gmail.com> | 2018-10-28 11:51:26 +0100 |
|---|---|---|
| committer | Teus Benschop <teusjannette@gmail.com> | 2018-10-28 11:51:26 +0100 |
| commit | 1d0ff54794b5edea7cdf1d2d66710a0fa885bcc5 (patch) | |
| tree | 8ece5f9ef437fbb151f2b22ed0c6e1a714879c7c | |
| parent | c7dbdc9161a7c460526b80fe01af49d714856126 (diff) | |
New upstream version 1.8.1
652 files changed, 46208 insertions, 25774 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 993a996..5cbd06a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # # NOTES: Defaults to build type of Shared # Forces out-of-source tree build -# +# # # This file started on 18 January 2010 by Gregory Hellings # It is ceded to The SWORD Library developers and CrossWire under the terms @@ -14,7 +14,7 @@ # not, then this file is released under the GPLv2 by myself. PROJECT(libsword CXX C) CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) -SET(SWORD_VERSION 1.7.4) +SET(SWORD_VERSION 1.8.1) # Make sure it's an out-of-stream build IF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) @@ -32,6 +32,8 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/options.cmake") # Source variables INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/sources.cmake") +# Cppcheck +INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CppcheckTargets.cmake") # Our local includes INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/include") # For swversion.h INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/include") # For everything else @@ -59,8 +61,6 @@ ELSE(MSVC) ENDIF(MSVC) FIND_PACKAGE(CLucene QUIET) FIND_PACKAGE(ZLIB QUIET) -FIND_PACKAGE(ICU QUIET) -FIND_PACKAGE(CURL QUIET) FIND_PACKAGE(PkgConfig QUIET) FIND_PACKAGE(Regex QUIET) @@ -79,8 +79,12 @@ INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/muxsources.cmake) # Most of the work for configuration is done above, already. # # I want to do this manually, there might be reason in the future +SET(CPPCHECK_POSSIBLEERROR_ARG "--enable=all") IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*" OR NOT LIBSWORD_LIBRARY_TYPE) ADD_LIBRARY(sword SHARED ${sword_SOURCES}) + ADD_CPPCHECK(sword + POSSIBLE_ERROR TRUE + FORCE TRUE) MESSAGE(STATUS "Building Shared library.") SET(BUILDING_SHARED 1) SET(SWORD_LINK_NAME sword) @@ -88,6 +92,9 @@ ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*" OR NOT LIBSWORD_LIBRARY_TYPE) IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE) ADD_LIBRARY(sword_static STATIC ${sword_SOURCES}) + ADD_CPPCHECK(sword_static + POSSIBLE_ERROR TRUE + FORCE TRUE) SET_TARGET_PROPERTIES(sword_static PROPERTIES COMPILE_FLAGS "-fPIC") SET(BUILDING_STATIC 1) # Defaults to linking against the shared if it is also being built @@ -99,7 +106,7 @@ IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE) # same exact name. In other systems, the .a and .so suffixes suffice # to keep them separate IF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") - SET_TARGET_PROPERTIES(sword_static PROPERTIES + SET_TARGET_PROPERTIES(sword_static PROPERTIES OUTPUT_NAME "sword") #MESSAGE(STATUS "Building Static library with name sword") ELSE(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") @@ -187,6 +194,14 @@ IF(WITH_ZLIB) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ZLIB_LIBRARY}) ENDIF(WITH_ZLIB) +IF(WITH_BZIP2) + INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) + SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${BZIP2_LIBRARY}) +ENDIF(WITH_BZIP2) +IF(WITH_XZ) + INCLUDE_DIRECTORIES(${XZ_INCLUDE_DIR}) + SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${XZ_LIBRARY}) +ENDIF(WITH_XZ) IF(WITH_CURL) FIND_PROGRAM(CURL_CONFIG curl-config DOC "The curl-config executable path, used to determine SFTP support.") @@ -248,7 +263,7 @@ ADD_DEFINITIONS(-D_FTPLIB_NO_COMPAT) ############################################################################################# # Platform-specifc bits that I will eventually refactor out into their own files, once I am happy # with the stuff that is here. -# +# IF(APPLE OR iPhone) ADD_DEFINITIONS(-Dunix) ENDIF(APPLE OR iPhone) @@ -266,7 +281,7 @@ ENDIF(BUILDING_STATIC) ############################################################################################## # Installing the library, headers, utilies, etc -# +# INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake") @@ -280,7 +295,7 @@ ENDIF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS) ############################################################################################## # Utilities are hawt -# +# IF(NOT SWORD_BUILD_UTILS STREQUAL "No") ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/utilities") @@ -288,7 +303,7 @@ ENDIF(NOT SWORD_BUILD_UTILS STREQUAL "No") ############################################################################################## # Demos are also hawt -# +# IF(SWORD_BUILD_EXAMPLES STREQUAL "Yes") ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/examples/cmdline") @@ -1,19 +1,64 @@ API ChangeLog + +01-Nov-2017 Troy A. Griffitts <scribe@crosswire.org> + Added bindings: Android and cordova + +01-Sep-2017 Troy A. Griffitts <scribe@crosswire.org> + Adding French mapping data. + Patch submitted by domcox <dominique@corbex.org> + +21-May-2017 Troy A. Griffitts <scribe@crosswire.org> + Added --with-icuregex option to use ICU regex engine + +24-Apr-2017 Troy A. Griffitts <scribe@crosswire.org> + Branching 1.8.x + +16-Apr-2016 Troy A. Griffitts <scribe@crosswire.org> + Added working --chapter --verse decrementors across Testament + Added handling of more odd double colon verse reference texts + Removed deprecated utility cipherraw; use mod2zmod w/ cipherkey + or osis2mod -c instead. + Added new tests to testsuite for mod2zmod and osis2mod with cipher + +18-Dec-2015 Peter von Kaehne <refdoc@crosswire.org> + Added image and table handling to TEI latex + Added image handling to TEI RTF + +18-Dec-2015 Peter von Kaehne <refdoc@crosswire.org> + Added image and table handling to TEI xhtml and htmlhref filters + contributed by Dominique Corbex <dominique.corbex@gmail.com> + 15-Dec-2014 DM Smith <dmsmith@crosswire.org> Fixed endless loop in osis2mod for some inputs. 15-Dec-2014 DM Smith <dmsmith@crosswire.org> Added support for Psalm Book divisions using <div type=majorSection> - from GHellings + from GHellings 03-Dec-2014 Karl Kleinpaste <charcoal@users.sf.net> Corrected anomalous OSIS highlighting output w/GHellings' patches in src/modules/filters/osis{plain,xhtml}.cpp +12-Jul-2014 Костя Маслюк <kostyamaslyuk@gmail.com> + Versification mapping implementation and example at + examples/tasks/parallelbibles.cpp + 27-Apr-2014 Troy A. Griffitts <scribe@crosswire.org> Added C# bindings contributed by Daniel Hughes <trampster@gmail.com> +17-Mar-2014 Chris Little <chrislit@crosswire.org> + Added zVerse4, zText4, & zCom4 classes to support compressed text/ + commentary modules with entry sizes > 64k + +3-Mar-2014 Chris Little <chrislit@crosswire.org> + Added support for bzip2 (Burrows-Wheeler) module compression via libbz2 + Added support for xz (LZMA2) module compression via liblzma + +30-Dec-2013 Peter von Kaehne <refdoc@crosswire.org> + Added LaTeX output filters + + * Release 1.7.0 * 5-Oct-2013 Troy A. Griffitts <scribe@crosswire.org> diff --git a/Makefile.am b/Makefile.am index 5d74eac..d75b351 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,18 +60,17 @@ restore: install: install-recursive @echo "" - @echo "sword is installed." + @echo "SWORD is installed." @echo "" - @echo "if this is your first time, you may need a basic global" - @echo "configuration file. one can be generated to $(DESTDIR)$(sysconfdir)/sword.conf" - @echo "by typing: \"make install_config\"" + @echo "If this is your first time, you may need a basic global" + @echo "configuration file. One can be generated to $(DESTDIR)$(sysconfdir)/sword.conf" + @echo "by typing: \"sudo make install_config\"" @echo "" - @echo "modules (Bibles, etc.), may then be unzipped to $(pkgdatadir)/" + @echo "Modules (Bibles, etc.), may then be unzipped to $(pkgdatadir)/" + @echo "or installed with the command line tool: installmgr" @echo "" - @echo "type \"make register\" to help us keep track of how many" - @echo "people are using sword." - @echo "(you may consider exiting from 'root', first, to make this" - @echo "a little more personal)" + @echo "Type \"make register\" to help us keep track of how many" + @echo "people are using SWORD." @echo "" @@ -92,6 +91,12 @@ install_config: @echo "[Install]" > $(DESTDIR)$(sysconfdir)/sword.conf @echo "DataPath=$(pkgdatadir)/" >> $(DESTDIR)$(sysconfdir)/sword.conf @echo "sword.conf generated" + @echo "" + @echo "You can now try to install modules with installmgr, e.g.," + @echo "sudo installmgr -sc -r CrossWire -ri CrossWire KJV" + @echo "" + @echo "Run installmgr with no options for help." + dist-hook: diff --git a/Makefile.in b/Makefile.in index 7b95703..3083f4c 100644 --- a/Makefile.in +++ b/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. @@ -87,7 +87,7 @@ DIST_COMMON = $(srcdir)/locales.d/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(top_srcdir)/include/config.h.in $(srcdir)/sword.pc.in \ $(top_srcdir)/include/swversion.h.in $(srcdir)/sword.spec.in \ - depcomp AUTHORS COPYING ChangeLog INSTALL NEWS README compile \ + depcomp AUTHORS COPYING ChangeLog INSTALL NEWS README \ config.guess config.sub install-sh missing ltmain.sh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -416,9 +416,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 ACLOCAL_AMFLAGS = -I m4 @@ -487,8 +489,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): include/config.h: include/stamp-h1 - @test -f $@ || rm -f include/stamp-h1 - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1 + @if test ! -f $@; then rm -f include/stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1; else :; fi include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status @rm -f include/stamp-h1 @@ -790,16 +792,10 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -841,10 +837,9 @@ distcheck: dist && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1081,18 +1076,17 @@ restore: install: install-recursive @echo "" - @echo "sword is installed." + @echo "SWORD is installed." @echo "" - @echo "if this is your first time, you may need a basic global" - @echo "configuration file. one can be generated to $(DESTDIR)$(sysconfdir)/sword.conf" - @echo "by typing: \"make install_config\"" + @echo "If this is your first time, you may need a basic global" + @echo "configuration file. One can be generated to $(DESTDIR)$(sysconfdir)/sword.conf" + @echo "by typing: \"sudo make install_config\"" @echo "" - @echo "modules (Bibles, etc.), may then be unzipped to $(pkgdatadir)/" + @echo "Modules (Bibles, etc.), may then be unzipped to $(pkgdatadir)/" + @echo "or installed with the command line tool: installmgr" @echo "" - @echo "type \"make register\" to help us keep track of how many" - @echo "people are using sword." - @echo "(you may consider exiting from 'root', first, to make this" - @echo "a little more personal)" + @echo "Type \"make register\" to help us keep track of how many" + @echo "people are using SWORD." @echo "" install-data-am: installlocaleDATA installmodsDATA install-pkgconfigDATA @@ -1111,6 +1105,11 @@ install_config: @echo "[Install]" > $(DESTDIR)$(sysconfdir)/sword.conf @echo "DataPath=$(pkgdatadir)/" >> $(DESTDIR)$(sysconfdir)/sword.conf @echo "sword.conf generated" + @echo "" + @echo "You can now try to install modules with installmgr, e.g.," + @echo "sudo installmgr -sc -r CrossWire -ri CrossWire KJV" + @echo "" + @echo "Run installmgr with no options for help." dist-hook: (cd $(distdir) && ./autogen.sh) @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -220,21 +220,6 @@ m4_popdef([pkg_default]) m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -247,10 +232,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,7 +251,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -633,12 +618,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -m4_define([AC_PROG_CC], -m4_defn([AC_PROG_CC]) -[_AM_PROG_CC_C_O -]) - # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -747,48 +726,7 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl - -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) - fi -fi]) +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -796,6 +734,7 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -1042,70 +981,6 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_PROG_CC_C_O -# --------------- -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -# to automatically call this. -AC_DEFUN([_AM_PROG_CC_C_O], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -AC_LANG_PUSH([C])dnl -AC_CACHE_CHECK( - [whether $CC understands -c and -o together], - [am_cv_prog_cc_c_o], - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i]) -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -AC_LANG_POP([C])]) - -# For backward compatibility. -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) - # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -2,7 +2,7 @@ #****************************************************************************** # Convenience script specifying ARM options to ./configure # -# $Id: arminst.sh 2327 2009-04-22 11:42:33Z scribe $ +# $Id: arminst.sh 3063 2014-03-04 13:04:11Z chrislit $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society diff --git a/bindings/Android/Makefile b/bindings/Android/Makefile new file mode 100644 index 0000000..33ccb06 --- /dev/null +++ b/bindings/Android/Makefile @@ -0,0 +1,14 @@ +all: javawrapper + cp -a SWORD/app/build/intermediates/transforms/stripDebugSymbol/release/0/lib/* ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/ + +debug: javawrapper + cp -a SWORD/app/build/intermediates/cmake/debug/obj/* ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/ + +javawrapper: + cp -a SWORD/app/src/main/java/org/crosswire/android/sword/* ../cordova/org.crosswire.sword.cordova.SWORD/src/android/ + +clean: + #these are from ../java-jni + rm SWORD/app/src/main/java/org/crosswire/android/sword/InstallMgr.java SWORD/app/src/main/java/org/crosswire/android/sword/SWMgr.java SWORD/app/src/main/java/org/crosswire/android/sword/SWModule.java + + diff --git a/bindings/Android/README b/bindings/Android/README new file mode 100644 index 0000000..2714e53 --- /dev/null +++ b/bindings/Android/README @@ -0,0 +1,25 @@ +This folder contains Android bindings based on the java-jni bindings. + +The first step to building these bindings is to build the java-jni/ +bindings. These bindings use code generated from there. +See the ../java-jni README before continuing. + +There is an Android Studio project here under SWORD/ + +This Android Studio project should be used to build the NDK +native code here. + +After that, a make in this folder will copy the native libs +to the ../cordova/ bindings to produce a working cordova plugin + +The steps to build all of this are usually: +1) make in the ../java-jni bindings folder +2) build all in SWORD Android Studio project +3) a make in this folder, which finally copies the binary libs + to the ../cordova/ bindings folder to produce a working + cordova plugin + +Android java bindings can be used after step 2 +cordova javascript bindings can be used after step 3 + +Hope this helps get you started. Let me know your progress! diff --git a/bindings/Android/SWORD/.gitignore b/bindings/Android/SWORD/.gitignore new file mode 100644 index 0000000..39fb081 --- /dev/null +++ b/bindings/Android/SWORD/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/bindings/Android/SWORD/.idea/codeStyleSettings.xml b/bindings/Android/SWORD/.idea/codeStyleSettings.xml new file mode 100644 index 0000000..719bb8b --- /dev/null +++ b/bindings/Android/SWORD/.idea/codeStyleSettings.xml @@ -0,0 +1,228 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectCodeStyleSettingsManager"> + <option name="PER_PROJECT_SETTINGS"> + <value> + <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> + <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> + <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND"> + <value /> + </option> + <option name="IMPORT_LAYOUT_TABLE"> + <value> + <package name="android" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="com" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="junit" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="net" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="org" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="java" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="javax" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="" withSubpackages="true" static="true" /> + <emptyLine /> + </value> + </option> + <option name="RIGHT_MARGIN" value="100" /> + <AndroidXmlCodeStyleSettings> + <option name="USE_CUSTOM_SETTINGS" value="true" /> + </AndroidXmlCodeStyleSettings> + <Objective-C-extensions> + <file> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" /> + </file> + <class> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" /> + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" /> + </class> + <extensions> + <pair source="cpp" header="h" /> + <pair source="c" header="h" /> + </extensions> + </Objective-C-extensions> + <XML> + <option name="XML_KEEP_LINE_BREAKS" value="false" /> + <option name="XML_ALIGN_ATTRIBUTES" value="false" /> + <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" /> + </XML> + <codeStyleSettings language="XML"> + <option name="FORCE_REARRANGE_MODE" value="1" /> + <indentOptions> + <option name="CONTINUATION_INDENT_SIZE" value="4" /> + </indentOptions> + <arrangement> + <rules> + <section> + <rule> + <match> + <AND> + <NAME>xmlns:android</NAME> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>xmlns:.*</NAME> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:id</NAME> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:name</NAME> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>name</NAME> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>style</NAME> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*</NAME> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:layout_width</NAME> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:layout_height</NAME> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:layout_.*</NAME> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:width</NAME> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:height</NAME> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*</NAME> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*</NAME> + <XML_NAMESPACE>.*</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + </rules> + </arrangement> + </codeStyleSettings> + </value> + </option> + <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" /> + </component> +</project>
\ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/compiler.xml b/bindings/Android/SWORD/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/bindings/Android/SWORD/.idea/compiler.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="CompilerConfiguration"> + <resourceExtensions /> + <wildcardResourcePatterns> + <entry name="!?*.java" /> + <entry name="!?*.form" /> + <entry name="!?*.class" /> + <entry name="!?*.groovy" /> + <entry name="!?*.scala" /> + <entry name="!?*.flex" /> + <entry name="!?*.kt" /> + <entry name="!?*.clj" /> + <entry name="!?*.aj" /> + </wildcardResourcePatterns> + <annotationProcessing> + <profile default="true" name="Default" enabled="false"> + <processorPath useClasspath="true" /> + </profile> + </annotationProcessing> + </component> +</project>
\ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/copyright/profiles_settings.xml b/bindings/Android/SWORD/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/bindings/Android/SWORD/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ +<component name="CopyrightManager"> + <settings default="" /> +</component>
\ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/gradle.xml b/bindings/Android/SWORD/.idea/gradle.xml new file mode 100644 index 0000000..96b6a99 --- /dev/null +++ b/bindings/Android/SWORD/.idea/gradle.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="GradleSettings"> + <option name="linkedExternalProjectsSettings"> + <GradleProjectSettings> + <option name="distributionType" value="DEFAULT_WRAPPED" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="modules"> + <set> + <option value="/data/home/scribe/src/sword/bindings/Android/SWORD" /> + <option value="/data/home/scribe/src/sword/bindings/Android/SWORD/app" /> + </set> + </option> + <option name="resolveModulePerSourceSet" value="false" /> + </GradleProjectSettings> + </option> + </component> +</project>
\ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/misc.xml b/bindings/Android/SWORD/.idea/misc.xml new file mode 100644 index 0000000..bac5576 --- /dev/null +++ b/bindings/Android/SWORD/.idea/misc.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="NullableNotNullManager"> + <option name="myDefaultNullable" value="android.support.annotation.Nullable" /> + <option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> + <option name="myNullables"> + <value> + <list size="4"> + <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> + <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> + <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> + <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> + </list> + </value> + </option> + <option name="myNotNulls"> + <value> + <list size="4"> + <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" /> + <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" /> + <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" /> + <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" /> + </list> + </value> + </option> + </component> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/build/classes" /> + </component> + <component name="ProjectType"> + <option name="id" value="Android" /> + </component> + <component name="SvnBranchConfigurationManager"> + <option name="mySupportsUserInfoFilter" value="true" /> + </component> + <component name="masterDetails"> + <states> + <state key="ProjectJDKs.UI"> + <settings> + <last-edited>Android API 24 Platform</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + </states> + </component> +</project>
\ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/modules.xml b/bindings/Android/SWORD/.idea/modules.xml new file mode 100644 index 0000000..8baebac --- /dev/null +++ b/bindings/Android/SWORD/.idea/modules.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file:///data/home/scribe/src/sword/bindings/Android/SWORD/SWORD.iml" filepath="/data/home/scribe/src/sword/bindings/Android/SWORD/SWORD.iml" /> + <module fileurl="file:///data/home/scribe/src/sword/bindings/Android/SWORD/app/app.iml" filepath="/data/home/scribe/src/sword/bindings/Android/SWORD/app/app.iml" /> + </modules> + </component> +</project>
\ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/runConfigurations.xml b/bindings/Android/SWORD/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/bindings/Android/SWORD/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="RunConfigurationProducerService"> + <option name="ignoredProducers"> + <set> + <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" /> + <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" /> + <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" /> + </set> + </option> + </component> +</project>
\ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/vcs.xml b/bindings/Android/SWORD/.idea/vcs.xml new file mode 100644 index 0000000..45cf85c --- /dev/null +++ b/bindings/Android/SWORD/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="" vcs="svn" /> + </component> +</project>
\ No newline at end of file diff --git a/bindings/Android/SWORD/app/.gitignore b/bindings/Android/SWORD/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/bindings/Android/SWORD/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/bindings/Android/SWORD/app/CMakeLists.txt b/bindings/Android/SWORD/app/CMakeLists.txt new file mode 100644 index 0000000..d9625aa --- /dev/null +++ b/bindings/Android/SWORD/app/CMakeLists.txt @@ -0,0 +1,221 @@ +# For more information about using CMake with Android Studio, read the +# documentation: https://d.android.com/studio/projects/add-native-code.html + +# Sets the minimum version of CMake required to build the native library. + +cmake_minimum_required(VERSION 3.4.1) + +#SET(NDK_DEBUG 0) +SET(CMAKE_C_FLAGS "-D__unix__ ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-D_FTPLIB_NO_COMPAT ${CMAKE_C_FLAGS}") + +SET(CMAKE_C_FLAGS "-Wno-invalid-source-encoding ${CMAKE_C_FLAGS}") + + +SET(CMAKE_C_FLAGS "-DOS_ANDROID ${CMAKE_C_FLAGS}") + +SET(CMAKE_C_FLAGS "-fvisibility=hidden ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-DSTDC_HEADERS ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-Dunix ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-DANDROID ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-DEXCLUDEBZIP2 ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-DEXCLUDEXZ ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-DEXCLUDEXZ ${CMAKE_C_FLAGS}") + +#SET(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS}") +#SET(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS}") + +# Creates and names a library, sets it as either STATIC +# or SHARED, and provides the relative paths to its source code. +# You can define multiple libraries, and CMake builds them for you. +# Gradle automatically packages shared libraries with your APK. + +SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") + +add_library( # Sets the name of the library. + sword + + # Sets the library as a shared library. + SHARED + + # Provides a relative path to your source file(s). + src/main/cpp/jni/swordstub.cpp + ../../../../src/utilfuns/swversion.cpp + ../../../../src/modules/comments/zcom/zcom.cpp + ../../../../src/modules/comments/zcom4/zcom4.cpp + ../../../../src/modules/comments/rawfiles/rawfiles.cpp + ../../../../src/modules/comments/rawcom4/rawcom4.cpp + ../../../../src/modules/comments/rawcom/rawcom.cpp + ../../../../src/modules/comments/swcom.cpp + ../../../../src/modules/comments/hrefcom/hrefcom.cpp + ../../../../src/modules/swmodule.cpp + ../../../../src/modules/tests/echomod.cpp + ../../../../src/modules/genbook/swgenbook.cpp + ../../../../src/modules/genbook/rawgenbook/rawgenbook.cpp + ../../../../src/modules/lexdict/swld.cpp + ../../../../src/modules/lexdict/rawld4/rawld4.cpp + ../../../../src/modules/lexdict/zld/zld.cpp + ../../../../src/modules/lexdict/rawld/rawld.cpp + ../../../../src/modules/texts/rawtext/rawtext.cpp + ../../../../src/modules/texts/rawtext4/rawtext4.cpp + ../../../../src/modules/texts/swtext.cpp + ../../../../src/modules/texts/ztext/ztext.cpp + ../../../../src/modules/texts/ztext4/ztext4.cpp + ../../../../src/modules/common/rawstr4.cpp + ../../../../src/modules/common/lzsscomprs.cpp + ../../../../src/modules/common/zipcomprs.cpp + ../../../../src/modules/common/rawverse4.cpp + ../../../../src/modules/common/swcipher.cpp + ../../../../src/modules/common/swcomprs.cpp + ../../../../src/modules/common/rawverse.cpp + ../../../../src/modules/common/sapphire.cpp + ../../../../src/modules/common/zstr.cpp + ../../../../src/modules/common/entriesblk.cpp + ../../../../src/modules/common/zverse.cpp + ../../../../src/modules/common/zverse4.cpp + ../../../../src/modules/common/rawstr.cpp + ../../../../src/modules/filters/gbfwordjs.cpp + ../../../../src/modules/filters/utf8latin1.cpp + ../../../../src/modules/filters/utf8greekaccents.cpp + ../../../../src/modules/filters/utf16utf8.cpp + ../../../../src/modules/filters/gbfwebif.cpp + ../../../../src/modules/filters/utf8transliterator.cpp + ../../../../src/modules/filters/gbfstrongs.cpp + ../../../../src/modules/filters/thmlhtmlhref.cpp + ../../../../src/modules/filters/thmlxhtml.cpp + ../../../../src/modules/filters/thmlgbf.cpp + ../../../../src/modules/filters/utf8utf16.cpp + ../../../../src/modules/filters/utf8cantillation.cpp + ../../../../src/modules/filters/utf8arshaping.cpp + ../../../../src/modules/filters/cipherfil.cpp + ../../../../src/modules/filters/thmlheadings.cpp + ../../../../src/modules/filters/thmlscripref.cpp + ../../../../src/modules/filters/latin1utf8.cpp + ../../../../src/modules/filters/gbfhtml.cpp + ../../../../src/modules/filters/thmlosis.cpp + ../../../../src/modules/filters/utf8nfkd.cpp + ../../../../src/modules/filters/thmlstrongs.cpp + ../../../../src/modules/filters/osisenum.cpp + ../../../../src/modules/filters/osisfootnotes.cpp + ../../../../src/modules/filters/osisglosses.cpp + ../../../../src/modules/filters/osisheadings.cpp + ../../../../src/modules/filters/osishtmlhref.cpp + ../../../../src/modules/filters/osislemma.cpp + ../../../../src/modules/filters/osismorph.cpp + ../../../../src/modules/filters/osismorphsegmentation.cpp + ../../../../src/modules/filters/osisosis.cpp + ../../../../src/modules/filters/osisplain.cpp + ../../../../src/modules/filters/osisredletterwords.cpp + ../../../../src/modules/filters/osisrtf.cpp + ../../../../src/modules/filters/osisscripref.cpp + ../../../../src/modules/filters/osisstrongs.cpp + ../../../../src/modules/filters/osisvariants.cpp + ../../../../src/modules/filters/osiswebif.cpp + ../../../../src/modules/filters/osiswordjs.cpp + ../../../../src/modules/filters/osisxhtml.cpp + ../../../../src/modules/filters/osisxlit.cpp + ../../../../src/modules/filters/osisreferencelinks.cpp + ../../../../src/modules/filters/thmlmorph.cpp + ../../../../src/modules/filters/gbfplain.cpp + ../../../../src/modules/filters/gbfhtmlhref.cpp + ../../../../src/modules/filters/gbfxhtml.cpp + ../../../../src/modules/filters/utf8html.cpp + ../../../../src/modules/filters/utf8nfc.cpp + ../../../../src/modules/filters/rtfhtml.cpp + ../../../../src/modules/filters/gbfredletterwords.cpp + ../../../../src/modules/filters/latin1utf16.cpp + ../../../../src/modules/filters/thmlhtml.cpp + ../../../../src/modules/filters/gbfthml.cpp + ../../../../src/modules/filters/teihtmlhref.cpp + ../../../../src/modules/filters/teixhtml.cpp + ../../../../src/modules/filters/gbfrtf.cpp + ../../../../src/modules/filters/gbfosis.cpp + ../../../../src/modules/filters/teirtf.cpp + ../../../../src/modules/filters/thmlwordjs.cpp + ../../../../src/modules/filters/papyriplain.cpp + ../../../../src/modules/filters/utf8bidireorder.cpp + ../../../../src/modules/filters/gbfheadings.cpp + ../../../../src/modules/filters/thmlrtf.cpp + ../../../../src/modules/filters/swoptfilter.cpp + ../../../../src/modules/filters/utf8arabicpoints.cpp + ../../../../src/modules/filters/unicodertf.cpp + ../../../../src/modules/filters/gbffootnotes.cpp + ../../../../src/modules/filters/greeklexattribs.cpp + ../../../../src/modules/filters/thmlfootnotes.cpp + ../../../../src/modules/filters/thmlplain.cpp + ../../../../src/modules/filters/utf8hebrewpoints.cpp + ../../../../src/modules/filters/thmlwebif.cpp + ../../../../src/modules/filters/thmlvariants.cpp + ../../../../src/modules/filters/thmllemma.cpp + ../../../../src/modules/filters/gbfmorph.cpp + ../../../../src/modules/filters/teiplain.cpp + ../../../../src/modules/filters/swbasicfilter.cpp + ../../../../src/modules/filters/scsuutf8.cpp + ../../../../src/modules/filters/gbflatex.cpp + ../../../../src/modules/filters/thmllatex.cpp + ../../../../src/modules/filters/teilatex.cpp + ../../../../src/modules/filters/osislatex.cpp + ../../../../src/mgr/stringmgr.cpp + ../../../../src/mgr/swmgr.cpp + ../../../../src/mgr/swsearchable.cpp + ../../../../src/mgr/localemgr.cpp + ../../../../src/mgr/swconfig.cpp + ../../../../src/mgr/markupfiltmgr.cpp + ../../../../src/mgr/encfiltmgr.cpp + ../../../../src/mgr/swfiltermgr.cpp + ../../../../src/mgr/swcacher.cpp + ../../../../src/mgr/installmgr.cpp + ../../../../src/mgr/swlocale.cpp + ../../../../src/mgr/filemgr.cpp + ../../../../src/mgr/versificationmgr.cpp + ../../../../src/mgr/remotetrans.cpp + ../../../../src/mgr/ftplibftpt.cpp + ../../../../src/utilfuns/swobject.cpp + ../../../../src/utilfuns/roman.cpp + ../../../../src/utilfuns/swbuf.cpp + ../../../../src/utilfuns/utilstr.cpp + ../../../../src/utilfuns/ftplib.c + ../../../../src/utilfuns/ftpparse.c + ../../../../src/utilfuns/url.cpp + ../../../../src/utilfuns/utilxml.cpp +# ../../../../src/utilfuns/regex.c + ../../../../src/keys/swkey.cpp + ../../../../src/keys/versetreekey.cpp + ../../../../src/keys/treekeyidx.cpp + ../../../../src/keys/versekey.cpp + ../../../../src/keys/strkey.cpp + ../../../../src/keys/treekey.cpp + ../../../../src/keys/listkey.cpp + ../../../../src/frontend/swdisp.cpp + ../../../../src/frontend/swlog.cpp + ../../../../src/utilfuns/zlib/untgz.c + + ) + +include_directories(../../../../include) +# Searches for a specified prebuilt library and stores the path as a +# variable. Because CMake includes system libraries in the search path by +# default, you only need to specify the name of the public NDK library +# you want to add. CMake verifies that the library exists before +# completing its build. + +find_library( # Sets the name of the path variable. + log-lib + + # Specifies the name of the NDK library that + # you want CMake to locate. + log) + +# Specifies libraries CMake should link to your target library. You +# can link multiple libraries, such as libraries you define in this +# build script, prebuilt third-party libraries, or system libraries. + +target_link_libraries( # Specifies the target library. + sword + + # Links the target library to the log library + # included in the NDK. + #${log-lib} + log + z + )
\ No newline at end of file diff --git a/bindings/Android/SWORD/app/build.gradle b/bindings/Android/SWORD/app/build.gradle new file mode 100644 index 0000000..38f6a6b --- /dev/null +++ b/bindings/Android/SWORD/app/build.gradle @@ -0,0 +1,41 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + buildToolsVersion '26.0.2' + defaultConfig { + applicationId "org.crosswire.sword" + minSdkVersion 14 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + externalNativeBuild { + cmake { + cppFlags "-frtti -fexceptions" + } + } + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + externalNativeBuild { + cmake { + path "CMakeLists.txt" + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.3.0' + compile 'com.android.support.constraint:constraint-layout:1.0.2' + compile 'com.android.support:design:25.3.0' + testCompile 'junit:junit:4.12' +} diff --git a/bindings/Android/SWORD/app/proguard-rules.pro b/bindings/Android/SWORD/app/proguard-rules.pro new file mode 100644 index 0000000..b7161c9 --- /dev/null +++ b/bindings/Android/SWORD/app/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /home/scribe/Android/Sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/bindings/Android/SWORD/app/src/androidTest/java/org/crosswire/sword/ExampleInstrumentedTest.java b/bindings/Android/SWORD/app/src/androidTest/java/org/crosswire/sword/ExampleInstrumentedTest.java new file mode 100644 index 0000000..88a21a1 --- /dev/null +++ b/bindings/Android/SWORD/app/src/androidTest/java/org/crosswire/sword/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package org.crosswire.sword; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("org.crosswire.sword", appContext.getPackageName()); + } +} diff --git a/bindings/Android/SWORD/app/src/main/AndroidManifest.xml b/bindings/Android/SWORD/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8c5ed54 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/AndroidManifest.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="org.crosswire.sword"> + + <application + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_round" + android:supportsRtl="true" + android:theme="@style/AppTheme"> + <activity + android:name="org.crosswire.android.bishop.MainActivity" + android:label="@string/title_activity_main"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest>
\ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/frontend b/bindings/Android/SWORD/app/src/main/cpp/frontend new file mode 120000 index 0000000..0c85939 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/frontend @@ -0,0 +1 @@ +../../../../../../../src/frontend
\ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/jni b/bindings/Android/SWORD/app/src/main/cpp/jni new file mode 120000 index 0000000..2042a86 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/jni @@ -0,0 +1 @@ +../../../../../../java-jni/jni/
\ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/keys b/bindings/Android/SWORD/app/src/main/cpp/keys new file mode 120000 index 0000000..82c5ec9 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/keys @@ -0,0 +1 @@ +../../../../../../../src/keys
\ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/mgr b/bindings/Android/SWORD/app/src/main/cpp/mgr new file mode 120000 index 0000000..ff01498 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/mgr @@ -0,0 +1 @@ +../../../../../../../src/mgr
\ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/modules b/bindings/Android/SWORD/app/src/main/cpp/modules new file mode 120000 index 0000000..5ce3fc2 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/modules @@ -0,0 +1 @@ +../../../../../../../src/modules
\ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/utilfuns b/bindings/Android/SWORD/app/src/main/cpp/utilfuns new file mode 120000 index 0000000..f9cd74a --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/utilfuns @@ -0,0 +1 @@ +../../../../../../../src/utilfuns
\ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/MainActivity.java b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/MainActivity.java new file mode 100644 index 0000000..e6626a4 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/MainActivity.java @@ -0,0 +1,121 @@ +package org.crosswire.android.bishop; + +import android.app.Activity; + +import android.app.ActionBar; +import android.app.Fragment; +import android.app.FragmentManager; +import android.content.Context; +import android.os.Build; +import android.os.Bundle; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.support.v4.widget.DrawerLayout; +import android.widget.ArrayAdapter; +import android.widget.TextView; + +import org.crosswire.sword.R; + +public class MainActivity extends Activity + implements NavigationDrawerFragment.NavigationDrawerCallbacks { + + /** + * Fragment managing the behaviors, interactions and presentation of the navigation drawer. + */ + private NavigationDrawerFragment mNavigationDrawerFragment; + + /** + * Used to store the last screen title. For use in {@link #restoreActionBar()}. + */ + private CharSequence mTitle; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + mNavigationDrawerFragment = (NavigationDrawerFragment) + getFragmentManager().findFragmentById(R.id.navigation_drawer); + mTitle = getTitle(); + + // Set up the drawer. + mNavigationDrawerFragment.setUp( + R.id.navigation_drawer, + (DrawerLayout) findViewById(R.id.drawer_layout)); + } + + @Override + public void onNavigationDrawerItemSelected(int position) { + // update the main content by replacing fragments + FragmentManager fragmentManager = getFragmentManager(); + fragmentManager.beginTransaction() + .replace(R.id.container, PlaceholderFragment.newInstance(position + 1)) + .commit(); + } + + public void onSectionAttached(int number) { + switch (number) { + case 1: + mTitle = getString(R.string.title_section1); + break; + case 2: + mTitle = getString(R.string.title_section2); + break; + case 3: + mTitle = getString(R.string.title_section3); + break; + } + } + + public void restoreActionBar() { + ActionBar actionBar = getActionBar(); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setTitle(mTitle); + } + + /** + * A placeholder fragment containing a simple view. + */ + public static class PlaceholderFragment extends Fragment { + /** + * The fragment argument representing the section number for this + * fragment. + */ + private static final String ARG_SECTION_NUMBER = "section_number"; + + public PlaceholderFragment() { + } + + /** + * Returns a new instance of this fragment for the given section + * number. + */ + public static PlaceholderFragment newInstance(int sectionNumber) { + PlaceholderFragment fragment = new PlaceholderFragment(); + Bundle args = new Bundle(); + args.putInt(ARG_SECTION_NUMBER, sectionNumber); + fragment.setArguments(args); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View rootView = inflater.inflate(R.layout.fragment_main, container, false); + return rootView; + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + ((MainActivity) activity).onSectionAttached( + getArguments().getInt(ARG_SECTION_NUMBER)); + } + } + +} diff --git a/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/NavigationDrawerFragment.java b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/NavigationDrawerFragment.java new file mode 100644 index 0000000..29bac37 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/NavigationDrawerFragment.java @@ -0,0 +1,284 @@ +package org.crosswire.android.bishop; + + +import android.app.Activity; +import android.app.ActionBar; +import android.app.Fragment; +import android.support.v4.app.ActionBarDrawerToggle; +import android.support.v4.view.GravityCompat; +import android.support.v4.widget.DrawerLayout; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.Toast; + +import org.crosswire.sword.R; + +/** + * Fragment used for managing interactions for and presentation of a navigation drawer. + * See the <a href="https://developer.android.com/design/patterns/navigation-drawer.html#Interaction"> + * design guidelines</a> for a complete explanation of the behaviors implemented here. + */ +public class NavigationDrawerFragment extends Fragment { + + /** + * Remember the position of the selected item. + */ + private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position"; + + /** + * Per the design guidelines, you should show the drawer on launch until the user manually + * expands it. This shared preference tracks this. + */ + private static final String PREF_USER_LEARNED_DRAWER = "navigation_drawer_learned"; + + /** + * A pointer to the current callbacks instance (the Activity). + */ + private NavigationDrawerCallbacks mCallbacks; + + /** + * Helper component that ties the action bar to the navigation drawer. + */ + private ActionBarDrawerToggle mDrawerToggle; + + private DrawerLayout mDrawerLayout; + private ListView mDrawerListView; + private View mFragmentContainerView; + + private int mCurrentSelectedPosition = 0; + private boolean mFromSavedInstanceState; + private boolean mUserLearnedDrawer; + + public NavigationDrawerFragment() { + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Read in the flag indicating whether or not the user has demonstrated awareness of the + // drawer. See PREF_USER_LEARNED_DRAWER for details. + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity()); + mUserLearnedDrawer = sp.getBoolean(PREF_USER_LEARNED_DRAWER, false); + + if (savedInstanceState != null) { + mCurrentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION); + mFromSavedInstanceState = true; + } + + // Select either the default item (0) or the last selected item. + selectItem(mCurrentSelectedPosition); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + // Indicate that this fragment would like to influence the set of actions in the action bar. + setHasOptionsMenu(true); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + mDrawerListView = (ListView) inflater.inflate( + R.layout.drawer_main, container, false); + mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView<?> parent, View view, int position, long id) { + selectItem(position); + } + }); + mDrawerListView.setAdapter(new ArrayAdapter<String>( + getActionBar().getThemedContext(), + android.R.layout.simple_list_item_activated_1, + android.R.id.text1, + new String[]{ + getString(R.string.title_section1), + getString(R.string.title_section2), + getString(R.string.title_section3), + })); + mDrawerListView.setItemChecked(mCurrentSelectedPosition, true); + return mDrawerListView; + } + + public boolean isDrawerOpen() { + return mDrawerLayout != null && mDrawerLayout.isDrawerOpen(mFragmentContainerView); + } + + /** + * Users of this fragment must call this method to set up the navigation drawer interactions. + * + * @param fragmentId The android:id of this fragment in its activity's layout. + * @param drawerLayout The DrawerLayout containing this fragment's UI. + */ + public void setUp(int fragmentId, DrawerLayout drawerLayout) { + mFragmentContainerView = getActivity().findViewById(fragmentId); + mDrawerLayout = drawerLayout; + + // set a custom shadow that overlays the main content when the drawer opens + mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START); + // set up the drawer's list view with items and click listener + + ActionBar actionBar = getActionBar(); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setHomeButtonEnabled(true); + + // ActionBarDrawerToggle ties together the the proper interactions + // between the navigation drawer and the action bar app icon. + mDrawerToggle = new ActionBarDrawerToggle( + getActivity(), /* host Activity */ + mDrawerLayout, /* DrawerLayout object */ + R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */ + R.string.navigation_drawer_open, /* "open drawer" description for accessibility */ + R.string.navigation_drawer_close /* "close drawer" description for accessibility */ + ) { + @Override + public void onDrawerClosed(View drawerView) { + super.onDrawerClosed(drawerView); + if (!isAdded()) { + return; + } + + getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu() + } + + @Override + public void onDrawerOpened(View drawerView) { + super.onDrawerOpened(drawerView); + if (!isAdded()) { + return; + } + + if (!mUserLearnedDrawer) { + // The user manually opened the drawer; store this flag to prevent auto-showing + // the navigation drawer automatically in the future. + mUserLearnedDrawer = true; + SharedPreferences sp = PreferenceManager + .getDefaultSharedPreferences(getActivity()); + sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply(); + } + + getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu() + } + }; + + // If the user hasn't 'learned' about the drawer, open it to introduce them to the drawer, + // per the navigation drawer design guidelines. + if (!mUserLearnedDrawer && !mFromSavedInstanceState) { + mDrawerLayout.openDrawer(mFragmentContainerView); + } + + // Defer code dependent on restoration of previous instance state. + mDrawerLayout.post(new Runnable() { + @Override + public void run() { + mDrawerToggle.syncState(); + } + }); + + mDrawerLayout.setDrawerListener(mDrawerToggle); + } + + private void selectItem(int position) { + mCurrentSelectedPosition = position; + if (mDrawerListView != null) { + mDrawerListView.setItemChecked(position, true); + } + if (mDrawerLayout != null) { + mDrawerLayout.closeDrawer(mFragmentContainerView); + } + if (mCallbacks != null) { + mCallbacks.onNavigationDrawerItemSelected(position); + } + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + try { + mCallbacks = (NavigationDrawerCallbacks) activity; + } catch (ClassCastException e) { + throw new ClassCastException("Activity must implement NavigationDrawerCallbacks."); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mCallbacks = null; + } + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + // Forward the new configuration the drawer toggle component. + mDrawerToggle.onConfigurationChanged(newConfig); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + // If the drawer is open, show the global app actions in the action bar. See also + // showGlobalContextActionBar, which controls the top-left area of the action bar. + if (mDrawerLayout != null && isDrawerOpen()) { + inflater.inflate(R.menu.global, menu); + showGlobalContextActionBar(); + } + super.onCreateOptionsMenu(menu, inflater); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (mDrawerToggle.onOptionsItemSelected(item)) { + return true; + } + + if (item.getItemId() == R.id.action_example) { + Toast.makeText(getActivity(), "Example action.", Toast.LENGTH_SHORT).show(); + return true; + } + + return super.onOptionsItemSelected(item); + } + + /** + * Per the navigation drawer design guidelines, updates the action bar to show the global app + * 'context', rather than just what's in the current screen. + */ + private void showGlobalContextActionBar() { + ActionBar actionBar = getActionBar(); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + actionBar.setTitle(R.string.app_name); + } + + private ActionBar getActionBar() { + return getActivity().getActionBar(); + } + + /** + * Callbacks interface that all activities using this fragment must implement. + */ + public static interface NavigationDrawerCallbacks { + /** + * Called when an item in the navigation drawer is selected. + */ + void onNavigationDrawerItemSelected(int position); + } +} diff --git a/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/sword/AndroidMgr.java b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/sword/AndroidMgr.java new file mode 100644 index 0000000..61392e6 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/sword/AndroidMgr.java @@ -0,0 +1,45 @@ +/****************************************************************************** + * + * AndroidMgr.java - + * + * $Id: SWMgr.java 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-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. + * + */ + +package org.crosswire.android.sword; + +import android.app.Application; +import android.content.Context; + +public class AndroidMgr extends SWMgr { + + private Application app; + + public AndroidMgr(Application app) { + super(false); + this.app = app; + reInit(); + } + + @Override + public String getStorageBasePath() { + Context context = app.getApplicationContext(); + return context.getFilesDir().getAbsolutePath(); + } +} + + diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 0000000..236bff5 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/drawer_shadow.9.png diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/ic_drawer.png b/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/ic_drawer.png Binary files differnew file mode 100644 index 0000000..c59f601 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/ic_drawer.png diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/drawer_shadow.9.png b/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 0000000..ffe3a28 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/drawer_shadow.9.png diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/ic_drawer.png b/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/ic_drawer.png Binary files differnew file mode 100644 index 0000000..1ed2c56 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/ic_drawer.png diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 0000000..fabe9d9 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/ic_drawer.png b/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/ic_drawer.png Binary files differnew file mode 100644 index 0000000..a5fa74d --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/ic_drawer.png diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 0000000..b91e9d7 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/ic_drawer.png Binary files differnew file mode 100644 index 0000000..9c4685d --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/ic_drawer.png diff --git a/bindings/Android/SWORD/app/src/main/res/layout/activity_main.xml b/bindings/Android/SWORD/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..0c3c3cc --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,26 @@ +<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. --> +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="org.crosswire.android.bishop.MainActivity"> + + <!-- As the main content view, the view below consumes the entire + space available using match_parent in both dimensions. --> + <FrameLayout + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <!-- The drawer is given a fixed width in dp and extends the full height of + the container. --> + <fragment + android:id="@+id/navigation_drawer" + android:name="org.crosswire.android.bishop.NavigationDrawerFragment" + android:layout_width="@dimen/navigation_drawer_width" + android:layout_height="match_parent" + android:layout_gravity="start" + tools:layout="@layout/drawer_main" /> + +</android.support.v4.widget.DrawerLayout> diff --git a/bindings/Android/SWORD/app/src/main/res/layout/drawer_main.xml b/bindings/Android/SWORD/app/src/main/res/layout/drawer_main.xml new file mode 100644 index 0000000..7a02f93 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/layout/drawer_main.xml @@ -0,0 +1,9 @@ +<ListView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="#cccc" + android:choiceMode="singleChoice" + android:divider="@android:color/transparent" + android:dividerHeight="0dp" + tools:context="org.crosswire.android.bishop.NavigationDrawerFragment" /> diff --git a/bindings/Android/SWORD/app/src/main/res/layout/fragment_main.xml b/bindings/Android/SWORD/app/src/main/res/layout/fragment_main.xml new file mode 100644 index 0000000..3f80d4e --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/layout/fragment_main.xml @@ -0,0 +1,16 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingBottom="@dimen/activity_vertical_margin" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + tools:context="org.crosswire.android.bishop.MainActivity$PlaceholderFragment"> + + <TextView + android:id="@+id/section_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + +</RelativeLayout> diff --git a/bindings/Android/SWORD/app/src/main/res/menu/global.xml b/bindings/Android/SWORD/app/src/main/res/menu/global.xml new file mode 100644 index 0000000..e3f1dfa --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/menu/global.xml @@ -0,0 +1,7 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/action_settings" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/action_settings" /> +</menu> diff --git a/bindings/Android/SWORD/app/src/main/res/menu/main.xml b/bindings/Android/SWORD/app/src/main/res/menu/main.xml new file mode 100644 index 0000000..037dc19 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/menu/main.xml @@ -0,0 +1,13 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + tools:context="org.crosswire.android.bishop.MainActivity"> + <item + android:id="@+id/action_example" + android:showAsAction="withText|ifRoom" + android:title="@string/action_example" /> + <item + android:id="@+id/action_settings" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/action_settings" /> +</menu> diff --git a/bindings/Android/SWORD/app/src/main/res/menu/menu_swordtest.xml b/bindings/Android/SWORD/app/src/main/res/menu/menu_swordtest.xml new file mode 100644 index 0000000..7cb68bd --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/menu/menu_swordtest.xml @@ -0,0 +1,7 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context="org.crosswire.sword.SWORDTestActivity"> + <item android:id="@+id/action_settings" android:orderInCategory="100" + android:title="@string/action_settings" app:showAsAction="never" /> +</menu> diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher.png b/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..cde69bc --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 0000000..9a078e3 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher.png b/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..c133a0c --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 0000000..efc028a --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..bfa42f0 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 0000000..3af2608 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..324e72c --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 0000000..9bec2e6 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..aee44e1 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 0000000..34947cd --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/bindings/Android/SWORD/app/src/main/res/values-w820dp/dimens.xml b/bindings/Android/SWORD/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ +<resources> + <!-- Example customization of dimensions originally defined in res/values/dimens.xml + (such as screen margins) for screens with more than 820dp of available width. This + would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). --> + <dimen name="activity_horizontal_margin">64dp</dimen> +</resources> diff --git a/bindings/Android/SWORD/app/src/main/res/values/colors.xml b/bindings/Android/SWORD/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="colorPrimary">#3F51B5</color> + <color name="colorPrimaryDark">#303F9F</color> + <color name="colorAccent">#FF4081</color> +</resources> diff --git a/bindings/Android/SWORD/app/src/main/res/values/dimens.xml b/bindings/Android/SWORD/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..d1c4b97 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/values/dimens.xml @@ -0,0 +1,10 @@ +<resources> + <dimen name="fab_margin">16dp</dimen> + <!-- Default screen margins, per the Android Design guidelines. --> + <dimen name="activity_horizontal_margin">16dp</dimen> + <dimen name="activity_vertical_margin">16dp</dimen> + + <!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp: + https://developer.android.com/design/patterns/navigation-drawer.html --> + <dimen name="navigation_drawer_width">240dp</dimen> +</resources> diff --git a/bindings/Android/SWORD/app/src/main/res/values/strings.xml b/bindings/Android/SWORD/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..c92ade9 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/values/strings.xml @@ -0,0 +1,14 @@ +<resources> + <string name="app_name">SWORD</string> + <string name="action_settings">Settings</string> + <string name="title_activity_main">MainActivity</string> + + <string name="title_section1">Section 1</string> + <string name="title_section2">Section 2</string> + <string name="title_section3">Section 3</string> + + <string name="navigation_drawer_open">Open navigation drawer</string> + <string name="navigation_drawer_close">Close navigation drawer</string> + + <string name="action_example">Example action</string> +</resources> diff --git a/bindings/Android/SWORD/app/src/main/res/values/styles.xml b/bindings/Android/SWORD/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..3f48db4 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/values/styles.xml @@ -0,0 +1,17 @@ +<resources> + + <!-- Base application theme. --> + <style name="AppTheme" parent="Theme.AppCompat"> + <!-- Customize your theme here. --> + <item name="colorPrimary">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> + <item name="colorAccent">@color/colorAccent</item> + </style> + <style name="AppTheme.NoActionBar"> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> + </style> + <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> + <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> + +</resources> diff --git a/bindings/Android/SWORD/app/src/test/java/org/crosswire/sword/ExampleUnitTest.java b/bindings/Android/SWORD/app/src/test/java/org/crosswire/sword/ExampleUnitTest.java new file mode 100644 index 0000000..5d70b42 --- /dev/null +++ b/bindings/Android/SWORD/app/src/test/java/org/crosswire/sword/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package org.crosswire.sword; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +}
\ No newline at end of file diff --git a/bindings/Android/SWORD/build.gradle b/bindings/Android/SWORD/build.gradle new file mode 100644 index 0000000..c33a638 --- /dev/null +++ b/bindings/Android/SWORD/build.gradle @@ -0,0 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.0.0' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/bindings/Android/SWORD/gradle.properties b/bindings/Android/SWORD/gradle.properties new file mode 100644 index 0000000..aac7c9b --- /dev/null +++ b/bindings/Android/SWORD/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.jar b/bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..13372ae --- /dev/null +++ b/bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.jar diff --git a/bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.properties b/bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..cb0e548 --- /dev/null +++ b/bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Oct 27 12:46:11 MST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/bindings/Android/SWORD/gradlew b/bindings/Android/SWORD/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/bindings/Android/SWORD/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/bindings/Android/SWORD/gradlew.bat b/bindings/Android/SWORD/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/bindings/Android/SWORD/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/bindings/Android/SWORD/settings.gradle b/bindings/Android/SWORD/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/bindings/Android/SWORD/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/bindings/corba/omniorbcpp/Makefile b/bindings/corba/omniorbcpp/Makefile index 5385fb5..24e1220 100644 --- a/bindings/corba/omniorbcpp/Makefile +++ b/bindings/corba/omniorbcpp/Makefile @@ -19,6 +19,8 @@ LIBS += -L/usr/lib64 #CXXFLAGS += -g -O0 #CFLAGS += -g -O0 #LDFLAGS += -g -O0 +CXXFLAGS += -O3 +CFLAGS += -O3 #----------------------------------------------------------------------------- diff --git a/bindings/corba/omniorbcpp/swordorb-impl.cpp b/bindings/corba/omniorbcpp/swordorb-impl.cpp index 7f26c14..01cd169 100644 --- a/bindings/corba/omniorbcpp/swordorb-impl.cpp +++ b/bindings/corba/omniorbcpp/swordorb-impl.cpp @@ -2,7 +2,7 @@ * * swordorb-impl.cpp - omniorb bindings * - * $Id: swordorb-impl.cpp 3284 2014-12-03 06:13:54Z greg.hellings $ + * $Id: swordorb-impl.cpp 3256 2014-09-15 20:03:26Z scribe $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -243,7 +243,7 @@ swordorb::StringList* swordorb_SWModule_i::getKeyChildren(){ sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey) { - retVal->length(8); + retVal->length(10); SWBuf num; num.appendFormatted("%d", vkey->getTestament()); (*retVal)[0] = CORBA::string_dup(num.c_str()); @@ -264,6 +264,8 @@ swordorb::StringList* swordorb_SWModule_i::getKeyChildren(){ (*retVal)[5] = CORBA::string_dup(num.c_str()); (*retVal)[6] = CORBA::string_dup(vkey->getBookName()); (*retVal)[7] = CORBA::string_dup(vkey->getOSISRef()); + (*retVal)[8] = CORBA::string_dup(vkey->getShortText()); + (*retVal)[9] = CORBA::string_dup(vkey->getBookAbbrev()); } else { TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key); diff --git a/bindings/corba/orbitcpp/webmgr.hpp b/bindings/corba/orbitcpp/webmgr.hpp index 048882c..05fa569 100644 --- a/bindings/corba/orbitcpp/webmgr.hpp +++ b/bindings/corba/orbitcpp/webmgr.hpp @@ -2,7 +2,7 @@ * * webmgr.cpp - * - * $Id: webmgr.hpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: webmgr.hpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,6 +25,7 @@ #include <swmgr.h> #include <swmodule.h> +#include <filemgr.h> #include <swfilter.h> #include <markupfiltmgr.h> #include <osiswordjs.h> @@ -41,9 +42,13 @@ class WebMgr : public SWMgr { SWModule *defaultHebLex; SWModule *defaultGreekParse; SWModule *defaultHebParse; + char *extraConf; public: - WebMgr(SWConfig *sysConf) : SWMgr(0, sysConf, false, new MarkupFilterMgr(FMT_WEBIF)) { + WebMgr(const char *path, const char *extraConfPath = 0) : SWMgr(path, false, new MarkupFilterMgr(FMT_WEBIF)) { init(); if (extraConfPath) stdstr(&extraConf, extraConfPath); } + WebMgr(SWConfig *sysConf) : SWMgr(0, sysConf, false, new MarkupFilterMgr(FMT_WEBIF)) { init(); } + void init() { + extraConf = 0; defaultGreekLex = 0; defaultHebLex = 0; defaultGreekParse = 0; @@ -52,7 +57,7 @@ public: osisWordJS = new OSISWordJS(); thmlWordJS = new ThMLWordJS(); gbfWordJS = new GBFWordJS(); - Load(); + load(); osisWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse); thmlWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse); gbfWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse); @@ -66,10 +71,22 @@ public: delete osisWordJS; delete thmlWordJS; delete gbfWordJS; + delete extraConf; } + void createAllModules(bool multiMod) { - void AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) { + if (extraConf) { + bool exists = FileMgr::existsFile(extraConf); + if (exists) { + SWConfig addConfig(extraConf); + this->config->augment(addConfig); + } + } + SWMgr::createAllModules(multiMod); + } + + void addGlobalOptionFilters(SWModule *module, ConfigEntMap §ion) { // ThML word stuff needs to process before strongs strip if (module->getMarkup() == FMT_THML) { @@ -81,7 +98,7 @@ public: } // add other module filters - SWMgr::AddGlobalOptions(module, section, start, end); + SWMgr::addGlobalOptionFilters(module, section); // add our special filters if (module->getConfig().has("Feature", "GreekDef")) { diff --git a/bindings/cordova/Makefile b/bindings/cordova/Makefile new file mode 100644 index 0000000..209287a --- /dev/null +++ b/bindings/cordova/Makefile @@ -0,0 +1,10 @@ +all: + @echo + @echo "native binary component is built from ../Android/" + @echo + +clean: + # these are from ../Android + rm -rf org.crosswire.sword.cordova.SWORD/libs/android/* + rm org.crosswire.sword.cordova.SWORD/src/android/AndroidMgr.java org.crosswire.sword.cordova.SWORD/src/android/InstallMgr.java org.crosswire.sword.cordova.SWORD/src/android/SWMgr.java org.crosswire.sword.cordova.SWORD/src/android/SWModule.java + diff --git a/bindings/cordova/README b/bindings/cordova/README new file mode 100644 index 0000000..c59b5c3 --- /dev/null +++ b/bindings/cordova/README @@ -0,0 +1,5 @@ +This folder contains a cordova plugin which is based on the +../Android bindings which is based on the java-jni/ bindings. + +Follow the README in the ../java-jni/ bindings folder. + diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/LICENSE b/bindings/cordova/org.crosswire.sword.cordova.SWORD/LICENSE new file mode 100644 index 0000000..7a4a3ea --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.
\ No newline at end of file diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/README.md b/bindings/cordova/org.crosswire.sword.cordova.SWORD/README.md new file mode 100644 index 0000000..5158f6f --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/README.md @@ -0,0 +1,22 @@ +<!--- + license: Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +# org.apache.cordova.device + +Plugin documentation: [doc/index.md](doc/index.md) diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/RELEASENOTES.md b/bindings/cordova/org.crosswire.sword.cordova.SWORD/RELEASENOTES.md new file mode 100644 index 0000000..a2f41dd --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/RELEASENOTES.md @@ -0,0 +1,57 @@ +<!-- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +--> +# Release Notes + +### 0.2.1 (Sept 5, 2013) +* removed extraneous print statement +* [CB-4432] copyright notice change + +### 0.2.3 (Sept 25, 2013) +* CB-4889 bumping&resetting version +* [windows8] commandProxy has moved +* [BlackBerry10] removed uneeded permission tags in plugin.xml +* CB-4889 renaming org.apache.cordova.core.device to org.apache.cordova.device +* Rename CHANGELOG.md -> RELEASENOTES.md +* updated to use commandProxy for ffos +* add firefoxos support +* [CB-4752] Incremented plugin version on dev branch. + +### 0.2.4 (Oct 28, 2013) +* CB-5128: added repo + issue tag in plugin.xml for device plugin +* CB-5085 device.cordova returning wrong value +* [CB-4915] Incremented plugin version on dev branch. + +### 0.2.5 (Dec 4, 2013) +* CB-5316 Spell Cordova as a brand unless it's a command or script +* [ubuntu] use cordova/exec/proxy +* add ubuntu platform +* Modify Device.platform logic to use amazon-fireos as the platform for Amazon Devices +* 1. Added amazon-fireos platform. 2. Change to use cordova-amazon-fireos as the platform if user agent contains 'cordova-amazon-fireos' + +### 0.2.6 (Jan 02, 2014) +* CB-5658 Add doc/index.md for Device plugin +* CB-5504 Moving Telephony Logic out of Device + +### 0.2.7 (Jan 07, 2014) +* CB-5737 Fix exception on close caused by left over telephony code from CB-5504 + +### 0.2.8 (Feb 05, 2014) +* Tizen support added diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/doc/index.md b/bindings/cordova/org.crosswire.sword.cordova.SWORD/doc/index.md new file mode 100644 index 0000000..9e5c677 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/doc/index.md @@ -0,0 +1,213 @@ +<!--- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +# org.apache.cordova.device + +This plugin defines a global `device` object, which describes the device's hardware and software. +Although the object is in the global scope, it is not available until after the `deviceready` event. + + document.addEventListener("deviceready", onDeviceReady, false); + function onDeviceReady() { + console.log(device.cordova); + } + +## Installation + + cordova plugin add org.apache.cordova.device + +## Properties + +- device.cordova +- device.model +- device.name +- device.platform +- device.uuid +- device.version + +## device.cordova + +Get the version of Cordova running on the device. + +### Supported Platforms + +- Amazon Fire OS +- Android +- BlackBerry 10 +- Firefox OS +- iOS +- Tizen +- Windows Phone 7 and 8 +- Windows 8 + +## device.model + +The `device.model` returns the name of the device's model or +product. The value is set by the device manufacturer and may be +different across versions of the same product. + +### Supported Platforms + +- Android +- BlackBerry 10 +- iOS +- Tizen +- Windows Phone 7 and 8 +- Windows 8 + +### Quick Example + + // Android: Nexus One returns "Passion" (Nexus One code name) + // Motorola Droid returns "voles" + // BlackBerry: Torch 9800 returns "9800" + // iOS: for the iPad Mini, returns iPad2,5; iPhone 5 is iPhone 5,1. See http://theiphonewiki.com/wiki/index.php?title=Models + // + var model = device.model; + +### Android Quirks + +- Gets the [product name](http://developer.android.com/reference/android/os/Build.html#PRODUCT) instead of the [model name](http://developer.android.com/reference/android/os/Build.html#MODEL), which is often the production code name. For example, the Nexus One returns `Passion`, and Motorola Droid returns `voles`. + +### Tizen Quirks + +- Returns the device model assigned by the vendor, for example, `TIZEN` + +### Windows Phone 7 and 8 Quirks + +- Returns the device model specified by the manufacturer. For example, the Samsung Focus returns `SGH-i917`. + +## device.name + +__WARNING__: `device.name` is deprecated as of version 2.3.0. Use `device.model` instead. + +## device.platform + +Get the device's operating system name. + + var string = device.platform; + +### Supported Platforms + +- Android +- BlackBerry 10 +- Firefox OS +- iOS +- Tizen +- Windows Phone 7 and 8 +- Windows 8 + +### Quick Example + + // Depending on the device, a few examples are: + // - "Android" + // - "BlackBerry 10" + // - "iOS" + // - "WinCE" + // - "Tizen" + var devicePlatform = device.platform; + +### Windows Phone 7 Quirks + +Windows Phone 7 devices report the platform as `WinCE`. + +### Windows Phone 8 Quirks + +Windows Phone 8 devices report the platform as `Win32NT`. + +## device.uuid + +Get the device's Universally Unique Identifier ([UUID](http://en.wikipedia.org/wiki/Universally_Unique_Identifier)). + + var string = device.uuid; + +### Description + +The details of how a UUID is generated are determined by the device manufacturer and are specific to the device's platform or model. + +### Supported Platforms + +- Android +- BlackBerry 10 +- iOS +- Tizen +- Windows Phone 7 and 8 +- Windows 8 + +### Quick Example + + // Android: Returns a random 64-bit integer (as a string, again!) + // The integer is generated on the device's first boot + // + // BlackBerry: Returns the PIN number of the device + // This is a nine-digit unique integer (as a string, though!) + // + // iPhone: (Paraphrased from the UIDevice Class documentation) + // Returns a string of hash values created from multiple hardware identifies. + // It is guaranteed to be unique for every device and can't be tied + // to the user account. + // Windows Phone 7 : Returns a hash of device+current user, + // if the user is not defined, a guid is generated and will persist until the app is uninstalled + // Tizen: returns the device IMEI (International Mobile Equipment Identity or IMEI is a number + // unique to every GSM and UMTS mobile phone. + var deviceID = device.uuid; + +### iOS Quirk + +The `uuid` on iOS is not unique to a device, but varies for each +application, for each installation. It changes if you delete and +re-install the app, and possibly also when you upgrade iOS, or even +upgrade the app per version (apparent in iOS 5.1). The `uuid` is not +a reliable value. + +### Windows Phone 7 and 8 Quirks + +The `uuid` for Windows Phone 7 requires the permission +`ID_CAP_IDENTITY_DEVICE`. Microsoft will likely deprecate this +property soon. If the capability is not available, the application +generates a persistent guid that is maintained for the duration of the +application's installation on the device. + +## device.version + +Get the operating system version. + + var string = device.version; + +### Supported Platforms + +- Android 2.1+ +- BlackBerry 10 +- iOS +- Tizen +- Windows Phone 7 and 8 +- Windows 8 + +### Quick Example + + // Android: Froyo OS would return "2.2" + // Eclair OS would return "2.1", "2.0.1", or "2.0" + // Version can also return update level "2.1-update1" + // + // BlackBerry: Torch 9800 using OS 6.0 would return "6.0.0.600" + // + // iPhone: iOS 3.2 returns "3.2" + // + // Windows Phone 7: returns current OS version number, ex. on Mango returns 7.10.7720 + // Tizen: returns "TIZEN_20120425_2" + var deviceVersion = device.version; + diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/package.json b/bindings/cordova/org.crosswire.sword.cordova.SWORD/package.json new file mode 100644 index 0000000..3be0b9f --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/package.json @@ -0,0 +1,28 @@ +{ + "name": "SWORD", + "version": "0.0.1", + "description": "The SWORD Project Plugin", + "cordova": { + "id": "org.crosswire.sword.cordova.SWORD", + "platforms": [ + "android", + "amazon-fireos", + "ios" + ] + }, + "repository": { + "type": "git", + "url": "https://crosswire.org/svn/sword" + }, + "keywords": [ + "cordova", + "sword", + "Bible", + "ecosystem:cordova", + "cordova-android", + "cordova-ios", + "cordova-amazon-fireos" + ], + "author": "CrossWire Bible Society", + "license": "GNU 2.0" +} diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/plugin.xml b/bindings/cordova/org.crosswire.sword.cordova.SWORD/plugin.xml new file mode 100644 index 0000000..33d5c40 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/plugin.xml @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" + xmlns:rim="http://www.blackberry.com/ns/widgets" + xmlns:android="http://schemas.android.com/apk/res/android" + id="org.crosswire.sword.cordova.SWORD" + version="0.0.1"> + <name>SWORD</name> + <description>The SWORD Project Plugin</description> + <license>GNU 2.0</license> + <keywords>cordova,sword,Bible</keywords> + <repo>https://crosswire.org/svn/sword</repo> + <issue>http://crosswire.org/tracker</issue> + + <js-module src="www/SWORD.js" name="SWORD"> + <clobbers target="SWORD" /> + </js-module> + + <!-- firefoxos + <platform name="firefoxos"> + <config-file target="config.xml" parent="/*"> + <feature name="Device"> + <param name="firefoxos-package" value="Device" /> + </feature> + </config-file> + + <js-module src="src/firefoxos/DeviceProxy.js" name="DeviceProxy"> + <runs /> + </js-module> + </platform> + --> + <!-- tizen + <platform name="tizen"> + <js-module src="src/tizen/DeviceProxy.js" name="DeviceProxy"> + <runs /> + </js-module> + </platform> + --> + <!-- android --> + <platform name="android"> + <config-file target="res/xml/config.xml" parent="/*"> + <feature name="SWORD" > + <param name="android-package" value="org.crosswire.sword.cordova.SWORD"/> + </feature> + </config-file> + <config-file target="AndroidManifest.xml" parent="/manifest"> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> + </config-file> + + <source-file src="src/android/SWORD.java" target-dir="src/org/crosswire/sword/cordova" /> + <source-file src="src/android/SWMgr.java" target-dir="src/org/crosswire/android/sword" /> + <source-file src="src/android/AndroidMgr.java" target-dir="src/org/crosswire/android/sword" /> + <source-file src="src/android/SWModule.java" target-dir="src/org/crosswire/android/sword" /> + <source-file src="src/android/InstallMgr.java" target-dir="src/org/crosswire/android/sword" /> + <source-file src="libs/android/armeabi/libsword.so" target-dir="libs/armeabi" /> + <source-file src="libs/android/arm64-v8a/libsword.so" target-dir="libs/arm64-v8a" /> + <source-file src="libs/android/x86/libsword.so" target-dir="libs/x86" /> + <source-file src="libs/android/mips64/libsword.so" target-dir="libs/mips64" /> + <source-file src="libs/android/mips/libsword.so" target-dir="libs/mips" /> + <source-file src="libs/android/armeabi-v7a/libsword.so" target-dir="libs/armeabi-v7a" /> + <source-file src="libs/android/x86_64/libsword.so" target-dir="libs/x86_64" /> + </platform> + + <!-- amazon-fireos --> + <platform name="amazon-fireos"> + <config-file target="res/xml/config.xml" parent="/*"> + <feature name="SWORD" > + <param name="android-package" value="org.crosswire.sword.cordova"/> + </feature> + </config-file> + + <source-file src="src/android/SWORD.java" target-dir="src/org/crosswire/sword/cordova" /> + <source-file src="src/android/SWMgr.java" target-dir="src/org/crosswire/android/sword" /> + <source-file src="src/android/AndroidMgr.java" target-dir="src/org/crosswire/android/sword" /> + <source-file src="src/android/SWModule.java" target-dir="src/org/crosswire/android/sword" /> + <source-file src="src/android/InstallMgr.java" target-dir="src/org/crosswire/android/sword" /> + <source-file src="libs/android/armeabi/libsword.so" target-dir="libs/armeabi" /> + <source-file src="libs/android/arm64-v8a/libsword.so" target-dir="libs/arm64-v8a" /> + <source-file src="libs/android/x86/libsword.so" target-dir="libs/x86" /> + <source-file src="libs/android/mips64/libsword.so" target-dir="libs/mips64" /> + <source-file src="libs/android/mips/libsword.so" target-dir="libs/mips" /> + <source-file src="libs/android/armeabi-v7a/libsword.so" target-dir="libs/armeabi-v7a" /> + <source-file src="libs/android/x86_64/libsword.so" target-dir="libs/x86_64" /> + </platform> + + <!-- ubuntu + <platform name="ubuntu"> + <header-file src="src/ubuntu/device.h" /> + <source-file src="src/ubuntu/device.cpp" /> + <js-module src="src/ubuntu/device.js" name="DeviceProxy"> + <merges target="device" /> + </js-module> + </platform> + --> + <!-- ios --> + <platform name="ios"> + <config-file target="config.xml" parent="/*"> + <feature name="SWORD"> + <param name="ios-package" value="SWORD" /> + </feature> + </config-file> + <header-file src="src/ios/flatapi.h" /> + <header-file src="src/ios/defs.h" /> + <header-file src="src/ios/SWORD-Bridging-Header.h" /> + <source-file src="src/ios/SWORD.swift" /> + <source-file src="libs/ios/libSWORD.a" framework="true" /> + <source-file src="libs/ios/libcurl.a" framework="true" /> + <framework src="libstdc++.dylib" /> + <framework src="libcurl.dylib" /> + + <dependency id="cordova-plugin-add-swift-support" /> + +<!-- <source-file src="lib/ios/libSWORD.a" framework="true" /> --> + </platform> + + <!-- blackberry10 + <platform name="blackberry10"> + <source-file src="src/blackberry10/index.js" target-dir="Device" /> + <config-file target="www/config.xml" parent="/widget"> + <feature name="Device" value="Device"/> + </config-file> + <config-file target="www/config.xml" parent="/widget/rim:permissions"> + <rim:permit>read_device_identifying_information</rim:permit> + </config-file> + </platform> + --> + <!-- wp7 + <platform name="wp7"> + <config-file target="config.xml" parent="/*"> + <feature name="Device"> + <param name="wp-package" value="Device"/> + </feature> + </config-file> + + <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities"> + <Capability Name="ID_CAP_IDENTITY_DEVICE" /> + </config-file> + + <source-file src="src/wp/Device.cs" /> + </platform> + --> + <!-- wp8 + <platform name="wp8"> + <config-file target="config.xml" parent="/*"> + <feature name="Device"> + <param name="wp-package" value="Device"/> + </feature> + </config-file> + + <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities"> + <Capability Name="ID_CAP_IDENTITY_DEVICE" /> + </config-file> + + <source-file src="src/wp/Device.cs" /> + </platform> + --> + <!-- windows8 + <platform name="windows8"> + <js-module src="src/windows8/DeviceProxy.js" name="DeviceProxy"> + <merges target="" /> + </js-module> + </platform> + --> +</plugin> diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/android/SWORD.java b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/android/SWORD.java new file mode 100644 index 0000000..88c4119 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/android/SWORD.java @@ -0,0 +1,660 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +*/ +package org.crosswire.sword.cordova; + +import java.util.TimeZone; +import java.util.Vector; +import java.util.Map; +import java.util.HashMap; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +import org.apache.cordova.CordovaWebView; +import org.apache.cordova.CallbackContext; +import org.apache.cordova.CordovaPlugin; +import org.apache.cordova.PluginResult; +import org.apache.cordova.CordovaInterface; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import org.crosswire.android.sword.SWMgr; +import org.crosswire.android.sword.AndroidMgr; +import org.crosswire.android.sword.SWModule; +import org.crosswire.android.sword.InstallMgr; + +import android.provider.Settings; +import android.util.Log; +import android.content.Intent; +import android.app.Activity; + +public class SWORD extends CordovaPlugin { + public static final String TAG = "SWORD"; + public static SWMgr mgr = null; + public static InstallMgr installMgr = null; + private CallbackContext installReporterContext = null; + private CallbackContext searchReporterContext = null; + private CallbackContext renderChapterContext = null; + private CallbackContext sendContext = null; + + /** + * Constructor. + */ + public SWORD() { + } + + /** + * Sets the context of the Command. This can then be used to do things like + * get file paths associated with the Activity. + * + * @param cordova The context of the main Activity. + * @param webView The CordovaWebView Cordova is running in. + */ + public void initialize(CordovaInterface cordova, CordovaWebView webView) { + super.initialize(cordova, webView); + mgr = new AndroidMgr(cordova.getActivity().getApplication()); + installMgr = new InstallMgr(); + installReporterContext = null; + searchReporterContext = null; + renderChapterContext = null; + } + + /** + * Executes the request and returns PluginResult. + * + * @param action The action to execute. + * @param args JSONArry of arguments for the plugin. + * @param callbackContext The callback id used when calling back into JavaScript. + * @return True if the action was valid, false if not. + */ + public boolean execute(String action, JSONArray args, final CallbackContext callbackContext) throws JSONException { + if (action.equals("initSWORD")) { + JSONObject r = new JSONObject(); + r.put("version", mgr.version()); + callbackContext.success(r); + } + else if (action.equals("echo")) { + echo(callbackContext, args.getString(0)); + } + else if (action.equals("InstallMgr_setUserDisclaimerConfirmed")) { + installMgr.setUserDisclaimerConfirmed(); + callbackContext.success(); + } + else if (action.equals("InstallMgr_syncConfig")) { + cordova.getThreadPool().execute(new Runnable() { + @Override + public void run() { + installMgr.syncConfig(); + installMgr.reInit(); + callbackContext.success(); + } + }); + } + else if (action.equals("InstallMgr_getRemoteSources")) { + JSONArray r = new JSONArray(); + String sources[] = installMgr.getRemoteSources(); + for (String s : sources) { + r.put(s); + } + callbackContext.success(r); + } + else if (action.equals("InstallMgr_refreshRemoteSource")) { + final String repo = args.getString(0); + cordova.getThreadPool().execute(new Runnable() { + @Override + public void run() { + installMgr.refreshRemoteSource(repo); + callbackContext.success(); + } + }); + } + else if (action.equals("InstallMgr_getRemoteModInfoList")) { + JSONArray r = new JSONArray(); + for (SWMgr.ModInfo mi : installMgr.getRemoteModInfoList(args.getString(0))) { + JSONObject m = new JSONObject(); + m.put("name", mi.name); + m.put("description", mi.description); + m.put("category", mi.category); + m.put("language", mi.language); + m.put("version", mi.version); + m.put("delta", mi.delta); + r.put(m); + } + callbackContext.success(r); + } + else if (action.equals("InstallMgr_remoteInstallModule")) { + this.installReporterContext = callbackContext; + final String repo = args.getString(0); + final String modName = args.getString(1); + cordova.getThreadPool().execute(new Runnable() { + @Override + public void run() { + + installMgr.remoteInstallModule(repo, modName, new InstallMgr.InstallProgressReporter() { + public void update(long totalBytes, long completedBytes) { + /* + // callback({ status : preStatus|update|complete, totalBytes : n, completedBytes : n, message : displayable }); + */ + try { + + JSONObject m = new JSONObject(); + m.put("status", "update"); + m.put("totalBytes", totalBytes); + m.put("completedBytes", completedBytes); + if (installReporterContext != null) { + PluginResult result = new PluginResult(PluginResult.Status.OK, m); + result.setKeepCallback(true); + installReporterContext.sendPluginResult(result); + } + } + catch (Exception e) { e.printStackTrace(); } + } + public void preStatus(long totalBytes, long completedBytes, String message) { + try { + JSONObject m = new JSONObject(); + m.put("status", ("Complete".equals(message)) ? "complete" : "preStatus"); + m.put("totalBytes", totalBytes); + m.put("completedBytes", completedBytes); + m.put("message", message); + if (installReporterContext != null) { + PluginResult result = new PluginResult(PluginResult.Status.OK, m); + result.setKeepCallback(!"Complete".equals(message)); + installReporterContext.sendPluginResult(result); + } + if ("Complete".equals(message)) { + // let's be sure we see our new module + mgr.reInit(); + // and clear out context + installReporterContext = null; + } + } + catch (Exception e) { e.printStackTrace(); } + } + }); + + } + }); + + PluginResult result = new PluginResult(PluginResult.Status.OK); + result.setKeepCallback(true); + callbackContext.sendPluginResult(result); + } + else if (action.equals("InstallMgr_uninstallModule")) { + installMgr.uninstallModule(args.getString(0)); + callbackContext.success(); + } + else if (action.equals("SWMgr_getExtraConfigSections")) { + JSONArray r = new JSONArray(); + for (String s : mgr.getExtraConfigSections()) { + r.put(s); + } + callbackContext.success(r); + } + else if (action.equals("SWMgr_getExtraConfigKeys")) { + JSONArray r = new JSONArray(); + for (String s : mgr.getExtraConfigKeys(args.getString(0))) { + r.put(s); + } + callbackContext.success(r); + } + else if (action.equals("SWMgr_getExtraConfigValue")) { + callbackContext.success(mgr.getExtraConfigValue(args.getString(0), args.getString(1))); + } + else if (action.equals("SWMgr_setExtraConfigValue")) { + mgr.setExtraConfigValue(args.getString(0), args.getString(1), args.getString(2)); + callbackContext.success(); + } + else if (action.equals("SWMgr_addExtraConfig")) { + JSONArray r = new JSONArray(); + for (String s : mgr.addExtraConfig(args.getString(0))) { + r.put(s); + } + callbackContext.success(r); + } + else if (action.equals("SWMgr_getModInfoList")) { + JSONArray r = new JSONArray(); + for (SWMgr.ModInfo mi : mgr.getModInfoList()) { + JSONObject m = new JSONObject(); + m.put("name", mi.name); + m.put("description", mi.description); + m.put("category", mi.category); + m.put("language", mi.language); + m.put("version", mi.version); + m.put("delta", mi.delta); + r.put(m); + } + callbackContext.success(r); + } + else if (action.equals("SWMgr_getModuleByName")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + // didn't find module is not an error + if (mod == null) { callbackContext.success(); return true; } + + JSONObject m = new JSONObject(); + m.put("name", mod.getName()); + m.put("description", mod.getDescription()); + m.put("category", mod.getCategory()); + m.put("direction", mod.getConfigEntry("Direction")); + m.put("language", mod.getConfigEntry("Lang")); + m.put("font", mod.getConfigEntry("Font")); + m.put("shortCopyright", mod.getConfigEntry("ShortCopyright")); + m.put("shortPromo", mod.getConfigEntry("ShortPromo")); + callbackContext.success(m); + } + else if (action.equals("SWModule_setKeyText")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + mod.setKeyText(args.getString(1)); + callbackContext.success(); + } + else if (action.equals("SWModule_getKeyText")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + callbackContext.success(mod.getKeyText()); + } + else if (action.equals("SWModule_search")) { + this.searchReporterContext = callbackContext; + final SWModule mod = mgr.getModuleByName(args.getString(0)); + final String expression = args.getString(1); + final int searchType = args.getInt(2); + final long flags = args.getLong(3); + final String scope = JSONObject.NULL.equals(args.getString(4)) || "null".equals(args.getString(4)) ? null : args.getString(4); + cordova.getThreadPool().execute(new Runnable() { + @Override + public void run() { + + SWModule.SearchHit[] results = mod.search(expression, searchType, flags, scope, new SWModule.SearchProgressReporter() { + public void progressReport(int percent) { + try { + JSONObject m = new JSONObject(); + m.put("status", "update"); + m.put("percent", percent); + if (searchReporterContext != null) { + PluginResult result = new PluginResult(PluginResult.Status.OK, m); + result.setKeepCallback(true); + searchReporterContext.sendPluginResult(result); + } + } + catch (Exception e) { e.printStackTrace(); } + } + }); + try { + JSONObject m = new JSONObject(); + m.put("status", "complete"); + m.put("percent", 100); + JSONArray r = new JSONArray(); + for (SWModule.SearchHit s : results) { + JSONObject re = new JSONObject(); + re.put("key", s.key); + re.put("score", s.score); + r.put(re); + } + m.put("results", r); + if (searchReporterContext != null) { + PluginResult result = new PluginResult(PluginResult.Status.OK, m); + result.setKeepCallback(false); + searchReporterContext.sendPluginResult(result); + } + } + catch (Exception e) { e.printStackTrace(); } + searchReporterContext = null; + } + }); + + PluginResult result = new PluginResult(PluginResult.Status.OK); + result.setKeepCallback(true); + callbackContext.sendPluginResult(result); + } + else if (action.equals("SWModule_getRenderChapter")) { + this.renderChapterContext = callbackContext; + + final SWModule masterMod = mgr.getModuleByName(args.getString(0)); + final SWModule mod = mgr.getModuleByName(args.getString(1)); + if (masterMod == null) { callbackContext.error("couldn't find master module: " + args.getString(0)); return true; } + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(1)); return true; } + + cordova.getThreadPool().execute(new Runnable() { + @Override + public void run() { + + JSONArray r = new JSONArray(); + try { + r = getRenderChapter(masterMod, mod); + } catch (JSONException e) { e.printStackTrace(); } + PluginResult result = new PluginResult(PluginResult.Status.OK, r); + result.setKeepCallback(false); + if (renderChapterContext != null) { + renderChapterContext.sendPluginResult(result); + renderChapterContext = null; + } + } + }); + + PluginResult result = new PluginResult(PluginResult.Status.NO_RESULT); + result.setKeepCallback(true); + callbackContext.sendPluginResult(result); + } + else if (action.equals("SWMgr_registerBibleSyncListener")) { + final CallbackContext bibleSyncListener = callbackContext; + + cordova.getThreadPool().execute(new Runnable() { + @Override + public void run() { + mgr.registerBibleSyncListener(new SWMgr.BibleSyncListener() { + public void messageReceived(String message) { + PluginResult result = new PluginResult(PluginResult.Status.OK, message); + result.setKeepCallback(true); + bibleSyncListener.sendPluginResult(result); + } + }); + } + }); + + PluginResult result = new PluginResult(PluginResult.Status.NO_RESULT); + result.setKeepCallback(true); + callbackContext.sendPluginResult(result); + } + else if (action.equals("SWMgr_setJavascript")) { + boolean val = args.getBoolean(0); + mgr.setJavascript(val); + callbackContext.success(); + } + else if (action.equals("SWMgr_sendBibleSyncMessage")) { + String osisRef = args.getString(0); + mgr.sendBibleSyncMessage(osisRef); + callbackContext.success(); + } + else if (action.equals("SWModule_getRenderText")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + callbackContext.success(mod.getRenderText()); + } + else if (action.equals("SWModule_sendText")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + this.sendContext = callbackContext; + sendVerse(mod, new String[] { mod.getKeyText() }, cordova, this); + PluginResult result = new PluginResult(PluginResult.Status.NO_RESULT); + result.setKeepCallback(true); + callbackContext.sendPluginResult(result); + } + else if (action.equals("SWModule_getRenderHeader")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + callbackContext.success(mod.getRenderHeader()); + } + else if (action.equals("SWModule_getKeyChildren")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + JSONArray r = new JSONArray(); + for (String k : mod.getKeyChildren()) { + r.put(k); + } + callbackContext.success(r); + } + else if (action.equals("SWModule_getConfigEntry")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + callbackContext.success(mod.getConfigEntry(args.getString(1))); + } + else if (action.equals("SWModule_getEntryAttribute")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + JSONArray r = new JSONArray(); + for (String k : mod.getEntryAttribute(args.getString(1), args.getString(2), args.getString(3), args.getBoolean(4))) { + r.put(k); + } + callbackContext.success(r); + } + else if (action.equals("SWModule_popError")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + callbackContext.success((int)mod.error()); + } + else if (action.equals("SWModule_next")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + mod.next(); + callbackContext.success(); + } + else if (action.equals("SWModule_previous")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + mod.previous(); + callbackContext.success(); + } + else if (action.equals("SWModule_begin")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + mod.begin(); + callbackContext.success(); + } + else if (action.equals("SWModule_getVerseKey")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + callbackContext.success(getVerseKey(mod.getKeyChildren())); + } + else if (action.equals("SWModule_getBookNames")) { + SWModule mod = mgr.getModuleByName(args.getString(0)); + if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; } + JSONArray r = new JSONArray(); + for (String b : getBookNames(mod)) { + r.put(b); + } + callbackContext.success(r); + } + else if (action.equals("HTTPUtils_makeRequest")) { + final CallbackContext makeRequestContext = callbackContext; + + final String url = args.getString(0); + final String postData = args.getString(1); + final int method = args.getInt(2); +Log.d(TAG, "makeRequest(url: " + url + ", postData: " + postData + ", method: " + method); + + cordova.getThreadPool().execute(new Runnable() { + @Override + public void run() { + String response = makeRequest(url, postData, method, null); + PluginResult result = new PluginResult(PluginResult.Status.OK, response); + result.setKeepCallback(false); + makeRequestContext.sendPluginResult(result); + } + }); + + PluginResult result = new PluginResult(PluginResult.Status.NO_RESULT); + result.setKeepCallback(true); + callbackContext.sendPluginResult(result); + } + else return false; + + return true; + } + + JSONObject getVerseKey(String keyChildren[]) throws JSONException { + JSONObject retVal = new JSONObject(); + if (keyChildren != null && keyChildren.length > 9) { + retVal.put("testament", Integer.parseInt(keyChildren[SWModule.VERSEKEY_TESTAMENT])); + retVal.put("book", Integer.parseInt(keyChildren[SWModule.VERSEKEY_BOOK])); + retVal.put("chapter", Integer.parseInt(keyChildren[SWModule.VERSEKEY_CHAPTER])); + retVal.put("verse", Integer.parseInt(keyChildren[SWModule.VERSEKEY_VERSE])); + retVal.put("chapterMax", Integer.parseInt(keyChildren[SWModule.VERSEKEY_CHAPTERMAX])); + retVal.put("verseMax", Integer.parseInt(keyChildren[SWModule.VERSEKEY_VERSEMAX])); + retVal.put("bookName", keyChildren[SWModule.VERSEKEY_BOOKNAME]); + retVal.put("osisRef", keyChildren[SWModule.VERSEKEY_OSISREF]); + retVal.put("shortText", keyChildren[SWModule.VERSEKEY_SHORTTEXT]); + retVal.put("bookAbbrev", keyChildren[SWModule.VERSEKEY_BOOKABBREV]); + } + return retVal; + } + + public JSONArray getRenderChapter(SWModule masterMod, SWModule mod) throws JSONException { + JSONArray r = new JSONArray(); + + // save our current keys so we can set our mods back when we're done + String saveMasterKey = masterMod.getKeyText(); + String saveKey = mod.getKeyText(); + + String currentKey[] = masterMod.getKeyChildren(); + + masterMod.setKeyText(currentKey[SWModule.VERSEKEY_BOOKABBREV]+"."+currentKey[SWModule.VERSEKEY_CHAPTER]+".1"); + + String [] verseKey = masterMod.getKeyChildren(); + while ( + masterMod.error() == 0 + && currentKey[SWModule.VERSEKEY_BOOK].equals(verseKey[SWModule.VERSEKEY_BOOK]) + && currentKey[SWModule.VERSEKEY_CHAPTER].equals(verseKey[SWModule.VERSEKEY_CHAPTER])) { + + mod.setKeyText(verseKey[SWModule.VERSEKEY_OSISREF]); + char error = mod.error(); + JSONObject v = new JSONObject(); + if (((int)error) == 0) { + v.put("verse", getVerseKey(mod.getKeyChildren())); + String preVerse = ""; + for (String h : mod.getEntryAttribute("Heading", "Preverse", "", true)) { + preVerse += h; + } + v.put("preVerse", preVerse); + v.put("text", mod.getRenderText()); + } + else { +/* null removes entry + v.put("verse", null); + v.put("preVerse", null); + v.put("text", null); +*/ + } + r.put(v); + masterMod.next(); + verseKey = masterMod.getKeyChildren(); + } + + masterMod.setKeyText(saveMasterKey); + mod.setKeyText(saveKey); + + return r; + } + + + public Vector<String> getBookNames(SWModule mod) { + Vector<String> books = new Vector<String>(); + for (mod.begin(); mod.error() == 0; mod.setKeyText("+book")) { + books.add(mod.getKeyChildren()[9]); + } + return books; + } + + //-------------------------------------------------------------------------- + // LOCAL METHODS + //-------------------------------------------------------------------------- + + public void echo(CallbackContext callbackContext, String message) { + if (message != null && message.length() > 0) { + callbackContext.success(message); + } + else { + callbackContext.error("expected 1 arg"); + } + } + + public static final int METHOD_GET = 0; + public static final int METHOD_POST = 1; + public static final String METHODS_TEXT[] = { "GET", "POST" }; + + public static String makeRequest(String url, String postData, int method, Map<String, String> headers) { + HttpURLConnection connection = null; + + Map<String, String> defaultHeaders = new HashMap<String, String>(); + defaultHeaders.put("Accept", "*/*"); +// defaultHeaders.put("Content-Type", "application/xml"); + defaultHeaders.put("Content-Type", "application/x-www-form-urlencoded"); + if (method != METHOD_GET && postData != null) defaultHeaders.put("Content-Length", Integer.toString(postData.length())); + + try { + if (headers != null) defaultHeaders.putAll(headers); + + if (method == METHOD_GET && postData != null && postData.length() > 0) { + // some sanity checks for appending GET params to URL + if (url.indexOf("?") < 0) if (!postData.startsWith("?")) url += "?"; + else if (!url.endsWith("&") && !postData.startsWith("&")) url += "&"; + + url += postData; + } + + connection = (HttpURLConnection) new URL(url).openConnection(); + connection.setRequestMethod(METHODS_TEXT[method]); + for (String k : defaultHeaders.keySet()) { + connection.setRequestProperty(k, defaultHeaders.get(k)); + } + if (method == METHOD_POST) { + connection.setDoOutput(true); + if (postData != null) { + DataOutputStream dos = new DataOutputStream(connection.getOutputStream()); + dos.writeBytes(postData); + dos.flush(); + dos.close(); + } + } + int responseCode = connection.getResponseCode(); + BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream())); + StringBuilder response = new StringBuilder(); + String line; + while ((line = br.readLine()) != null) { + response.append(line); + } + /* do something special if success code? + if (responseCode >= 200 && responseCode < 300) { + } + else throw new Exception("HTTP Response: " + responseCode); + */ + return response.toString(); + } + catch (Exception e) { e.printStackTrace(); } + return null; + } + public static void sendVerse(final SWModule mod, final String verse[], final CordovaInterface cordova, final CordovaPlugin plugin) { + cordova.getThreadPool().execute(new Runnable() { + public void run() { + String subject = mod.getKeyChildren()[SWModule.VERSEKEY_SHORTTEXT] + " (" + mod.getName() + ")"; + String message = mod.getStripText() + " --" +subject; + final Intent sendIntent = new Intent(Intent.ACTION_SEND); + sendIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); + + sendIntent.setType("text/plain"); + + sendIntent.putExtra(Intent.EXTRA_SUBJECT, subject); + sendIntent.putExtra(android.content.Intent.EXTRA_TEXT, message); + + cordova.startActivityForResult(plugin, Intent.createChooser(sendIntent, null), 1); + } + }); + } + + public void onActivityResult(int requestCode, int resultCode, Intent intent) { + switch (requestCode) { + case 1: + sendContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, resultCode == Activity.RESULT_OK)); + } + super.onActivityResult(requestCode, resultCode, intent); + } + +} diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/blackberry10/index.js b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/blackberry10/index.js new file mode 100644 index 0000000..639ac64 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/blackberry10/index.js @@ -0,0 +1,69 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +function getModelName () { + var modelName = window.qnx.webplatform.device.modelName; + //Pre 10.2 (meaning Z10 or Q10) + if (typeof modelName === "undefined") { + if (window.screen.height === 720 && window.screen.width === 720) { + if ( window.matchMedia("(-blackberry-display-technology: -blackberry-display-oled)").matches) { + modelName = "Q10"; + } else { + modelName = "Q5"; + } + } else if ((window.screen.height === 1280 && window.screen.width === 768) || + (window.screen.height === 768 && window.screen.width === 1280)) { + modelName = "Z10"; + } else { + modelName = window.qnx.webplatform.deviceName; + } + } + + return modelName; +} + +function getUUID () { + var uuid = ""; + try { + //Must surround by try catch because this will throw if the app is missing permissions + uuid = window.qnx.webplatform.device.devicePin; + } catch (e) { + //DO Nothing + } + return uuid; +} + +module.exports = { + getDeviceInfo: function (success, fail, args, env) { + var result = new PluginResult(args, env), + modelName = getModelName(), + uuid = getUUID(), + info = { + platform: "blackberry10", + version: window.qnx.webplatform.device.scmBundle, + model: modelName, + uuid: uuid, + cordova: "dev" + }; + + result.ok(info); + } +}; diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/firefoxos/DeviceProxy.js b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/firefoxos/DeviceProxy.js new file mode 100644 index 0000000..f37e761 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/firefoxos/DeviceProxy.js @@ -0,0 +1,39 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +var firefoxos = require('cordova/platform'); +var cordova = require('cordova'); + +module.exports = { + getDeviceInfo: function(success, error) { + setTimeout(function () { + success({ + cordova: firefoxos.cordovaVersion, + platform: 'firefoxos', + model: null, + version: null, + uuid: null + }); + }, 0); + } +}; + +require("cordova/firefoxos/commandProxy").add("Device", module.exports); diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/CDVDevice.h b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/CDVDevice.h new file mode 100644 index 0000000..a146d88 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/CDVDevice.h @@ -0,0 +1,30 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import <UIKit/UIKit.h> +#import <Cordova/CDVPlugin.h> + +@interface CDVDevice : CDVPlugin +{} + ++ (NSString*)cordovaVersion; + +- (void)getDeviceInfo:(CDVInvokedUrlCommand*)command; + +@end diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/CDVDevice.m b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/CDVDevice.m new file mode 100644 index 0000000..7e18d92 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/CDVDevice.m @@ -0,0 +1,90 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#include <sys/types.h> +#include <sys/sysctl.h> + +#import <Cordova/CDV.h> +#import "CDVDevice.h" + +@implementation UIDevice (ModelVersion) + +- (NSString*)modelVersion +{ + size_t size; + + sysctlbyname("hw.machine", NULL, &size, NULL, 0); + char* machine = malloc(size); + sysctlbyname("hw.machine", machine, &size, NULL, 0); + NSString* platform = [NSString stringWithUTF8String:machine]; + free(machine); + + return platform; +} + +@end + +@interface CDVDevice () {} +@end + +@implementation CDVDevice + +- (void)getDeviceInfo:(CDVInvokedUrlCommand*)command +{ + NSDictionary* deviceProperties = [self deviceProperties]; + CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:deviceProperties]; + + /* Settings.plist + * Read the optional Settings.plist file and push these user-defined settings down into the web application. + * This can be useful for supplying build-time configuration variables down to the app to change its behavior, + * such as specifying Full / Lite version, or localization (English vs German, for instance). + */ + // TODO: turn this into an iOS only plugin + NSDictionary* temp = [CDVViewController getBundlePlist:@"Settings"]; + + if ([temp respondsToSelector:@selector(JSONString)]) { + NSLog(@"Deprecation warning: window.Setting will be removed Aug 2013. Refer to https://issues.apache.org/jira/browse/CB-2433"); + NSString* js = [NSString stringWithFormat:@"window.Settings = %@;", [temp JSONString]]; + [self.commandDelegate evalJs:js]; + } + + [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId]; +} + +- (NSDictionary*)deviceProperties +{ + UIDevice* device = [UIDevice currentDevice]; + NSMutableDictionary* devProps = [NSMutableDictionary dictionaryWithCapacity:4]; + + [devProps setObject:[device modelVersion] forKey:@"model"]; + [devProps setObject:@"iOS" forKey:@"platform"]; + [devProps setObject:[device systemVersion] forKey:@"version"]; + [devProps setObject:[device uniqueAppInstanceIdentifier] forKey:@"uuid"]; + [devProps setObject:[[self class] cordovaVersion] forKey:@"cordova"]; + + NSDictionary* devReturn = [NSDictionary dictionaryWithDictionary:devProps]; + return devReturn; +} + ++ (NSString*)cordovaVersion +{ + return CDV_VERSION; +} + +@end diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD-Bridging-Header.h b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD-Bridging-Header.h new file mode 100644 index 0000000..234ef73 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD-Bridging-Header.h @@ -0,0 +1 @@ +#import "flatapi.h" diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD.swift b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD.swift new file mode 100644 index 0000000..1650725 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD.swift @@ -0,0 +1,805 @@ +import MessageUI + +var mySWORDPlugin:SWORD? = nil + +@objc(SWORD) class SWORD : CDVPlugin, MFMessageComposeViewControllerDelegate { + var mgr = 0; + var installMgr = 0 + var disclaimerConfirmed = false; + + @objc(initSWORD:) + func initSWORD(command: CDVInvokedUrlCommand) { + mgr = 0 + installMgr = 0 + disclaimerConfirmed = false + mySWORDPlugin = nil + VERSEKEY_BOOKABBREV = Int(org_crosswire_sword_SWModule_VERSEKEY_BOOKABBREV); + VERSEKEY_BOOK = Int(org_crosswire_sword_SWModule_VERSEKEY_BOOK); + VERSEKEY_CHAPTER = Int(org_crosswire_sword_SWModule_VERSEKEY_CHAPTER); + VERSEKEY_VERSE = Int(org_crosswire_sword_SWModule_VERSEKEY_VERSE); + VERSEKEY_TESTAMENT = Int(org_crosswire_sword_SWModule_VERSEKEY_TESTAMENT); + VERSEKEY_OSISREF = Int(org_crosswire_sword_SWModule_VERSEKEY_OSISREF); + VERSEKEY_CHAPMAX = Int(org_crosswire_sword_SWModule_VERSEKEY_CHAPMAX); + VERSEKEY_VERSEMAX = Int(org_crosswire_sword_SWModule_VERSEKEY_VERSEMAX); + VERSEKEY_BOOKNAME = Int(org_crosswire_sword_SWModule_VERSEKEY_BOOKNAME); + VERSEKEY_SHORTTEXT = Int(org_crosswire_sword_SWModule_VERSEKEY_SHORTTEXT); + + initMgr() + + let libswordVersion = String(cString: org_crosswire_sword_SWMgr_version(mgr)) + debugPrint("libswordVersion: " + libswordVersion) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "initSWORD; Version: " + libswordVersion), callbackId: command.callbackId) + } + + + func myToast(message: String) { + let toastController: UIAlertController = UIAlertController(title: "", message: message, preferredStyle: .alert) + self.viewController?.present(toastController, animated: true, completion: nil) + DispatchQueue.main.asyncAfter(deadline: .now() + 5) { + toastController.dismiss(animated: true, completion: nil) + } + } + + + func initMgr() { + if (mgr == 0) { + let baseDir = (FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.path)! + "/sword"; + mgr = org_crosswire_sword_SWMgr_newWithPath(baseDir) +debugPrint("initMgr, mgr: " + String(describing: mgr)) + } + } + + + func reinitMgr() { + if (mgr != 0) { + org_crosswire_sword_SWMgr_delete(mgr) + } + mgr = 0 + initMgr() + } + + + func reinitInstall() { + if (installMgr != 0) { + org_crosswire_sword_InstallMgr_delete(installMgr) + } + installMgr = 0 + initInstall() + } + + func logError(message: String) { + org_crosswire_sword_SWlog_logError(message) + } + func logDebug(message: String) { + org_crosswire_sword_SWlog_logDebug(message) + } + func logWarning(message: String) { + org_crosswire_sword_SWlog_logWarning(message) + } + func logInformation(message: String) { + org_crosswire_sword_SWlog_logInformation(message) + } + func logTimedInformation(message: String) { + org_crosswire_sword_SWlog_logTimedInformation(message) + } + + + func initInstall() { + + if (installMgr == 0) { + logDebug(message: "initInstall: installMgr is null"); + let baseDir = (FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.path)! + "/sword"; + installMgr = org_crosswire_sword_InstallMgr_new(baseDir, { (message: Optional<UnsafePointer<Int8>>, totalBytes: u_long, completedBytes: u_long) in + let msg = String(cString: message!) + if (msg == "update") { + let response = [ + "status": "update", + "totalBytes": totalBytes, + "completedBytes": completedBytes + ] as [String : Any] + if (mySWORDPlugin != nil && mySWORDPlugin!.callbackID != "") { + let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: response) + result?.setKeepCallbackAs(true) + mySWORDPlugin!.commandDelegate!.send(result, callbackId: mySWORDPlugin!.callbackID) + } + } + else { + let response = [ + "status": "preStatus", + "totalBytes": totalBytes, + "completedBytes": completedBytes, + "message": msg + ] as [String : Any] + if (mySWORDPlugin != nil && mySWORDPlugin!.callbackID != "") { + let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: response) + result?.setKeepCallbackAs(true) + mySWORDPlugin!.commandDelegate!.send(result, callbackId: mySWORDPlugin!.callbackID) + } + } + }) + if (disclaimerConfirmed) { + org_crosswire_sword_InstallMgr_setUserDisclaimerConfirmed(installMgr) + } + logDebug(message: "initInstall: instantiated InstallMgr with baseDir: \(baseDir)"); + } + } + + @objc(SWMgr_getModuleByName:) + func SWMgr_getModuleByName(command: CDVInvokedUrlCommand) { + + initMgr(); + + let modName = command.arguments[0] as? String ?? "" + let module = org_crosswire_sword_SWMgr_getModuleByName(mgr, modName) + + if (module == 0) { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK), callbackId: command.callbackId) + return + } + + let name = org_crosswire_sword_SWModule_getName(module) + let description = org_crosswire_sword_SWModule_getDescription(module) + let category = org_crosswire_sword_SWModule_getCategory(module) + let language = org_crosswire_sword_SWModule_getConfigEntry(module, "Lang") + let direction = org_crosswire_sword_SWModule_getConfigEntry(module, "Direction") + let font = org_crosswire_sword_SWModule_getConfigEntry(module, "Font") + let shortCopyright = org_crosswire_sword_SWModule_getConfigEntry(module, "ShortCopyright") + let shortPromo = org_crosswire_sword_SWModule_getConfigEntry(module, "ShortPromo") + + let response = [ + "name": name == nil ? "" : String(cString: name!), + "description": description == nil ? "" : String(cString: description!), + "category": category == nil ? "" : String(cString: category!), + "language": language == nil ? "" : String(cString: language!), + "direction": direction == nil ? "" : String(cString: direction!), + "font": font == nil ? "" : String(cString: font!), + "shortCopyright": shortCopyright == nil ? "" : String(cString: shortCopyright!), + "shortPromo": shortPromo == nil ? "" : String(cString: shortPromo!) + ] + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: response), callbackId: command.callbackId) + } + + + + @objc(SWMgr_addExtraConfig:) + func SWMgr_addExtraConfig(command: CDVInvokedUrlCommand) { + let blob = command.arguments[0] as? String ?? "" + let baseDir = (FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.path)! + "/sword"; + let confPath = baseDir + "/extraConfig.conf"; + let retVal = getStringArray(buffer: org_crosswire_sword_SWConfig_augmentConfig(confPath, blob)) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + + + @objc(SWMgr_setExtraConfigValue:) + func SWMgr_setExtraConfigValue(command: CDVInvokedUrlCommand) { + let section = command.arguments[0] as? String ?? "" + let key = command.arguments[1] as? String ?? "" + let val = command.arguments[2] as? String ?? "" + let baseDir = (FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.path)! + "/sword"; + let confPath = baseDir + "/extraConfig.conf"; + org_crosswire_sword_SWConfig_setKeyValue(confPath, section, key, val) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "SWMgr_setExtraConfigValue"), callbackId: command.callbackId) + } + + + @objc(SWMgr_getExtraConfigValue:) + func SWMgr_getExtraConfigValue(command: CDVInvokedUrlCommand) { + let section = command.arguments[0] as? String ?? "" + let key = command.arguments[1] as? String ?? "" + let baseDir = (FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.path)! + "/sword"; + let confPath = baseDir + "/extraConfig.conf"; + let retVal = String(cString:org_crosswire_sword_SWConfig_getKeyValue(confPath, section, key)) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + + + @objc(SWMgr_getExtraConfigKeys:) + func SWMgr_getExtraConfigKeys(command: CDVInvokedUrlCommand) { + let section = command.arguments[0] as? String ?? "" + let baseDir = (FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.path)! + "/sword"; + let confPath = baseDir + "/extraConfig.conf"; + let retVal = getStringArray(buffer: org_crosswire_sword_SWConfig_getSectionKeys(confPath, section)) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + + + @objc(SWMgr_getExtraConfigSections:) + func SWMgr_getExtraConfigSections(command: CDVInvokedUrlCommand) { + let baseDir = (FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.path)! + "/sword"; + let confPath = baseDir + "/extraConfig.conf"; + let retVal = getStringArray(buffer: org_crosswire_sword_SWConfig_getSections(confPath)) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + + + @objc(echo:) + func echo(command: CDVInvokedUrlCommand) { + let msg = command.arguments[0] as? String ?? "" + myToast(message: msg) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: msg), callbackId: command.callbackId) + } + + + @objc(HTTPUtils_makeRequest:) + func HTTPUtils_makeRequest(command: CDVInvokedUrlCommand) { + var url = command.arguments[0] as? String ?? "" + let postData = command.arguments[1] as? String ?? "" + let method = command.arguments[2] as? Int ?? 1 + + if method == 1 { + url += "?" + postData + } + var request = URLRequest(url: URL(string: url)!) + request.httpMethod = method == 1 ? "GET" : "POST" + if method == 2 { + request.httpBody = postData.data(using: .utf8) + } + let session = URLSession.shared + session.dataTask(with: request) {data, response, err in + let pluginResult = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: String(data: data!, encoding: String.Encoding.utf8)) + pluginResult?.setKeepCallbackAs(false) + self.commandDelegate!.send(pluginResult, callbackId: command.callbackId) + }.resume() + + let pluginResult = CDVPluginResult(status: CDVCommandStatus_NO_RESULT) + pluginResult?.setKeepCallbackAs(true) + self.commandDelegate!.send(pluginResult, callbackId: command.callbackId) + } + + + @objc(SWModule_getBookNames:) + func SWModule_getBookNames(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + var retVal = [String]() + org_crosswire_sword_SWModule_begin(mod) + while (org_crosswire_sword_SWModule_popError(mod) == 0) { + retVal.append(getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(mod))[VERSEKEY_BOOKABBREV]) + org_crosswire_sword_SWModule_setKeyText(mod, "+book") + } + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + + + @objc(SWModule_getVerseKey:) + func SWModule_getVerseKey(command: CDVInvokedUrlCommand) { + initMgr() + let module = getModule(command: command) + if (module != 0) { + let retVal = getVerseKey(keyChildren: getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(module))) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + + @objc(SWModule_begin:) + func SWModule_begin(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + if (mod != 0) { + org_crosswire_sword_SWModule_begin(mod) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "SWModule_begin"), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + + @objc(SWModule_previous:) + func SWModule_previous(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + if (mod != 0) { + org_crosswire_sword_SWModule_previous(mod) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "SWModule_previous"), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + + @objc(SWModule_next:) + func SWModule_next(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + if (mod != 0) { + org_crosswire_sword_SWModule_next(mod) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "SWModule_next"), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + + @objc(SWModule_popError:) + func SWModule_popError(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + if (mod != 0) { + let error = Int(org_crosswire_sword_SWModule_popError(mod)) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: error), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + + @objc(SWModule_getEntryAttribute:) + func SWModule_getEntryAttribute(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + if (mod != 0) { + let retVal = getStringArray(buffer: org_crosswire_sword_SWModule_getEntryAttribute(mod, command.arguments[1] as? String ?? "", command.arguments[2] as? String ?? "", command.arguments[3] as? String ?? "", (command.arguments[4] as? Bool ?? false) ? 1 : 0)) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + + @objc(SWModule_getConfigEntry:) + func SWModule_getConfigEntry(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + if (mod != 0) { + let val = org_crosswire_sword_SWModule_getConfigEntry(mod, command.arguments[1] as? String ?? "") + let retVal = val == nil ? nil : String(cString: val!) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + + @objc(SWModule_getKeyChildren:) + func SWModule_getKeyChildren(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + if (mod != 0) { + let retVal = getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(mod)) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + + @objc(SWModule_getRenderHeader:) + func SWModule_getRenderHeader(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + if (mod != 0) { + let header = String(cString: org_crosswire_sword_SWModule_getRenderHeader(mod)) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: header), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + func messageComposeViewController(_ controller: MFMessageComposeViewController, didFinishWith result: MessageComposeResult) { + self.webView.inputViewController?.dismiss(animated: true, completion: { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK), callbackId: self.callbackID) + }) + } + + func sendVerse(module: Int, keyText: String) { + if MFMessageComposeViewController.canSendText() { + let controller = MFMessageComposeViewController() + let verseKey = getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(module)) + let modName = String(cString: org_crosswire_sword_SWModule_getName(module)) + let verseText = String(cString: org_crosswire_sword_SWModule_stripText(module)) + + + controller.body = verseText + " --" + verseKey[VERSEKEY_SHORTTEXT] + " (" + modName + ")" + controller.recipients = [""] + controller.messageComposeDelegate = self + self.webView.inputViewController?.present(controller, animated: true, completion: nil) + } + } + @objc(SWModule_sendText:) + func SWModule_sendText(command: CDVInvokedUrlCommand) { + initMgr() +// Switch this to use cordova social plugin + let mod = getModule(command: command) + if (mod != 0) { + mySWORDPlugin = self + callbackID = command.callbackId + let keyText = String(cString: org_crosswire_sword_SWModule_getKeyText(mod)) + sendVerse(module: mod, keyText: keyText) + let result = CDVPluginResult(status: CDVCommandStatus_NO_RESULT) + result?.setKeepCallbackAs(true) + self.commandDelegate!.send(result, callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + @objc(SWModule_getRenderText:) + func SWModule_getRenderText(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + if (mod != 0) { + let retVal = String(cString: org_crosswire_sword_SWModule_renderText(mod)) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + + @objc(SWMgr_registerBibleSyncListener:) + func SWMgr_registerBibleSyncListener(command: CDVInvokedUrlCommand) { + let pluginResult = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "SWMgr_registerBibleSyncListener") + self.commandDelegate!.send(pluginResult, callbackId: command.callbackId) + } + + + @objc(SWModule_getRenderChapter:) + func SWModule_getRenderChapter(command: CDVInvokedUrlCommand) { + initMgr() + +// DispatchQueue.global().async { + self.initMgr() + let masterMod = self.getModule(command: command, nameArgNumber: 0) + let mod = self.getModule(command: command, nameArgNumber: 1) + if (masterMod != 0 && mod != 0) { + let r = self.renderChapter(masterMod: masterMod, mod: mod) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: r), callbackId: command.callbackId) + } +// } +/* + var pluginResult = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "SWModule_getRenderChapter") + pluginResult?.setKeepCallbackAs(true) + self.commandDelegate!.send(pluginResult, callbackId: command.callbackId) +*/ + } + + var VERSEKEY_BOOK = Int(org_crosswire_sword_SWModule_VERSEKEY_BOOK); + var VERSEKEY_CHAPTER = Int(org_crosswire_sword_SWModule_VERSEKEY_CHAPTER); + var VERSEKEY_VERSE = Int(org_crosswire_sword_SWModule_VERSEKEY_VERSE); + var VERSEKEY_TESTAMENT = Int(org_crosswire_sword_SWModule_VERSEKEY_TESTAMENT); + var VERSEKEY_OSISREF = Int(org_crosswire_sword_SWModule_VERSEKEY_OSISREF); + var VERSEKEY_CHAPMAX = Int(org_crosswire_sword_SWModule_VERSEKEY_CHAPMAX); + var VERSEKEY_VERSEMAX = Int(org_crosswire_sword_SWModule_VERSEKEY_VERSEMAX); + var VERSEKEY_BOOKNAME = Int(org_crosswire_sword_SWModule_VERSEKEY_BOOKNAME); + var VERSEKEY_SHORTTEXT = Int(org_crosswire_sword_SWModule_VERSEKEY_SHORTTEXT); + var VERSEKEY_BOOKABBREV = Int(org_crosswire_sword_SWModule_VERSEKEY_BOOKABBREV); + + func renderChapter(masterMod: Int, mod: Int) -> [[String: Any]] { + let saveMasterKey = String(cString: org_crosswire_sword_SWModule_getKeyText(masterMod)) + let saveKey = String(cString: org_crosswire_sword_SWModule_getKeyText(mod)) + var r = [[String: Any]]() + var currentKey = getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(masterMod)) + let book = currentKey[VERSEKEY_BOOKABBREV] + let chapter = currentKey[VERSEKEY_CHAPTER] + org_crosswire_sword_SWModule_setKeyText(masterMod, book + "." + chapter + ".1") + var verseKey = getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(masterMod)) + while (org_crosswire_sword_SWModule_popError(masterMod) == 0 + && currentKey[VERSEKEY_BOOK] == verseKey[VERSEKEY_BOOK] + && currentKey[VERSEKEY_CHAPTER] == verseKey[VERSEKEY_CHAPTER] + ) { + org_crosswire_sword_SWModule_setKeyText(mod, verseKey[VERSEKEY_OSISREF]) + let error = org_crosswire_sword_SWModule_popError(mod) + var v = [String:Any]() + if (error == 0) { + v["verse"] = getVerseKey(keyChildren: getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(mod))) + var preVerse = "" + for i in getStringArray(buffer: org_crosswire_sword_SWModule_getEntryAttribute(mod, "Heading", "Preverse", "", 1)) { + preVerse += i + } + v["preVerse"] = preVerse + v["text"] = String(cString: org_crosswire_sword_SWModule_renderText(mod)) + } + else { + + } + r.append(v) + org_crosswire_sword_SWModule_next(masterMod) + verseKey = getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(masterMod)) + } + org_crosswire_sword_SWModule_setKeyText(masterMod, saveMasterKey) + org_crosswire_sword_SWModule_setKeyText(mod, saveKey) + + return r + + } + + func getVerseKey(keyChildren:[String]) -> [String:Any] { + var retVal = [String:Any]() + if (keyChildren.count > 9) { + retVal["testament"] = Int(keyChildren[VERSEKEY_TESTAMENT]); + retVal["book"] = Int(keyChildren[VERSEKEY_BOOK]); + retVal["chapter"] = Int(keyChildren[VERSEKEY_CHAPTER]); + retVal["verse"] = Int(keyChildren[VERSEKEY_VERSE]); + retVal["chapterMax"] = Int(keyChildren[VERSEKEY_CHAPMAX]); + retVal["verseMax"] = Int(keyChildren[VERSEKEY_VERSEMAX]); + retVal["bookName"] = keyChildren[VERSEKEY_BOOKNAME]; + retVal["osisRef"] = keyChildren[VERSEKEY_OSISREF]; + retVal["shortText"] = keyChildren[VERSEKEY_SHORTTEXT]; + retVal["bookAbbrev"] = keyChildren[VERSEKEY_BOOKABBREV]; + } + return retVal; + } + + + @objc(SWModule_search:) + func SWModule_search(command: CDVInvokedUrlCommand) { + initMgr() + let mod = getModule(command: command) + if (mod != 0) { + let expression = command.arguments[1] as? String ?? "" + let searchType = command.arguments[2] as? Int32 ?? 0 + let flags = command.arguments[3] as? Int ?? 0 + let scope = command.arguments.count < 5 ? nil : command.arguments[4] as? String ?? nil + callbackID = command.callbackId + DispatchQueue.global().async { + mySWORDPlugin = self + let buffer = org_crosswire_sword_SWModule_search(mod, expression, searchType, flags, scope, { (percent: Int32) in + let response = [ + "status": "update", + "percent": percent + ] as [String : Any] + if (mySWORDPlugin != nil && mySWORDPlugin!.callbackID != "") { + let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: response) + result?.setKeepCallbackAs(true) + mySWORDPlugin!.commandDelegate!.send(result, callbackId: mySWORDPlugin!.callbackID) + } + }); + + self.callbackID = "" + var response = [ + "status": "complete", + "percent": 100 + ] as [String : Any] + + //UnsafeMutablePointer<UnsafePointer<Int8>?>!) -> [String] { + var b = buffer + var count = 0 + while let i = b?.pointee { + if i.key == nil { + break + } + count = count + 1 + b = b?.advanced(by: 1) + } + let searchResults = UnsafeBufferPointer<org_crosswire_sword_SearchHit>(start: buffer, count: count); + var results = [[String:Any]]() + for i in searchResults { + let sr = [ + "key": String(cString: i.key), + "score": Int(i.score) + ] as [String : Any] + results.append(sr) + } + response["results"] = results + + let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: response) + result?.setKeepCallbackAs(false) + self.commandDelegate!.send(result, callbackId: command.callbackId) + } + + let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "SWModule_search") + result?.setKeepCallbackAs(true) + self.commandDelegate!.send(result, callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR), callbackId: command.callbackId) + } + } + + + func getModule(command: CDVInvokedUrlCommand, nameArgNumber: Int = 0) -> Int { + initMgr() + let modName = command.arguments[nameArgNumber] as? String ?? "" + let module = org_crosswire_sword_SWMgr_getModuleByName(mgr, modName) + if (module == 0) { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: "couldn't find module \(modName)"), callbackId: command.callbackId) + } + return module + } + + + @objc(SWModule_getKeyText:) + func SWModule_getKeyText(command: CDVInvokedUrlCommand) { + let module = getModule(command: command) + if (module != 0) { + let keyText = org_crosswire_sword_SWModule_getKeyText(module) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: keyText == nil ? "" : String(cString: keyText!)), callbackId: command.callbackId) + } + } + + + + @objc(SWModule_setKeyText:) + func SWModule_setKeyText(command: CDVInvokedUrlCommand) { + let module = getModule(command: command) + let keyText = command.arguments[1] as? String ?? "" + if (module != 0) { + org_crosswire_sword_SWModule_setKeyText(module, keyText) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "SWModule_setKeyText"), callbackId: command.callbackId) + } + } + + + @objc(InstallMgr_uninstallModule:) + func InstallMgr_uninstallModule(command: CDVInvokedUrlCommand) { + initInstall() + initMgr() + let retVal = org_crosswire_sword_InstallMgr_uninstallModule(installMgr, mgr, command.arguments[0] as? String ?? "") + if (retVal == 0) { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: retVal), callbackId: command.callbackId) + } + else { + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: retVal), callbackId: command.callbackId) + } + } + + var callbackID:String = "" + @objc(InstallMgr_remoteInstallModule:) + func InstallMgr_remoteInstallModule(command: CDVInvokedUrlCommand) { + initInstall() + initMgr() + let repo = command.arguments[0] as? String ?? "" + let modName = command.arguments[1] as? String ?? "" + callbackID = command.callbackId + DispatchQueue.global().async { + mySWORDPlugin = self + org_crosswire_sword_InstallMgr_remoteInstallModule(self.installMgr, self.mgr, repo, modName) + + self.reinitMgr() + self.callbackID = "" + let response = [ + "status": "complete", + "totalBytes": 0, + "completedBytes": 0, + "message": "Complete" + ] as [String : Any] + let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: response) + result?.setKeepCallbackAs(false) + self.commandDelegate!.send(result, callbackId: command.callbackId) + } + + let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "InstallMgr_remoteInstallModule") + result?.setKeepCallbackAs(true) + self.commandDelegate!.send(result, callbackId: command.callbackId) + } + + + @objc(InstallMgr_getRemoteModInfoList:) + func InstallMgr_getRemoteModInfoList(command: CDVInvokedUrlCommand) { + initInstall() + initMgr() + let buffer = org_crosswire_sword_InstallMgr_getRemoteModInfoList(installMgr, mgr, command.arguments[0] as? String ?? "") + var count = 0 + var b = buffer + while let i = b?.pointee { + if (i.name == nil) { + break + } + count = count + 1 + b = b?.advanced(by: 1) + } + let modInfoList = Array(UnsafeBufferPointer<org_crosswire_sword_ModInfo>(start: buffer, count: count)); + var mods = [[AnyHashable : Any]]() + for i in modInfoList { + let modInfo = [ + "name": String(cString: i.name), + "description": String(cString: i.description), + "category": String(cString: i.category), + "language": String(cString: i.language), + "delta": String(cString: i.delta), + "version": String(cString: i.version) + ] as [AnyHashable : Any] + mods.append(modInfo) + } + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: mods), callbackId: command.callbackId) + } + + + @objc(InstallMgr_refreshRemoteSource:) + func InstallMgr_refreshRemoteSource(command: CDVInvokedUrlCommand) { + initInstall() + DispatchQueue.global().async { + mySWORDPlugin = self + self.callbackID = "" + org_crosswire_sword_InstallMgr_refreshRemoteSource(self.installMgr, command.arguments[0] as? String ?? "") + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "InstallMgr_refreshRemoteSource"), callbackId: command.callbackId) + } + } + + + func getStringArray(buffer: UnsafeMutablePointer<UnsafePointer<Int8>?>!) -> [String] { + var sources = [String]() + var b = buffer + while let i = b?.pointee { + sources.append(String(cString: i)) + b = b?.advanced(by: 1) + } + return sources + } + + + @objc(InstallMgr_getRemoteSources:) + func InstallMgr_getRemoteSources(command: CDVInvokedUrlCommand) { + initInstall() + let sources = getStringArray(buffer: org_crosswire_sword_InstallMgr_getRemoteSources(installMgr)) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: sources), callbackId: command.callbackId) + } + + + @objc(InstallMgr_syncConfig:) + func InstallMgr_syncConfig(command: CDVInvokedUrlCommand) { + + initInstall() + DispatchQueue.global().async { + self.callbackID = "" + mySWORDPlugin = self + org_crosswire_sword_InstallMgr_syncConfig(self.installMgr) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "InstallMgr_syncConfig"), callbackId: command.callbackId) + } + } + + + @objc(InstallMgr_setUserDisclaimerConfirmed:) + func InstallMgr_setUserDisclaimerConfirmed(command: CDVInvokedUrlCommand) { + initInstall() + org_crosswire_sword_InstallMgr_setUserDisclaimerConfirmed(installMgr) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "InstallMgr_setUserDisclaimerConfirmed"), callbackId: command.callbackId) + } + + + @objc(SWMgr_setJavascript:) + func SWMgr_setJavascript(command: CDVInvokedUrlCommand) { + initMgr() + org_crosswire_sword_SWMgr_setJavascript(mgr, command.arguments[0] as? Bool ?? true ? 1 : 0) + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "SWMgr_setJavascript"), callbackId: command.callbackId) + } + + @objc(SWMgr_getModInfoList:) + func SWMgr_getModInfoList(command: CDVInvokedUrlCommand) { + initMgr() + let buffer = org_crosswire_sword_SWMgr_getModInfoList(mgr) + var b = buffer + var count = 0 + while let i = b?.pointee { + if i.name == nil { + break + } + b = b?.advanced(by: 1) + count = count + 1 + } + let modInfoList = Array(UnsafeBufferPointer<org_crosswire_sword_ModInfo>(start: buffer, count: count)); + + var mods = [[AnyHashable : Any]]() + for i in modInfoList { + let modInfo = [ + "name": String(cString: i.name), + "description": String(cString: i.description), + "category": String(cString: i.category), + "language": String(cString: i.language), + "delta": i.delta == nil ? "" : String(cString: i.delta), + "version": i.version == nil ? "" : String(cString: i.version) + ] as [AnyHashable : Any] + mods.append(modInfo) + } + self.commandDelegate!.send(CDVPluginResult(status: CDVCommandStatus_OK, messageAs: mods), callbackId: command.callbackId) + } +/* +SWMgr_registerBibleSyncListener +SWMgr_sendBibleSyncMessage +*/ +} diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/tizen/DeviceProxy.js b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/tizen/DeviceProxy.js new file mode 100644 index 0000000..2afc324 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/tizen/DeviceProxy.js @@ -0,0 +1,39 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +var tizen = require('cordova/platform'); +var cordova = require('cordova'); + +module.exports = { + getDeviceInfo: function(success, error) { + setTimeout(function () { + success({ + cordova: tizen.cordovaVersion, + platform: 'tizen', + model: null, + version: null, + uuid: null + }); + }, 0); + } +}; + +require("cordova/tizen/commandProxy").add("Device", module.exports); diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.cpp b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.cpp new file mode 100644 index 0000000..eb5a012 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.cpp @@ -0,0 +1,64 @@ +/* + * Copyright 2011 Wolfgang Koller - http://www.gofg.at/ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <QDeviceInfo> +#include <QtSystemInfo> + +#include"device.h" + +#define CORDOVA "3.0.0" + +Device::Device(Cordova *cordova) : CPlugin(cordova) { +} + +static QString getOSName() { +#ifdef Q_OS_SYMBIAN + QString platform = "Symbian"; +#endif +#ifdef Q_OS_WIN + QString platform = "Windows"; +#endif +#ifdef Q_OS_WINCE + QString platform = "Windows CE"; +#endif +#ifdef Q_OS_LINUX + QString platform = "Linux"; +#endif + return platform; +} + +void Device::getInfo(int scId, int ecId) { + Q_UNUSED(ecId) + + QDeviceInfo systemDeviceInfo; + QDeviceInfo systemInfo; + + QString platform = getOSName(); + + QString uuid = systemDeviceInfo.uniqueDeviceID(); + if (uuid.isEmpty()) { + QString deviceDescription = systemInfo.imei(0) + ";" + systemInfo.manufacturer() + ";" + systemInfo.model() + ";" + systemInfo.productName() + ";" + platform; + QString user = qgetenv("USER"); + if (user.isEmpty()) { + user = qgetenv("USERNAME"); + if (user.isEmpty()) + user = QDir::homePath(); + } + uuid = QString(QCryptographicHash::hash((deviceDescription + ";" + user).toUtf8(), QCryptographicHash::Md5).toHex()); + } + + this->cb(scId, systemDeviceInfo.model(), CORDOVA, platform, uuid, systemInfo.version(QDeviceInfo::Os)); +} diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.h b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.h new file mode 100644 index 0000000..91cb937 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.h @@ -0,0 +1,47 @@ +/* + * Copyright 2011 Wolfgang Koller - http://www.gofg.at/ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DEVICE_H_FDSAFAS +#define DEVICE_H_FDSAFAS + +#include <QtCore> + +#include <cplugin.h> + +class Device: public CPlugin { + Q_OBJECT +public: + explicit Device(Cordova *cordova); + + virtual const QString fullName() override { + return Device::fullID(); + } + + virtual const QString shortName() override { + return "Device"; + } + + static const QString fullID() { + return "com.cordova.Device"; + } + +signals: + +public slots: + void getInfo(int scId, int ecId); +}; + +#endif diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.js b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.js new file mode 100644 index 0000000..3adb110 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.js @@ -0,0 +1,34 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +var cordova = require('cordova'); +var exec = require('cordova/exec'); + +module.exports = { + getInfo:function(win,fail,args) { + Cordova.exec(function (model, cordova, platform, uuid, version) { + win({name: name, model: model, cordova: cordova, + platform: platform, uuid: uuid, version: version}); + }, null, "com.cordova.Device", "getInfo", []); + } +}; + +require("cordova/exec/proxy").add("Device", module.exports); diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/windows8/DeviceProxy.js b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/windows8/DeviceProxy.js new file mode 100644 index 0000000..16145c0 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/windows8/DeviceProxy.js @@ -0,0 +1,50 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + + +var cordova = require('cordova'); +var utils = require('cordova/utils'); + +module.exports = { + + getDeviceInfo:function(win,fail,args) { + + // deviceId aka uuid, stored in Windows.Storage.ApplicationData.current.localSettings.values.deviceId + var deviceId; + + var localSettings = Windows.Storage.ApplicationData.current.localSettings; + + if (localSettings.values.deviceId) { + deviceId = localSettings.values.deviceId; + } + else { + deviceId = localSettings.values.deviceId = utils.createUUID(); + } + + setTimeout(function () { + win({ platform: "windows8", version: "8", uuid: deviceId, cordova: '0.0.0', model: window.clientInformation.platform }); + }, 0); + } + +}; + +require("cordova/windows8/commandProxy").add("Device", module.exports); + diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/wp/Device.cs b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/wp/Device.cs new file mode 100644 index 0000000..0d2576d --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/src/wp/Device.cs @@ -0,0 +1,135 @@ +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +using System; +using System.Net; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Documents; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Shapes; +using Microsoft.Phone.Info; +using System.IO.IsolatedStorage; +using System.Windows.Resources; +using System.IO; +using System.Diagnostics; + +namespace WPCordovaClassLib.Cordova.Commands +{ + public class Device : BaseCommand + { + public void getDeviceInfo(string notused) + { + + string res = String.Format("\"name\":\"{0}\",\"cordova\":\"{1}\",\"platform\":\"{2}\",\"uuid\":\"{3}\",\"version\":\"{4}\",\"model\":\"{5}\"", + this.name, + this.cordova, + this.platform, + this.uuid, + this.version, + this.model); + + + + res = "{" + res + "}"; + //Debug.WriteLine("Result::" + res); + DispatchCommandResult(new PluginResult(PluginResult.Status.OK, res)); + } + + public string model + { + get + { + return DeviceStatus.DeviceName; + //return String.Format("{0},{1},{2}", DeviceStatus.DeviceManufacturer, DeviceStatus.DeviceHardwareVersion, DeviceStatus.DeviceFirmwareVersion); + } + } + + public string name + { + get + { + return DeviceStatus.DeviceName; + + } + } + + public string cordova + { + get + { + // TODO: should be able to dynamically read the Cordova version from somewhere... + return "3.0.0"; + } + } + + public string platform + { + get + { + return Environment.OSVersion.Platform.ToString(); + } + } + + public string uuid + { + get + { + string returnVal = ""; + object id; + UserExtendedProperties.TryGetValue("ANID", out id); + + if (id != null) + { + returnVal = id.ToString().Substring(2, 32); + } + else + { + returnVal = "???unknown???"; + + using (IsolatedStorageFile appStorage = IsolatedStorageFile.GetUserStoreForApplication()) + { + try + { + IsolatedStorageFileStream fileStream = new IsolatedStorageFileStream("DeviceID.txt", FileMode.Open, FileAccess.Read, appStorage); + + using (StreamReader reader = new StreamReader(fileStream)) + { + returnVal = reader.ReadLine(); + } + } + catch (Exception /*ex*/) + { + + } + } + } + + return returnVal; + } + } + + public string version + { + get + { + return Environment.OSVersion.Version.ToString(); + } + } + + } +} diff --git a/bindings/cordova/org.crosswire.sword.cordova.SWORD/www/SWORD.js b/bindings/cordova/org.crosswire.sword.cordova.SWORD/www/SWORD.js new file mode 100644 index 0000000..3362359 --- /dev/null +++ b/bindings/cordova/org.crosswire.sword.cordova.SWORD/www/SWORD.js @@ -0,0 +1,414 @@ +var argscheck = require('cordova/argscheck'), + channel = require('cordova/channel'), + utils = require('cordova/utils'), + exec = require('cordova/exec'), + cordova = require('cordova'); + +channel.createSticky('onSWORDReady'); +// Tell cordova channel to wait on the CordovaInfoReady event +channel.waitForInitialization('onSWORDReady'); + + +function InstallMgr() { +} + +InstallMgr.prototype.setUserDisclaimerConfirmed = function(callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "InstallMgr_setUserDisclaimerConfirmed", [] + ); + return retVal; +} + +InstallMgr.prototype.syncConfig = function(callback, progressNotify) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "InstallMgr_syncConfig", [progressNotify] + ); + return retVal; +} + + +InstallMgr.prototype.getRemoteSources = function(callback) { + var retVal = []; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "InstallMgr_getRemoteSources", [] + ); + return retVal; +} + + +InstallMgr.prototype.refreshRemoteSource = function(sourceName, callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "InstallMgr_refreshRemoteSource", [sourceName] + ); + return retVal; +} + +InstallMgr.prototype.getRemoteModInfoList = function(sourceName, callback) { + var retVal = []; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "InstallMgr_getRemoteModInfoList", [sourceName] + ); + return retVal; +} + +// callback({ status : preStatus|update|complete, totalBytes : n, completedBytes : n, message : displayable }); +InstallMgr.prototype.remoteInstallModule = function(sourceName, modName, callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "InstallMgr_remoteInstallModule", [sourceName, modName] + ); + return retVal; +} + +InstallMgr.prototype.uninstallModule = function(modName, callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "InstallMgr_uninstallModule", [modName] + ); + return retVal; +} + +function SWModule(modInfo) { + this.name = modInfo.name; + this.description = modInfo.description; + this.category = modInfo.category; + this.direction = modInfo.direction; + this.language = modInfo.language; + this.font = modInfo.font; + this.shortCopyright = modInfo.shortCopyright; + this.shortPromo = modInfo.shortPromo; +} + +SWModule.prototype.SEARCHTYPE_REGEX = 1; +SWModule.prototype.SEARCHTYPE_PHRASE = -1; +SWModule.prototype.SEARCHTYPE_MULTIWORD = -2; +SWModule.prototype.SEARCHTYPE_ENTRYATTR = -3; +SWModule.prototype.SEARCHTYPE_LUCENE = -4; + +SWModule.prototype.SEARCHOPTION_ICASE = 2; + + +SWModule.prototype.setKeyText = function(keyText, callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_setKeyText", [this.name, keyText] + ); + return retVal; +} + +SWModule.prototype.search = function(expression, searchType, flags, scope, callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_search", [this.name, expression, searchType, flags, scope] + ); + return retVal; +} + +SWModule.prototype.getKeyText = function(callback) { + var retVal = null; + exec(callback?callback:function(m) { retVal = m; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_getKeyText", [this.name] + ); + return retVal; +} + +SWModule.prototype.getRenderText = function(callback) { + var retVal = null; + exec(callback?callback:function(m) { retVal = m; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_getRenderText", [this.name] + ); + return retVal; +} + +SWModule.prototype.shareVerse = function(callback) { + var retVal = null; + exec(callback?callback:function(m) { retVal = m; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_sendText", [this.name] + ); + return retVal; +} + +/* + * masterMod - SWModule to use for traversing chapter; null if self + * useful for parallel display with alternate v11ns + * + * returns [ { verse : verseKey, preVerse : 'text', text : 'text' }, ... } + */ +SWModule.prototype.getRenderChapter = function(masterMod, callback) { + var retVal = null; + if (!masterMod) masterMod = this; + exec(callback?callback:function(m) { retVal = m; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_getRenderChapter", [masterMod.name, this.name] + ); + return retVal; +} + +SWModule.prototype.getRenderHeader = function(callback) { + var retVal = null; + exec(callback?callback:function(m) { retVal = m; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_getRenderHeader", [this.name] + ); + return retVal; +} + +SWModule.prototype.getKeyChildren = function(callback) { + var retVal = []; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_getKeyChildren", [this.name] + ); + return retVal; +} + +SWModule.prototype.getVerseKey = function(callback) { + var retVal = {}; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_getVerseKey", [this.name] + ); + return retVal; +} + +SWModule.prototype.getConfigEntry = function(key, callback) { + var retVal = ''; + exec(callback?callback:function(m) { if (m) retVal = m; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_getConfigEntry", [this.name, key] + ); + return retVal; +} + + +SWModule.prototype.popError = function(callback) { + var retVal = 0; + exec(callback?callback:function(m) { retVal = m; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_popError", [this.name] + ); + return retVal; +} + +SWModule.prototype.getEntryAttribute = function(level1Key, level2Key, level3Key, isFiltered, callback) { + var retVal = []; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_getEntryAttribute", [this.name, level1Key, level2Key, level3Key, isFiltered] + ); + return retVal; +} + +SWModule.prototype.next = function(callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_next", [this.name] + ); + return retVal; +} + +SWModule.prototype.previous = function(callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_previous", [this.name] + ); + return retVal; +} + +SWModule.prototype.begin = function(callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_begin", [this.name] + ); + return retVal; +} + +SWModule.prototype.getBookNames = function(callback) { + var retVal = []; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWModule_getBookNames", [this.name] + ); + return retVal; +} + +function SWMgr() { +} + + +SWMgr.prototype.getModInfoList = function(callback) { + if (!this.hasOwnProperty('_lastModInfoList')) this._lastModInfoList = []; + exec(function(m) { if (m && m.length > 0) this._lastModInfoList = m; if (callback) callback(m); }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWMgr_getModInfoList", [] + ); + return this._lastModInfoList; +} + +SWMgr.prototype.getModuleByName = function(modName, callback) { + var mod = null; + exec(function(m) { if (m.name) mod = new SWModule(m); if (callback) callback(mod); }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWMgr_getModuleByName", [modName] + ); + return mod; +} + +SWMgr.prototype.getExtraConfigSections = function(callback) { + var retVal = []; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWMgr_getExtraConfigSections", [] + ); + return retVal; +} + +SWMgr.prototype.getExtraConfigKeys = function(section, callback) { + var retVal = []; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWMgr_getExtraConfigKeys", [section] + ); + return retVal; +} + +SWMgr.prototype.getExtraConfigValue = function(section, key, callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWMgr_getExtraConfigValue", [section, key] + ); + return retVal; +} + +SWMgr.prototype.setExtraConfigValue = function(section, key, value, callback) { + exec(callback?callback:function() {}, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWMgr_setExtraConfigValue", [section, key, value] + ); +} + +SWMgr.prototype.addExtraConfig = function(confBlob, callback) { + var retVal = null; + exec(callback?callback:function(r) { retVal = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWMgr_addExtraConfig", [confBlob] + ); + return retVal; +} + +SWMgr.prototype.registerBibleSyncListener = function(callback) { + exec(callback, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWMgr_registerBibleSyncListener", [] + ); +} + +SWMgr.prototype.sendBibleSyncMessage = function(osisRef, callback) { + exec(callback?callback:function() {}, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWMgr_sendBibleSyncMessage", [osisRef] + ); +} + +SWMgr.prototype.setJavascript = function(val, callback) { + exec(callback?callback:function() {}, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "SWMgr_setJavascript", [val] + ); +} + +function HTTPUtils() {} + +HTTPUtils.prototype.METHOD_GET = 0; +HTTPUtils.prototype.METHOD_POST = 1; + +HTTPUtils.prototype.makeRequest = function(url, postData, callback, method) { + var result = null; + if (!method) method = this.METHOD_POST; + exec(callback?callback:function(r) { if (r && r.length > 0) result = r; }, + function(err) { utils.alert('[ERROR] problem: ' + err); }, + "SWORD", "HTTPUtils_makeRequest", [url, postData, method] + ); + return result; +} + + + +/* + public native String getPrefixPath(); + public native String getConfigPath(); + public native void setGlobalOption(String option, String value); + public native String getGlobalOption(String option); + public native String getGlobalOptionTip(String option); + public native String filterText(String filterName, String text); + public native String[] getGlobalOptions(); + public native String[] getGlobalOptionValues(String option); + public native void setCipherKey(String modName, String key); + public native void setJavascript(boolean val); + public native String[] getAvailableLocales(); + public native void setDefaultLocale(String name); +*/ + + +/** + * This is the SWORD namespace and access to singleton SWMgr, InstallMgr, and HTTPUtils. + * @constructor + */ +function SWORD() { + + var me = this; + + this.available = false; + this.version = null; + + this.installMgr = new InstallMgr(); + this.mgr = new SWMgr(); + this.httpUtils = new HTTPUtils(); + + channel.onCordovaReady.subscribe(function() { + me.init(function(info) { + me.available = true; + me.version = info.version; + channel.onSWORDReady.fire(); + },function(e) { + me.available = false; + utils.alert("[ERROR] Error initializing SWORD: " + e); + }); + }); +} + + +SWORD.prototype.CATEGORY_BIBLES = "Biblical Texts"; +SWORD.prototype.CATEGORY_COMMENTARIES = "Commentaries"; +SWORD.prototype.CATEGORY_LEXDICTS = "Lexicons / Dictionaries"; +SWORD.prototype.CATEGORY_GENBOOKS = "Generic Books"; +SWORD.prototype.CATEGORY_DAILYDEVOS = "Daily Devotional"; + + +SWORD.prototype.init = function(successCallback, errorCallback) { + exec(successCallback, errorCallback, "SWORD", "initSWORD", []); +}; + + +module.exports = new SWORD(); + + diff --git a/bindings/csharp/NativeMethods.cs b/bindings/csharp/NativeMethods.cs index 6a3c911..6ea973b 100644 --- a/bindings/csharp/NativeMethods.cs +++ b/bindings/csharp/NativeMethods.cs @@ -33,6 +33,8 @@ namespace Sword public string Description; public string Category; public string Language; + public string Version; + public string Delta; }; [StructLayout(LayoutKind.Sequential)] @@ -73,53 +75,51 @@ namespace Sword public static class NativeMethods { + public const string DLLNAME = "libsword"; - - public const string DLLNAME = "libsword.so"; - - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr org_crosswire_sword_SWMgr_new(); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr org_crosswire_sword_SWMgr_newWithPath(string path); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr org_crosswire_sword_SWMgr_getModuleByName(IntPtr hSWMgr, string moduleName); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern void org_crosswire_sword_SWModule_setKeyText(IntPtr hSWModule, string key); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr org_crosswire_sword_SWModule_renderText(IntPtr hSWModule); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr org_crosswire_sword_SWModule_getRawEntry(IntPtr hSWModule); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr org_crosswire_sword_SWModule_getKeyText(IntPtr hSWModule); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern void org_crosswire_sword_SWMgr_delete(IntPtr hSWMgr); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr org_crosswire_sword_SWMgr_getModInfoList(IntPtr hSWMgr); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr org_crosswire_sword_SWModule_stripText(IntPtr hSWModule); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern void org_crosswire_sword_SWModule_setRawEntry(IntPtr hSWModule, string entryBuffer); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern void org_crosswire_sword_SWModule_terminateSearch(IntPtr hSWModule); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern char org_crosswire_sword_SWModule_popError(IntPtr hSWModule); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern long org_crosswire_sword_SWModule_getEntrySize(IntPtr hSWModule); - [DllImport(DLLNAME)] + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr org_crosswire_sword_SWModule_getEntryAttribute(IntPtr hSWModule, string level1, string level2, string level3, char filteredBool); [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] diff --git a/bindings/csharp/tests/ManagerTests.cs b/bindings/csharp/tests/ManagerTests.cs index 6f71b33..ec7d6cd 100644 --- a/bindings/csharp/tests/ManagerTests.cs +++ b/bindings/csharp/tests/ManagerTests.cs @@ -14,6 +14,7 @@ using System; using NUnit.Framework; using System.IO; +using System.Collections.Generic; using System.Linq; namespace Sword.Tests @@ -84,10 +85,20 @@ namespace Sword.Tests public void AvailableLocales_Get_DoesntCrash() { //act - var availableLocales = _manager.AvailableLocales.ToArray(); + string[] availableLocales = _manager.AvailableLocales.ToArray(); //Assert - Assert.That (availableLocales[0].Contains("en")); + Assert.That (availableLocales.Length > 0); + } + + [Test] + public void AvailableLocales_Get_ContainsEnglish() + { + //act + string[] availableLocales = _manager.AvailableLocales.ToArray(); + + //Assert + Assert.That (availableLocales.Any(locale => locale == "en")); } [Test] diff --git a/bindings/flatapi.cpp b/bindings/flatapi.cpp index aaec8df..b41303f 100644 --- a/bindings/flatapi.cpp +++ b/bindings/flatapi.cpp @@ -3,7 +3,7 @@ * flatapi.cpp - This file contains an api usable by non-C++ * environments * - * $Id: flatapi.cpp 3275 2014-12-03 05:56:54Z greg.hellings $ + * $Id: flatapi.cpp 3561 2018-01-07 06:45:42Z greg.hellings $ * * Copyright 2002-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -33,6 +33,7 @@ #include <treekeyidx.h> #include <filemgr.h> #include <swbuf.h> +#include <swlog.h> #include <localemgr.h> #include <utilstr.h> #include "corba/orbitcpp/webmgr.hpp" @@ -91,51 +92,43 @@ void clearModInfoArray(org_crosswire_sword_ModInfo **modInfo) { struct pu { char last; - SWHANDLE progressReporter; - - void init(SWHANDLE pr) { progressReporter = pr; last = 0; } -/* - pu(JNIEnv *env, jobject pr) : env(env), progressReporter(pr), last(0) {} - JNIEnv *env; - jobject progressReporter; -*/ + org_crosswire_sword_SWModule_SearchCallback progressReporter; + void init(org_crosswire_sword_SWModule_SearchCallback pr) { progressReporter = pr; last = 0; } }; void percentUpdate(char percent, void *userData) { struct pu *p = (struct pu *)userData; if (percent != p->last) { + p->progressReporter((int)percent); p->last = percent; -/* - jclass cls = p->env->GetObjectClass(p->progressReporter); - jmethodID mid = p->env->GetMethodID(cls, "progressReport", "(I)V"); - if (mid != 0) { - p->env->CallVoidMethod(p->progressReporter, mid, (jint)percent); - } -*/ } } + class MyStatusReporter : public StatusReporter { public: - int last; - SWHANDLE statusReporter; + unsigned long last; + org_crosswire_sword_InstallMgr_StatusCallback statusReporter; MyStatusReporter() : last(0), statusReporter(0) {} - void init(SWHANDLE sr) { statusReporter = sr; last = 0; } - virtual void update(unsigned long totalBytes, unsigned long completedBytes) { - int p = (totalBytes > 0) ? (int)(74.0 * ((double)completedBytes / (double)totalBytes)) : 0; - for (;last < p; ++last) { - if (!last) { - SWBuf output; - output.setFormatted("[ File Bytes: %ld", totalBytes); - while (output.size() < 75) output += " "; - output += "]"; -// cout << output.c_str() << "\n "; - } -// cout << "-"; - } -// cout.flush(); + void init(org_crosswire_sword_InstallMgr_StatusCallback sr) { statusReporter = sr; last = 0xffffffff; } + + virtual void update(unsigned long totalBytes, unsigned long completedBytes) { + + if (!statusReporter) return; + + if (completedBytes != last) { + statusReporter("update", totalBytes, completedBytes); + last = completedBytes; + } } - virtual void preStatus(long totalBytes, long completedBytes, const char *message) { + + + virtual void preStatus(long totalBytes, long completedBytes, const char *message) { + + if (!statusReporter) return; + + statusReporter(message, totalBytes, completedBytes); +/* SWBuf output; output.setFormatted("[ Total Bytes: %ld; Completed Bytes: %ld", totalBytes, completedBytes); while (output.size() < 75) output += " "; @@ -145,7 +138,9 @@ public: // for (int i = 0; i < p; ++i) { cout << "="; } // cout << "\n\n" << message << "\n"; last = 0; +*/ } + }; class HandleSWModule { @@ -157,15 +152,12 @@ public: char *rawEntry; char *configEntry; struct pu peeuuu; - // making searchHits cache static saves memory only having a single - // outstanding copy, but also is not threadsafe. Remove static here - // and fix compiling bugs and add clearSearchHits() to d-tor to change - static org_crosswire_sword_SearchHit *searchHits; - static const char **entryAttributes; - static const char **parseKeyList; - static const char **keyChildren; - - HandleSWModule(SWModule *mod) { + org_crosswire_sword_SearchHit *searchHits; + const char **entryAttributes; + const char **parseKeyList; + const char **keyChildren; + + HandleSWModule(SWModule *mod) : searchHits(0), entryAttributes(0), parseKeyList(0), keyChildren(0) { this->mod = mod; this->renderBuf = 0; this->stripBuf = 0; @@ -179,9 +171,13 @@ public: delete [] renderHeader; delete [] rawEntry; delete [] configEntry; + clearSearchHits(); + clearEntryAttributes(); + clearParseKeyList(); + clearKeyChildren(); } - static void clearSearchHits() { + void clearSearchHits() { if (searchHits) { for (int i = 0; true; ++i) { if (searchHits[i].modName) { @@ -193,13 +189,13 @@ public: searchHits = 0; } } - static void clearEntryAttributes() { + void clearEntryAttributes() { clearStringArray(&entryAttributes); } - static void clearParseKeyList() { + void clearParseKeyList() { clearStringArray(&parseKeyList); } - static void clearKeyChildren() { + void clearKeyChildren() { clearStringArray(&keyChildren); } }; @@ -264,7 +260,7 @@ public: MyStatusReporter statusReporter; HandleInstMgr() : installMgr(0), modInfo(0) {} HandleInstMgr(InstallMgr *mgr) { - this->installMgr = installMgr; + this->installMgr = mgr; this->modInfo = 0; } @@ -294,10 +290,6 @@ public: }; -org_crosswire_sword_SearchHit *HandleSWModule::searchHits = 0; -const char **HandleSWModule::entryAttributes = 0; -const char **HandleSWModule::parseKeyList = 0; -const char **HandleSWModule::keyChildren = 0; const char **HandleSWMgr::globalOptions = 0; const char **HandleSWMgr::globalOptionValues = 0; @@ -305,14 +297,12 @@ const char **HandleSWMgr::availableLocales = 0; const char **HandleInstMgr::remoteSources = 0; +const char **tmpStringArrayRetVal = 0; +char *tmpStringRetVal = 0; + class InitStatics { public: InitStatics() { -// these are redundant with the static declarations above, but ??? doesn't hurt - HandleSWModule::searchHits = 0; - HandleSWModule::entryAttributes = 0; - HandleSWModule::parseKeyList = 0; - HandleSWModule::keyChildren = 0; HandleSWMgr::globalOptions = 0; HandleSWMgr::globalOptionValues = 0; @@ -321,15 +311,15 @@ public: HandleInstMgr::remoteSources = 0; } ~InitStatics() { - HandleSWModule::clearSearchHits(); - HandleSWModule::clearEntryAttributes(); - HandleSWModule::clearParseKeyList(); - HandleSWModule::clearKeyChildren(); HandleSWMgr::clearGlobalOptions(); HandleSWMgr::clearGlobalOptionValues(); HandleInstMgr::clearRemoteSources(); + + clearStringArray(&tmpStringArrayRetVal); + sword::stdstr(&tmpStringRetVal, (const char *)0); + } } _initStatics; @@ -337,7 +327,30 @@ public: } +// +// SWLog methods +// +// + +void SWDLLEXPORT org_crosswire_sword_SWlog_logError(const char *msg) { + SWLog::getSystemLog()->logError(msg); +} + +void SWDLLEXPORT org_crosswire_sword_SWlog_logDebug(const char *msg) { + SWLog::getSystemLog()->logDebug(msg); +} + +void SWDLLEXPORT org_crosswire_sword_SWlog_logWarning(const char *msg) { + SWLog::getSystemLog()->logWarning(msg); +} + +void SWDLLEXPORT org_crosswire_sword_SWlog_logInformation(const char *msg) { + SWLog::getSystemLog()->logInformation(msg); +} +void SWDLLEXPORT org_crosswire_sword_SWlog_logTimedInformation(const char *msg) { + SWLog::getSystemLog()->logTimedInformation(msg); +} // @@ -364,7 +377,7 @@ void SWDLLEXPORT org_crosswire_sword_SWModule_terminateSearch * Signature: (Ljava/lang/String;IJLjava/lang/String;Lorg/crosswire/android/sword/SWModule/SearchProgressReporter;)[Lorg/crosswire/android/sword/SWModule/SearchHit; */ const struct org_crosswire_sword_SearchHit * SWDLLEXPORT org_crosswire_sword_SWModule_search - (SWHANDLE hSWModule, const char *searchString, int searchType, long flags, const char *scope, SWHANDLE progressReporter) { + (SWHANDLE hSWModule, const char *searchString, int searchType, long flags, const char *scope, org_crosswire_sword_SWModule_SearchCallback progressReporter) { GETSWMODULE(hSWModule, 0); @@ -458,7 +471,7 @@ const char ** SWDLLEXPORT org_crosswire_sword_SWModule_getEntryAttribute sword::AttributeList::iterator i2Start, i2End; sword::AttributeValue::iterator i3Start, i3End; - if ((level1) && (*level1)) { + if ((level1) && (*level1) && *level1 != '-') { i1Start = entryAttribs.find(level1); i1End = i1Start; if (i1End != entryAttribs.end()) @@ -469,35 +482,54 @@ const char ** SWDLLEXPORT org_crosswire_sword_SWModule_getEntryAttribute i1End = entryAttribs.end(); } for (;i1Start != i1End; ++i1Start) { - if ((level2) && (*level2)) { - i2Start = i1Start->second.find(level2); - i2End = i2Start; - if (i2End != i1Start->second.end()) - ++i2End; + if (level1 && *level1 && *level1 == '-') { + results.push_back(i1Start->first); } else { - i2Start = i1Start->second.begin(); - i2End = i1Start->second.end(); - } - for (;i2Start != i2End; ++i2Start) { - if ((level3) && (*level3)) { - i3Start = i2Start->second.find(level3); - i3End = i3Start; - if (i3End != i2Start->second.end()) - ++i3End; + if (level2 && *level2 && *level2 != '-') { + i2Start = i1Start->second.find(level2); + i2End = i2Start; + if (i2End != i1Start->second.end()) + ++i2End; } else { - i3Start = i2Start->second.begin(); - i3End = i2Start->second.end(); + i2Start = i1Start->second.begin(); + i2End = i1Start->second.end(); } - for (;i3Start != i3End; ++i3Start) { - results.push_back(i3Start->second); + for (;i2Start != i2End; ++i2Start) { + if (level2 && *level2 && *level2 == '-') { + results.push_back(i2Start->first); + } + else { + // allow '-' to get all keys; allow '*' to get all key=value + if (level3 && *level3 && *level3 != '-' && *level3 != '*') { + i3Start = i2Start->second.find(level3); + i3End = i3Start; + if (i3End != i2Start->second.end()) + ++i3End; + } + else { + i3Start = i2Start->second.begin(); + i3End = i2Start->second.end(); + } + for (;i3Start != i3End; ++i3Start) { + if (level3 && *level3 && *level3 == '-') { + results.push_back(i3Start->first); + } + else if (level3 && *level3 && *level3 == '*') { + results.push_back(i3Start->first + "=" + i3Start->second); + } + else { + results.push_back(i3Start->second); + } + } + if (i3Start != i3End) + break; + } } - if (i3Start != i3End) + if (i2Start != i2End) break; } - if (i2Start != i2End) - break; } const char **retVal = (const char **)calloc(results.size()+1, sizeof(const char *)); @@ -644,7 +676,7 @@ const char ** SWDLLEXPORT org_crosswire_sword_SWModule_getKeyChildren sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey) { - retVal = (const char **)calloc(9, sizeof(const char *)); + retVal = (const char **)calloc(11, sizeof(const char *)); SWBuf num; num.appendFormatted("%d", vkey->getTestament()); stdstr((char **)&(retVal[0]), num.c_str()); @@ -665,6 +697,8 @@ const char ** SWDLLEXPORT org_crosswire_sword_SWModule_getKeyChildren stdstr((char **)&(retVal[5]), num.c_str()); stdstr((char **)&(retVal[6]), vkey->getBookName()); stdstr((char **)&(retVal[7]), vkey->getOSISRef()); + stdstr((char **)&(retVal[8]), vkey->getShortText()); + stdstr((char **)&(retVal[9]), vkey->getBookAbbrev()); } else { TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key); @@ -941,6 +975,31 @@ SWHANDLE SWDLLEXPORT org_crosswire_sword_SWMgr_new() { return (SWHANDLE) new HandleSWMgr(new WebMgr(sysConf)); } +/* + * Class: org_crosswire_sword_SWMgr + * Method: new + * Signature: ()V + */ +SWHANDLE SWDLLEXPORT org_crosswire_sword_SWMgr_newWithPath(const char *path) { + SWBuf confPath = path; + if (!confPath.endsWith("/")) confPath.append('/'); + SWBuf modsd = confPath + "mods.d"; + // be sure we have at least some config file already out there + if (!FileMgr::existsFile(modsd.c_str())) { + modsd.append("/globals.conf"); + FileMgr::createParent(modsd.c_str()); + SWConfig config(modsd.c_str()); + config["Globals"]["HiAndroid"] = "weeee"; + config.save(); + } + SWBuf extraPath = confPath + "extraConfig.conf"; + bool exists = FileMgr::existsFile(extraPath.c_str()); +SWLog::getSystemLog()->logDebug("libsword: extraConfig %s at path: %s", exists?"Exists":"Absent", extraPath.c_str()); + +SWLog::getSystemLog()->logDebug("libsword: init() creating WebMgr using path: %s", path); + return (SWHANDLE) new HandleSWMgr(new WebMgr(confPath.c_str(), exists?extraPath.c_str():0)); +} + /* * Class: org_crosswire_sword_SWMgr @@ -996,10 +1055,10 @@ const struct org_crosswire_sword_ModInfo * SWDLLEXPORT org_crosswire_sword_SWMgr stdstr(&(milist[i].name), assureValidUTF8(module->getName())); stdstr(&(milist[i].description), assureValidUTF8(module->getDescription())); stdstr(&(milist[i].category), assureValidUTF8(type.c_str())); - stdstr(&(milist[i++].language), assureValidUTF8(module->getLanguage())); - stdstr(&(milist[i++].version), assureValidUTF8(version.c_str())); - stdstr(&(milist[i++].delta), ""); - if (i >= size) break; + stdstr(&(milist[i].language), assureValidUTF8(module->getLanguage())); + stdstr(&(milist[i].version), assureValidUTF8(version.c_str())); + stdstr(&(milist[i].delta), ""); + if (++i >= size) break; } } hmgr->modInfo = milist; @@ -1131,6 +1190,164 @@ const char ** SWDLLEXPORT org_crosswire_sword_SWMgr_getGlobalOptions return retVal; } + +/* + * Class: org_crosswire_sword_SWConfig + * Method: getSections + * Signature: ()[Ljava/lang/String; + */ +const char ** SWDLLEXPORT org_crosswire_sword_SWConfig_getSections + (const char *confPath) { + + clearStringArray(&tmpStringArrayRetVal); + int count = 0; + const char **retVal = 0; + bool exists = FileMgr::existsFile(confPath); +SWLog::getSystemLog()->logDebug("libsword: getConfigSections %s at path: %s", exists?"Exists":"Absent", confPath); + if (exists) { + SWConfig config(confPath); + SectionMap::const_iterator sit; + for (sit = config.getSections().begin(); sit != config.getSections().end(); ++sit) { + count++; + } + SWLog::getSystemLog()->logDebug("libsword: %d sections found in config", count); + retVal = (const char **)calloc(count+1, sizeof(const char *)); + count = 0; + for (sit = config.getSections().begin(); sit != config.getSections().end(); ++sit) { + stdstr((char **)&(retVal[count++]), assureValidUTF8(sit->first.c_str())); + } + } + else { + retVal = (const char **)calloc(1, sizeof(const char *)); + } + + tmpStringArrayRetVal = retVal; + return retVal; +} + + + +/* + * Class: org_crosswire_sword_SWConfig + * Method: getSectionKeys + * Signature: (Ljava/lang/String;)[Ljava/lang/String; + */ +const char ** SWDLLEXPORT org_crosswire_sword_SWConfig_getSectionKeys + (const char *confPath, const char *section) { + + clearStringArray(&tmpStringArrayRetVal); + int count = 0; + const char **retVal = 0; + bool exists = FileMgr::existsFile(confPath); + if (exists) { + SWConfig config(confPath); + SectionMap::const_iterator sit = config.getSections().find(section); + if (sit != config.getSections().end()) { + ConfigEntMap::const_iterator it; + for (it = sit->second.begin(); it != sit->second.end(); ++it) { + count++; + } + retVal = (const char **)calloc(count+1, sizeof(const char *)); + count = 0; + for (it = sit->second.begin(); it != sit->second.end(); ++it) { + stdstr((char **)&(retVal[count++]), assureValidUTF8(it->first.c_str())); + } + } + else { + retVal = (const char **)calloc(1, sizeof(const char *)); + } + } + else { + retVal = (const char **)calloc(1, sizeof(const char *)); + } + + tmpStringArrayRetVal = retVal; + return retVal; +} + + +/* + * Class: org_crosswire_sword_SWConfig + * Method: getKeyValue + * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + */ +const char * SWDLLEXPORT org_crosswire_sword_SWConfig_getKeyValue + (const char *confPath, const char *section, const char *key) { + + stdstr(&tmpStringRetVal, 0); + bool exists = FileMgr::existsFile(confPath); + if (exists) { + SWConfig config(confPath); + SectionMap::const_iterator sit = config.getSections().find(section); + if (sit != config.getSections().end()) { + ConfigEntMap::const_iterator it = sit->second.find(key); + if (it != sit->second.end()) { + stdstr(&tmpStringRetVal, assureValidUTF8(it->second.c_str())); + } + } + } + + return tmpStringRetVal; +} + + +/* + * Class: org_crosswire_sword_SWConfig + * Method: setKeyValue + * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + */ +void SWDLLEXPORT org_crosswire_sword_SWConfig_setKeyValue + (const char *confPath, const char *section, const char *key, const char *value) { + + SWConfig config(confPath); + config[section][key] = value; + config.save(); +} + + +/* + * Class: org_crosswire_sword_SWConfig + * Method: augmentConfig + * Signature: (Ljava/lang/String;)[Ljava/lang/String; + */ +const char ** SWDLLEXPORT org_crosswire_sword_SWConfig_augmentConfig + (const char *confPath, const char *configBlob) { + + + clearStringArray(&tmpStringArrayRetVal); + const char **retVal = 0; + int count = 0; + + SWBuf myBlob = configBlob; + + SWConfig config(confPath); + + FileMgr::removeFile(confPath); + FileDesc *fd = FileMgr::getSystemFileMgr()->open(confPath, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE); + fd->getFd(); + fd->write(myBlob.c_str(), myBlob.size()); + FileMgr::getSystemFileMgr()->close(fd); + + SWConfig newConfig(confPath); + + config.augment(newConfig); + config.save(); + + SectionMap::const_iterator sit; + for (sit = newConfig.getSections().begin(); sit != newConfig.getSections().end(); ++sit) { + count++; + } + retVal = (const char **)calloc(count+1, sizeof(const char *)); + count = 0; + for (sit = newConfig.getSections().begin(); sit != newConfig.getSections().end(); ++sit) { + stdstr((char **)&(retVal[count++]), assureValidUTF8(sit->first.c_str())); + } + + tmpStringArrayRetVal = retVal; + return retVal; +} + + /* * Class: org_crosswire_sword_SWMgr * Method: getGlobalOptionValues @@ -1254,7 +1471,7 @@ const char * SWDLLEXPORT org_crosswire_sword_SWMgr_translate * Signature: (Ljava/lang/String;Lorg/crosswire/android/sword/SWModule/SearchProgressReporter;)V */ SWHANDLE SWDLLEXPORT org_crosswire_sword_InstallMgr_new - (const char *baseDir, SWHANDLE statusReporter) { + (const char *baseDir, org_crosswire_sword_InstallMgr_StatusCallback statusReporter) { SWBuf confPath = SWBuf(baseDir) + "/InstallMgr.conf"; // be sure we have at least some config file already out there if (!FileMgr::existsFile(confPath.c_str())) { @@ -1263,7 +1480,7 @@ SWHANDLE SWDLLEXPORT org_crosswire_sword_InstallMgr_new SWConfig config(confPath.c_str()); config["General"]["PassiveFTP"] = "true"; - config.Save(); + config.save(); } HandleInstMgr *hinstmgr = new HandleInstMgr(); hinstmgr->statusReporter.init(statusReporter); @@ -1273,6 +1490,17 @@ SWHANDLE SWDLLEXPORT org_crosswire_sword_InstallMgr_new /* * Class: org_crosswire_sword_InstallMgr + * Method: delete + * Signature: ()V + */ +void SWDLLEXPORT org_crosswire_sword_InstallMgr_delete + (SWHANDLE hInstallMgr) { + HandleInstMgr *hinstMgr = (HandleInstMgr *)hInstallMgr; + if (hinstMgr) delete hinstMgr; +} + +/* + * Class: org_crosswire_sword_InstallMgr * Method: setUserDisclaimerConfirmed * Signature: ()V */ diff --git a/bindings/java-jni/Makefile b/bindings/java-jni/Makefile index 1fd3743..0059b0e 100644 --- a/bindings/java-jni/Makefile +++ b/bindings/java-jni/Makefile @@ -1,4 +1,5 @@ all: + cp ../corba/orbitcpp/webmgr.hpp jni/ mkdir -p classes javac -d classes src/org/crosswire/android/sword/*.java javah -d jni -classpath classes -jni org.crosswire.android.sword.SWMgr @@ -10,6 +11,8 @@ all: javap -s -classpath classes/ org.crosswire.android.sword.SWModule.SearchHit > SearchHit.txt javap -s -classpath classes/ org.crosswire.android.sword.SWModule.SearchProgressReporter > SearchProgressReporter.txt javap -s -classpath classes/ org.crosswire.android.sword.InstallMgr > InstallMgr.txt - cp src/org/crosswire/android/sword/*.java /home/scribe/src/bishop/src/org/crosswire/android/sword/ + cp src/org/crosswire/android/sword/*.java ../Android/SWORD/app/src/main/java/org/crosswire/android/sword/ +clean: + rm -rf classes jni/org_crosswire_android_sword_*.h *.txt diff --git a/bindings/java-jni/README b/bindings/java-jni/README index 80c256a..e4b89fb 100644 --- a/bindings/java-jni/README +++ b/bindings/java-jni/README @@ -1,27 +1,28 @@ -Android Build Instructions - -You'll need the Android NDK. - -Then link the sword/bindings/java-jni folder to your project's /jni folder. -I have a symlink: - -~/src/bishop/jni -> ~/src/sword/bindings/java-jni/jni/ - -~/src/sword is simply a checkout of the current sword svn repository. -(svn co https://crosswire.org/svn/sword/trunk ~/src/sword) - - -So, since my $HOME directly is /home/scribe, my configuration looks like this: - -/home/scribe/src/sword/ -/home/scribe/src/bishop/ -/home/scribe/android-ndk-r8e/ - -with: - -APP_PROJECT_PATH := $(call my-dir)/../../../src/bishop -APP_MODULES := sword swordcore -APP_PLATFORM := android-3 - +This folder contains java-jni bindings. They are 99% generic but have +some Android-specific code which should eventually be removed. This +includes setting a SWLog::setSystemLog(new AndroidLogger()) and an +org.crosswire.android.sword.* package. This was not changed to +org.crosswire.sword.* because there are conflicting SWMgr, et. al. +classes from the crosswire-java project and the CORBA bindings. +org.crosswire.jni.sword.* is an option but exposing the impl in the +package name is bad practice. More thought needed. + +A make in here should produce the JNI wrappers. +jni/swordstub.cpp is the jni implementation + +This make also copies the java src/ files to the ../Android binding folder. +The ../Android binding folder symlinks to the jni cpp file generated here. + +There is an Android Studio project there to build the native libs + +The steps to build all of this are usually: +1) make in this folder +2) build all in ../Android/SWORD Android Studio project +3) a make in the ../Android/ folder, which finally copies the binary libs + to the ../cordova/ bindings folder to produce a working cordova + plugin + +Android java bindings can be used after step 2 +cordova javascript bindings can be used after step 3 Hope this helps get you started. Let me know your progress! diff --git a/bindings/java-jni/jni/Android.mk b/bindings/java-jni/jni/Android.mk index 5d793a0..5ce1c3c 100644 --- a/bindings/java-jni/jni/Android.mk +++ b/bindings/java-jni/jni/Android.mk @@ -28,11 +28,17 @@ include $(CLEAR_VARS) LOCAL_MODULE := libswordcore LOCAL_C_INCLUDES := ../sword/include ../sword/include/internal/regex LOCAL_CFLAGS += -D__unix__ \ + -fvisibility=hidden \ -DSTDC_HEADERS \ -Dunix \ -D_FTPLIB_NO_COMPAT \ -DANDROID \ + -DEXCLUDEBZIP2 \ + -DEXCLUDEXZ \ -DOS_ANDROID + +#LOCAL_CFLAGS += -g + LOCAL_SRC_FILES := ../../../src/modules/comments/zcom/zcom.cpp \ ../../../src/modules/comments/rawfiles/rawfiles.cpp \ ../../../src/modules/comments/rawcom4/rawcom4.cpp \ @@ -54,8 +60,6 @@ LOCAL_SRC_FILES := ../../../src/modules/comments/zcom/zcom.cpp \ ../../../src/modules/common/rawstr4.cpp \ ../../../src/modules/common/lzsscomprs.cpp \ ../../../src/modules/common/zipcomprs.cpp \ -../../../src/modules/common/bz2comprs.cpp \ -../../../src/modules/common/xzcomprs.cpp \ ../../../src/modules/common/rawverse4.cpp \ ../../../src/modules/common/swcipher.cpp \ ../../../src/modules/common/swcomprs.cpp \ @@ -142,6 +146,10 @@ LOCAL_SRC_FILES := ../../../src/modules/comments/zcom/zcom.cpp \ ../../../src/modules/filters/teiplain.cpp \ ../../../src/modules/filters/swbasicfilter.cpp \ ../../../src/modules/filters/scsuutf8.cpp \ +../../../src/modules/filters/gbflatex.cpp \ +../../../src/modules/filters/thmllatex.cpp \ +../../../src/modules/filters/teilatex.cpp \ +../../../src/modules/filters/osislatex.cpp \ ../../../src/mgr/stringmgr.cpp \ ../../../src/mgr/swmgr.cpp \ ../../../src/mgr/swsearchable.cpp \ @@ -178,6 +186,15 @@ LOCAL_SRC_FILES := ../../../src/modules/comments/zcom/zcom.cpp \ ../../../src/frontend/swlog.cpp \ ../../../src/utilfuns/zlib/untgz.c +# add BibleSync +LOCAL_C_INCLUDES += ../biblesync/include +LOCAL_SRC_FILES += \ + ../../../../biblesync/src/biblesync.cc \ + ../../../../biblesync/src/ifaddrs.c + + +#../../../src/modules/common/bz2comprs.cpp \ +#../../../src/modules/common/xzcomprs.cpp \ #../../../../../sword/src/mgr/curlftpt.cpp \ #../../../../../sword/src/mgr/curlhttpt.cpp \ #../../../../../sword/src/utilfuns/win32/dirent.cpp \ @@ -194,6 +211,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := libsword LOCAL_C_INCLUDES := ../sword/include ../sword/include/internal/regex + +# add BibleSync stuff +LOCAL_C_INCLUDES += ../biblesync/include + LOCAL_CFLAGS += -D__unix__ \ -Dunix \ -D_FTPLIB_NO_COMPAT \ diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_InstallMgr.h b/bindings/java-jni/jni/org_crosswire_android_sword_InstallMgr.h deleted file mode 100644 index b80243b..0000000 --- a/bindings/java-jni/jni/org_crosswire_android_sword_InstallMgr.h +++ /dev/null @@ -1,85 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class org_crosswire_android_sword_InstallMgr */ - -#ifndef _Included_org_crosswire_android_sword_InstallMgr -#define _Included_org_crosswire_android_sword_InstallMgr -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_crosswire_android_sword_InstallMgr - * Method: reInit - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_InstallMgr_reInit - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_InstallMgr - * Method: setUserDisclaimerConfirmed - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_InstallMgr_setUserDisclaimerConfirmed - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_InstallMgr - * Method: syncConfig - * Signature: ()I - */ -JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_syncConfig - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_InstallMgr - * Method: uninstallModule - * Signature: (Ljava/lang/String;)I - */ -JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_uninstallModule - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_InstallMgr - * Method: getRemoteSources - * Signature: ()[Ljava/lang/String; - */ -JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteSources - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_InstallMgr - * Method: refreshRemoteSource - * Signature: (Ljava/lang/String;)I - */ -JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_refreshRemoteSource - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_InstallMgr - * Method: getRemoteModInfoList - * Signature: (Ljava/lang/String;)[Lorg/crosswire/android/sword/SWMgr/ModInfo; - */ -JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteModInfoList - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_InstallMgr - * Method: remoteInstallModule - * Signature: (Ljava/lang/String;Ljava/lang/String;)I - */ -JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_remoteInstallModule - (JNIEnv *, jobject, jstring, jstring); - -/* - * Class: org_crosswire_android_sword_InstallMgr - * Method: getRemoteModuleByName - * Signature: (Ljava/lang/String;Ljava/lang/String;)Lorg/crosswire/android/sword/SWModule; - */ -JNIEXPORT jobject JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteModuleByName - (JNIEnv *, jobject, jstring, jstring); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr.h deleted file mode 100644 index a95cf8e..0000000 --- a/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr.h +++ /dev/null @@ -1,141 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class org_crosswire_android_sword_SWMgr */ - -#ifndef _Included_org_crosswire_android_sword_SWMgr -#define _Included_org_crosswire_android_sword_SWMgr -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: version - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_version - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: reInit - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_reInit - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: getModInfoList - * Signature: ()[Lorg/crosswire/android/sword/SWMgr/ModInfo; - */ -JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getModInfoList - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: getModuleByName - * Signature: (Ljava/lang/String;)Lorg/crosswire/android/sword/SWModule; - */ -JNIEXPORT jobject JNICALL Java_org_crosswire_android_sword_SWMgr_getModuleByName - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: getPrefixPath - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getPrefixPath - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: getConfigPath - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getConfigPath - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: setGlobalOption - * Signature: (Ljava/lang/String;Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setGlobalOption - (JNIEnv *, jobject, jstring, jstring); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: getGlobalOption - * Signature: (Ljava/lang/String;)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOption - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: getGlobalOptionTip - * Signature: (Ljava/lang/String;)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptionTip - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: filterText - * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_filterText - (JNIEnv *, jobject, jstring, jstring); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: getGlobalOptions - * Signature: ()[Ljava/lang/String; - */ -JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptions - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: getGlobalOptionValues - * Signature: (Ljava/lang/String;)[Ljava/lang/String; - */ -JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptionValues - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: setCipherKey - * Signature: (Ljava/lang/String;Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setCipherKey - (JNIEnv *, jobject, jstring, jstring); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: setJavascript - * Signature: (Z)V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setJavascript - (JNIEnv *, jobject, jboolean); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: getAvailableLocales - * Signature: ()[Ljava/lang/String; - */ -JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getAvailableLocales - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWMgr - * Method: setDefaultLocale - * Signature: (Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setDefaultLocale - (JNIEnv *, jobject, jstring); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_ModInfo.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_ModInfo.h deleted file mode 100644 index f3b8fd6..0000000 --- a/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_ModInfo.h +++ /dev/null @@ -1,13 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class org_crosswire_android_sword_SWMgr_ModInfo */ - -#ifndef _Included_org_crosswire_android_sword_SWMgr_ModInfo -#define _Included_org_crosswire_android_sword_SWMgr_ModInfo -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} -#endif -#endif diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_SearchHit.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_SearchHit.h deleted file mode 100644 index 062c579..0000000 --- a/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_SearchHit.h +++ /dev/null @@ -1,13 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class org_crosswire_android_sword_SWMgr_SearchHit */ - -#ifndef _Included_org_crosswire_android_sword_SWMgr_SearchHit -#define _Included_org_crosswire_android_sword_SWMgr_SearchHit -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} -#endif -#endif diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWModule.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWModule.h deleted file mode 100644 index 15b1ad0..0000000 --- a/bindings/java-jni/jni/org_crosswire_android_sword_SWModule.h +++ /dev/null @@ -1,191 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class org_crosswire_android_sword_SWModule */ - -#ifndef _Included_org_crosswire_android_sword_SWModule -#define _Included_org_crosswire_android_sword_SWModule -#ifdef __cplusplus -extern "C" { -#endif -#undef org_crosswire_android_sword_SWModule_SEARCHTYPE_REGEX -#define org_crosswire_android_sword_SWModule_SEARCHTYPE_REGEX 1L -#undef org_crosswire_android_sword_SWModule_SEARCHTYPE_PHRASE -#define org_crosswire_android_sword_SWModule_SEARCHTYPE_PHRASE -1L -#undef org_crosswire_android_sword_SWModule_SEARCHTYPE_MULTIWORD -#define org_crosswire_android_sword_SWModule_SEARCHTYPE_MULTIWORD -2L -#undef org_crosswire_android_sword_SWModule_SEARCHTYPE_ENTRYATTR -#define org_crosswire_android_sword_SWModule_SEARCHTYPE_ENTRYATTR -3L -#undef org_crosswire_android_sword_SWModule_SEARCHTYPE_LUCENE -#define org_crosswire_android_sword_SWModule_SEARCHTYPE_LUCENE -4L -/* - * Class: org_crosswire_android_sword_SWModule - * Method: terminateSearch - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_terminateSearch - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: search - * Signature: (Ljava/lang/String;IJLjava/lang/String;Lorg/crosswire/android/sword/SWModule/SearchProgressReporter;)[Lorg/crosswire/android/sword/SWModule/SearchHit; - */ -JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search - (JNIEnv *, jobject, jstring, jint, jlong, jstring, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: error - * Signature: ()C - */ -JNIEXPORT jchar JNICALL Java_org_crosswire_android_sword_SWModule_error - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: getEntrySize - * Signature: ()J - */ -JNIEXPORT jlong JNICALL Java_org_crosswire_android_sword_SWModule_getEntrySize - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: getEntryAttribute - * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)[Ljava/lang/String; - */ -JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getEntryAttribute - (JNIEnv *, jobject, jstring, jstring, jstring, jboolean); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: parseKeyList - * Signature: (Ljava/lang/String;)[Ljava/lang/String; - */ -JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_parseKeyList - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: setKeyText - * Signature: (Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_setKeyText - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: getKeyText - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getKeyText - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: hasKeyChildren - * Signature: ()Z - */ -JNIEXPORT jboolean JNICALL Java_org_crosswire_android_sword_SWModule_hasKeyChildren - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: getKeyChildren - * Signature: ()[Ljava/lang/String; - */ -JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getKeyChildren - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: getKeyParent - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getKeyParent - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: previous - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_previous - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: next - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_next - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: begin - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_begin - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: getStripText - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getStripText - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: getRenderText - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRenderText - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: getRawEntry - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRawEntry - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: setRawEntry - * Signature: (Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_setRawEntry - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: getConfigEntry - * Signature: (Ljava/lang/String;)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getConfigEntry - (JNIEnv *, jobject, jstring); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: deleteSearchFramework - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_deleteSearchFramework - (JNIEnv *, jobject); - -/* - * Class: org_crosswire_android_sword_SWModule - * Method: hasSearchFramework - * Signature: ()Z - */ -JNIEXPORT jboolean JNICALL Java_org_crosswire_android_sword_SWModule_hasSearchFramework - (JNIEnv *, jobject); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchHit.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchHit.h deleted file mode 100644 index e79c8fd..0000000 --- a/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchHit.h +++ /dev/null @@ -1,13 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class org_crosswire_android_sword_SWModule_SearchHit */ - -#ifndef _Included_org_crosswire_android_sword_SWModule_SearchHit -#define _Included_org_crosswire_android_sword_SWModule_SearchHit -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} -#endif -#endif diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchProgressReporter.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchProgressReporter.h deleted file mode 100644 index 1f7de09..0000000 --- a/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchProgressReporter.h +++ /dev/null @@ -1,13 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class org_crosswire_android_sword_SWModule_SearchProgressReporter */ - -#ifndef _Included_org_crosswire_android_sword_SWModule_SearchProgressReporter -#define _Included_org_crosswire_android_sword_SWModule_SearchProgressReporter -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} -#endif -#endif diff --git a/bindings/java-jni/jni/swordstub.cpp b/bindings/java-jni/jni/swordstub.cpp index 435a3f1..8a53f34 100644 --- a/bindings/java-jni/jni/swordstub.cpp +++ b/bindings/java-jni/jni/swordstub.cpp @@ -2,7 +2,7 @@ * * swordstub.cpp - JNI bindings * - * $Id: swordstub.cpp 3184 2014-04-17 04:30:54Z greg.hellings $ + * $Id: swordstub.cpp 3524 2017-11-07 03:08:49Z scribe $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -37,6 +37,14 @@ #include <localemgr.h> #include <treekeyidx.h> #include <installmgr.h> +#include <remotetrans.h> +#include <rtfhtml.h> +//#include <android/native_activity.h> + + +#ifdef BIBLESYNC +#include <biblesync.hh> +#endif #include "webmgr.hpp" #include "org_crosswire_android_sword_SWMgr.h" @@ -50,10 +58,69 @@ using std::vector; using namespace sword; - +namespace { WebMgr *mgr = 0; InstallMgr *installMgr = 0; +#ifdef BIBLESYNC +BibleSync *bibleSync = 0; +using std::string; +jobject bibleSyncListener = 0; +JNIEnv *bibleSyncListenerEnv = 0; +#endif +static SWBuf STORAGE_BASE; +static char *SWORD_PATH = "/sdcard/sword"; +static char *AND_BIBLE_MODULES_PATH = "/sdcard/Android/data/net.bible.android.activity/files"; +//ANativeActivity *_activity; + +class InstallStatusReporter : public StatusReporter { +public: + JNIEnv *env; + jobject callback; + unsigned long last; + + InstallStatusReporter() : env(0), callback(0), last(0) { + } + + void init(JNIEnv *env, jobject callback) { + this->env = env; + this->callback = callback; + last = 0xffffffff; + } + + virtual void update(unsigned long totalBytes, unsigned long completedBytes) { + + // assert we have a callback + if (!callback) return; + + if (completedBytes != last) { + last = completedBytes; + jclass cls = env->GetObjectClass(callback); + jmethodID mid = env->GetMethodID(cls, "update", "(JJ)V"); + if (mid != 0) { + env->CallVoidMethod(callback, mid, (jlong)totalBytes, (jlong)completedBytes); + } + env->DeleteLocalRef(cls); + } + } + + virtual void preStatus(long totalBytes, long completedBytes, const char *message) { + + // assert we have a callback + if (!callback) return; + + jclass cls = env->GetObjectClass(callback); + jmethodID mid = env->GetMethodID(cls, "preStatus", "(JJLjava/lang/String;)V"); + if (mid != 0) { + jstring msg = env->NewStringUTF(assureValidUTF8((const char *)message)); + env->CallVoidMethod(callback, mid, (jlong)totalBytes, (jlong)completedBytes, msg); + env->DeleteLocalRef(msg); + } + env->DeleteLocalRef(cls); + } +} *installStatusReporter = 0; +bool disclaimerConfirmed = false; + class AndroidLogger : public SWLog { vector<int> levelMapping; public: @@ -73,50 +140,140 @@ public: }; -static void init() { +static void init(JNIEnv *env) { if (!mgr) { SWLog::setSystemLog(new AndroidLogger()); SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG); - SWBuf baseDir = "/sdcard/sword"; +SWLog::getSystemLog()->logDebug("libsword: init() begin"); + SWBuf baseDir = SWORD_PATH; SWBuf confPath = baseDir + "/mods.d/globals.conf"; // be sure we have at least some config file already out there if (!FileMgr::existsFile(confPath.c_str())) { + SWLog::getSystemLog()->logDebug("libsword: init() sword config not found, attempting to create parent of: %s", confPath.c_str()); + FileMgr::createParent(confPath.c_str()); + remove(confPath.c_str()); + + SWLog::getSystemLog()->logDebug("libsword: init() saving basic: %s", confPath.c_str()); + SWConfig config(confPath.c_str()); + config["Globals"]["HiAndroid"] = "weeee"; + config.save(); + } + if (!FileMgr::existsFile(confPath.c_str())) { + baseDir = STORAGE_BASE; + confPath = baseDir + "/mods.d/globals.conf"; +SWLog::getSystemLog()->logDebug("libsword: init() sword config STILL not found, attempting to create parent of: %s", confPath.c_str()); FileMgr::createParent(confPath.c_str()); remove(confPath.c_str()); +SWLog::getSystemLog()->logDebug("libsword: init() saving basic: %s", confPath.c_str()); SWConfig config(confPath.c_str()); config["Globals"]["HiAndroid"] = "weeee"; - config.Save(); + config.save(); } - mgr = new WebMgr("/sdcard/sword"); + confPath = STORAGE_BASE + "/extraConfig.conf"; + bool exists = FileMgr::existsFile(confPath.c_str()); +SWLog::getSystemLog()->logDebug("libsword: extraConfig %s at path: %s", exists?"Exists":"Absent", confPath.c_str()); + +SWLog::getSystemLog()->logDebug("libsword: init() creating WebMgr using path: %s", baseDir.c_str()); + mgr = new WebMgr(baseDir, exists?confPath.c_str():0); + +SWLog::getSystemLog()->logDebug("libsword: init() augmenting modules from: %s", AND_BIBLE_MODULES_PATH); + // for And Bible modules + mgr->augmentModules(AND_BIBLE_MODULES_PATH, true); } } +static void initInstall(JNIEnv *env, jobject progressReporter = 0) { -static void initInstall() { - + if (!installStatusReporter) { + installStatusReporter = new InstallStatusReporter(); + } + installStatusReporter->init(env, progressReporter); if (!installMgr) { - SWBuf baseDir = "/sdcard/sword/InstallMgr"; +SWLog::getSystemLog()->logDebug("initInstall: installMgr is null"); + SWBuf baseDir = SWORD_PATH; + baseDir += "/InstallMgr"; SWBuf confPath = baseDir + "/InstallMgr.conf"; // be sure we have at least some config file already out there +SWLog::getSystemLog()->logDebug("initInstall: confPath: %s", confPath.c_str()); if (!FileMgr::existsFile(confPath.c_str())) { + SWLog::getSystemLog()->logDebug("initInstall: file doesn't exist: %s", confPath.c_str()); FileMgr::createParent(confPath.c_str()); - remove(confPath.c_str()); - SWConfig config(confPath.c_str()); config["General"]["PassiveFTP"] = "true"; - config.Save(); + config.save(); + } + if (!FileMgr::existsFile(confPath.c_str())) { + baseDir = STORAGE_BASE; + confPath = baseDir + "/InstallMgr.conf"; + SWLog::getSystemLog()->logDebug("initInstall: file STILL doesn't exist, attempting to create parent of: %s", confPath.c_str()); + FileMgr::createParent(confPath.c_str()); + SWConfig config(confPath.c_str()); + config["General"]["PassiveFTP"] = "true"; + config.save(); + } + installMgr = new InstallMgr(baseDir, installStatusReporter); + if (disclaimerConfirmed) installMgr->setUserDisclaimerConfirmed(true); +SWLog::getSystemLog()->logDebug("initInstall: instantiated InstallMgr with baseDir: %s", baseDir.c_str()); + } +} + +#ifdef BIBLESYNC +void bibleSyncCallback(char cmd, string bible, string ref, string alt, string group, string domain, string info, string dump) { +SWLog::getSystemLog()->logDebug("bibleSync callback msg: %c; bible: %s; ref: %s; alt: %s; group: %s; domain: %s; info: %s; dump: %s", cmd, bible.c_str(), ref.c_str(), alt.c_str(), group.c_str(), domain.c_str(), info.c_str(), dump.c_str()); + if (::bibleSyncListener) { +SWLog::getSystemLog()->logDebug("bibleSync listener is true"); + jclass cls = bibleSyncListenerEnv->GetObjectClass(::bibleSyncListener); + jmethodID mid = bibleSyncListenerEnv->GetMethodID(cls, "messageReceived", "(Ljava/lang/String;)V"); +SWLog::getSystemLog()->logDebug("bibleSync listener mid: %ld", mid); + if (mid) { +SWLog::getSystemLog()->logDebug("bibleSync listener mid is available"); + switch(cmd) { + // error + case 'E': + // mismatch + case 'M': + // new speaker + case 'S': + // dead speaker + case 'D': + // announce + case 'A': + break; + // navigation + case 'N': +SWLog::getSystemLog()->logDebug("bibleSync Nav Received: %s", ref.c_str()); + jstring msg = bibleSyncListenerEnv->NewStringUTF(ref.c_str()); + bibleSyncListenerEnv->CallVoidMethod(::bibleSyncListener, mid, msg); + bibleSyncListenerEnv->DeleteLocalRef(msg); + break; + } } - installMgr = new InstallMgr(baseDir); +SWLog::getSystemLog()->logDebug("bibleSync listener deleting local ref to cls"); + bibleSyncListenerEnv->DeleteLocalRef(cls); + } +} +#endif + + +static void initBibleSync() { +#ifdef BIBLESYNC + if (!bibleSync) { +SWLog::getSystemLog()->logDebug("bibleSync initializing c-tor"); + bibleSync = new BibleSync("SWORD", (const char *)SWVersion().currentVersion, "SwordUser"); +SWLog::getSystemLog()->logDebug("bibleSync initializing setMode"); + bibleSync->setMode(BSP_MODE_PERSONAL, bibleSyncCallback, "passphrase"); } +#endif } +} JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_version - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWVersion v; return env->NewStringUTF(v.currentVersion); @@ -129,7 +286,15 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_version * Signature: ()V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_reInit - (JNIEnv *, jobject) { + (JNIEnv *env, jobject me) { + + jclass swmgrClass = env->GetObjectClass(me); + jmethodID getStorageBasePath = env->GetMethodID(swmgrClass, "getStorageBasePath", "()Ljava/lang/String;"); + jstring basePathJS = (jstring)env->CallObjectMethod(me, getStorageBasePath, NULL); + + const char *basePath = (basePathJS?env->GetStringUTFChars(basePathJS, NULL):0); + STORAGE_BASE = basePath; + SWLog::getSystemLog()->logDebug("setting STORAGE_BASE to: %s", STORAGE_BASE.c_str()); delete mgr; mgr = 0; @@ -137,26 +302,26 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_reInit JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getPrefixPath - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); return env->NewStringUTF(mgr->prefixPath); } JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getConfigPath - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); return env->NewStringUTF(mgr->configPath); } JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getModInfoList - (JNIEnv *env, jobject) { + (JNIEnv *env, jobject) { - init(); + init(env); int size = 0; for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); ++it) { @@ -211,15 +376,15 @@ SWLog::getSystemLog()->logDebug("getModInfoList returning %d length array\n", si * Signature: (Ljava/lang/String;)Lorg/crosswire/android/sword/SWModule; */ JNIEXPORT jobject JNICALL Java_org_crosswire_android_sword_SWMgr_getModuleByName - (JNIEnv *env, jobject me, jstring modNameJS) { + (JNIEnv *env, jobject me, jstring modNameJS) { - init(); + init(env); jobject retVal = 0; - const char *modName = env->GetStringUTFChars(modNameJS, NULL); + const char *modName = env->GetStringUTFChars(modNameJS, NULL); sword::SWModule *module = mgr->getModule(modName); - env->ReleaseStringUTFChars(modNameJS, modName); + env->ReleaseStringUTFChars(modNameJS, modName); if (module) { SWBuf type = module->getType(); @@ -242,17 +407,17 @@ JNIEXPORT jobject JNICALL Java_org_crosswire_android_sword_SWMgr_getModuleByName * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setGlobalOption - (JNIEnv *env, jobject me, jstring optionJS, jstring valueJS) { + (JNIEnv *env, jobject me, jstring optionJS, jstring valueJS) { - init(); + init(env); - const char *option = env->GetStringUTFChars(optionJS, NULL); - const char *value = env->GetStringUTFChars(valueJS, NULL); + const char *option = env->GetStringUTFChars(optionJS, NULL); + const char *value = env->GetStringUTFChars(valueJS, NULL); mgr->setGlobalOption(option, value); - env->ReleaseStringUTFChars(valueJS, value); - env->ReleaseStringUTFChars(optionJS, option); + env->ReleaseStringUTFChars(valueJS, value); + env->ReleaseStringUTFChars(optionJS, option); } @@ -262,15 +427,15 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setGlobalOption * Signature: (Ljava/lang/String;)Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOption - (JNIEnv *env, jobject me, jstring optionJS) { + (JNIEnv *env, jobject me, jstring optionJS) { - init(); + init(env); - const char *option = env->GetStringUTFChars(optionJS, NULL); + const char *option = env->GetStringUTFChars(optionJS, NULL); SWBuf value = mgr->getGlobalOption(option); - env->ReleaseStringUTFChars(optionJS, option); + env->ReleaseStringUTFChars(optionJS, option); return env->NewStringUTF(assureValidUTF8(value)); } @@ -282,15 +447,15 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOption * Signature: (Ljava/lang/String;)Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptionTip - (JNIEnv *env, jobject me, jstring optionJS) { + (JNIEnv *env, jobject me, jstring optionJS) { - init(); + init(env); - const char *option = env->GetStringUTFChars(optionJS, NULL); + const char *option = env->GetStringUTFChars(optionJS, NULL); SWBuf value = mgr->getGlobalOptionTip(option); - env->ReleaseStringUTFChars(optionJS, option); + env->ReleaseStringUTFChars(optionJS, option); return env->NewStringUTF(assureValidUTF8(value)); } @@ -302,20 +467,20 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOption * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_filterText - (JNIEnv *env, jobject me, jstring filterNameJS, jstring textJS) { + (JNIEnv *env, jobject me, jstring filterNameJS, jstring textJS) { - init(); + init(env); - const char *filterName = env->GetStringUTFChars(filterNameJS, NULL); - const char *text = env->GetStringUTFChars(textJS, NULL); + const char *filterName = env->GetStringUTFChars(filterNameJS, NULL); + const char *text = env->GetStringUTFChars(textJS, NULL); SWBuf buf = text; // hmmm, in the future, provide a param to specify filter value maybe? mgr->setGlobalOption("Greek Accents", "Off"); char errStatus = mgr->filterText(filterName, buf); - env->ReleaseStringUTFChars(textJS, text); - env->ReleaseStringUTFChars(filterNameJS, filterName); + env->ReleaseStringUTFChars(textJS, text); + env->ReleaseStringUTFChars(filterNameJS, filterName); return env->NewStringUTF(assureValidUTF8(buf)); } @@ -327,9 +492,9 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_filterText * Signature: ()[Ljava/lang/String; */ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptions - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); sword::StringList options = mgr->getGlobalOptions(); int count = 0; @@ -351,19 +516,239 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalO /* * Class: org_crosswire_android_sword_SWMgr + * Method: getExtraConfigSections + * Signature: ()[Ljava/lang/String; + */ +JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getExtraConfigSections + (JNIEnv *env, jobject me) { + + init(env); + + SWBuf baseDir = STORAGE_BASE; + SWBuf confPath = baseDir + "/extraConfig.conf"; + int count = 0; + bool exists = FileMgr::existsFile(confPath.c_str()); + jclass clazzString = env->FindClass("java/lang/String"); + jobjectArray ret; + SWLog::getSystemLog()->logDebug("libsword: extraConfig %s at path: %s", exists?"Exists":"Absent", confPath.c_str()); + if (exists) { + SWConfig config(confPath.c_str()); + SectionMap::const_iterator sit; + for (sit = config.getSections().begin(); sit != config.getSections().end(); ++sit) { + count++; + } + SWLog::getSystemLog()->logDebug("libsword: %d sections found in extraConfig", count); + ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL); + count = 0; + for (sit = config.getSections().begin(); sit != config.getSections().end(); ++sit) { + env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(sit->first.c_str()))); + } + } + else { + ret = (jobjectArray) env->NewObjectArray(0, clazzString, NULL); + } + + return ret; +} + + +/* + * Class: org_crosswire_android_sword_SWMgr + * Method: getExtraConfigKeys + * Signature: (Ljava/lang/String;)[Ljava/lang/String; + */ +JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getExtraConfigKeys + (JNIEnv *env, jobject me, jstring section) { + + init(env); + + const char *s = env->GetStringUTFChars(section, NULL); + + SWBuf mySection = s; + + env->ReleaseStringUTFChars(section, s); + + SWBuf baseDir = STORAGE_BASE; + SWBuf confPath = baseDir + "/extraConfig.conf"; + int count = 0; + bool exists = FileMgr::existsFile(confPath.c_str()); + jclass clazzString = env->FindClass("java/lang/String"); + jobjectArray ret; + if (exists) { + SWConfig config(confPath.c_str()); + SectionMap::const_iterator sit = config.getSections().find(mySection.c_str()); + if (sit != config.getSections().end()) { + ConfigEntMap::const_iterator it; + for (it = sit->second.begin(); it != sit->second.end(); ++it) { + count++; + } + ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL); + count = 0; + for (it = sit->second.begin(); it != sit->second.end(); ++it) { + env->SetObjectArrayElement(ret, count++, + env->NewStringUTF(assureValidUTF8(it->first.c_str()))); + } + } + else { + ret = (jobjectArray) env->NewObjectArray(0, clazzString, NULL); + } + } + else { + ret = (jobjectArray) env->NewObjectArray(0, clazzString, NULL); + } + + return ret; +} + + +/* + * Class: org_crosswire_android_sword_SWMgr + * Method: getExtraConfigValue + * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getExtraConfigValue + (JNIEnv *env, jobject me, jstring section, jstring key) { + + init(env); + + const char *s = env->GetStringUTFChars(section, NULL); + + SWBuf mySection = s; + + env->ReleaseStringUTFChars(section, s); + + const char *k = env->GetStringUTFChars(key, NULL); + + SWBuf myKey = k; + + env->ReleaseStringUTFChars(key, k); + + jstring ret = 0; + + SWBuf baseDir = STORAGE_BASE; + SWBuf confPath = baseDir + "/extraConfig.conf"; + bool exists = FileMgr::existsFile(confPath.c_str()); + if (exists) { + SWConfig config(confPath.c_str()); + SectionMap::const_iterator sit = config.getSections().find(mySection.c_str()); + if (sit != config.getSections().end()) { + ConfigEntMap::const_iterator it = sit->second.find(myKey.c_str()); + if (it != sit->second.end()) { + ret = env->NewStringUTF(assureValidUTF8(it->second.c_str())); + } + } + } + + return ret; +} + + +/* + * Class: org_crosswire_android_sword_SWMgr + * Method: setExtraConfigValue + * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + */ +JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setExtraConfigValue + (JNIEnv *env, jobject me, jstring section, jstring key, jstring value) { + + init(env); + + const char *s = env->GetStringUTFChars(section, NULL); + + SWBuf mySection = s; + + env->ReleaseStringUTFChars(section, s); + + const char *k = env->GetStringUTFChars(key, NULL); + + SWBuf myKey = k; + + env->ReleaseStringUTFChars(key, k); + + const char *v = env->GetStringUTFChars(value, NULL); + + SWBuf myValue = v; + + env->ReleaseStringUTFChars(value, v); + + SWBuf baseDir = STORAGE_BASE; + SWBuf confPath = baseDir + "/extraConfig.conf"; + SWConfig config(confPath.c_str()); + config[mySection][myKey] = myValue; + config.save(); + + Java_org_crosswire_android_sword_SWMgr_reInit(env, me); + +} + + +/* + * Class: org_crosswire_android_sword_SWMgr + * Method: addExtraConfig + * Signature: (Ljava/lang/String;)[Ljava/lang/String; + */ +JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_addExtraConfig + (JNIEnv *env, jobject me, jstring blob) { + + init(env); + + const char *b = env->GetStringUTFChars(blob, NULL); + + SWBuf myBlob = b; + + env->ReleaseStringUTFChars(blob, b); + + jobjectArray ret; + + int count = 0; + jclass clazzString = env->FindClass("java/lang/String"); + + SWBuf baseDir = STORAGE_BASE; + SWBuf tmpConfPath = baseDir + "/tmpConfig.conf"; + FileMgr::removeFile(tmpConfPath.c_str()); + FileDesc *fd = FileMgr::getSystemFileMgr()->open(tmpConfPath.c_str(), FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE); + fd->getFd(); + fd->write(myBlob.c_str(), myBlob.size()); + FileMgr::getSystemFileMgr()->close(fd); + + SWConfig newConfig(tmpConfPath.c_str()); + FileMgr::removeFile(tmpConfPath.c_str()); + SectionMap::const_iterator sit; + for (sit = newConfig.getSections().begin(); sit != newConfig.getSections().end(); ++sit) { + count++; + } + ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL); + count = 0; + for (sit = newConfig.getSections().begin(); sit != newConfig.getSections().end(); ++sit) { + env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(sit->first.c_str()))); + } + + SWBuf confPath = baseDir + "/extraConfig.conf"; + SWConfig config(confPath.c_str()); + config.augment(newConfig); + config.save(); + + Java_org_crosswire_android_sword_SWMgr_reInit(env, me); + + return ret; +} + + +/* + * Class: org_crosswire_android_sword_SWMgr * Method: getGlobalOptionValues * Signature: (Ljava/lang/String;)[Ljava/lang/String; */ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptionValues - (JNIEnv *env, jobject me, jstring optionJS) { + (JNIEnv *env, jobject me, jstring optionJS) { - init(); + init(env); - const char *option = env->GetStringUTFChars(optionJS, NULL); + const char *option = env->GetStringUTFChars(optionJS, NULL); sword::StringList options = mgr->getGlobalOptionValues(option); - env->ReleaseStringUTFChars(optionJS, option); + env->ReleaseStringUTFChars(optionJS, option); int count = 0; for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { @@ -387,17 +772,17 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalO * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setCipherKey - (JNIEnv *env, jobject me , jstring modNameJS, jstring keyJS) { + (JNIEnv *env, jobject me , jstring modNameJS, jstring keyJS) { - init(); + init(env); - const char *modName = env->GetStringUTFChars(modNameJS, NULL); - const char *key = env->GetStringUTFChars(keyJS, NULL); + const char *modName = env->GetStringUTFChars(modNameJS, NULL); + const char *key = env->GetStringUTFChars(keyJS, NULL); mgr->setCipherKey(modName, key); - env->ReleaseStringUTFChars(keyJS, key); - env->ReleaseStringUTFChars(modNameJS, modName); + env->ReleaseStringUTFChars(keyJS, key); + env->ReleaseStringUTFChars(modNameJS, modName); } @@ -407,9 +792,9 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setCipherKey * Signature: (Z)V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setJavascript - (JNIEnv *env, jobject me, jboolean val) { + (JNIEnv *env, jobject me, jboolean val) { - init(); + init(env); mgr->setJavascript(val == JNI_TRUE); } @@ -421,9 +806,9 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setJavascript * Signature: ()[Ljava/lang/String; */ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getAvailableLocales - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); int count = 0; @@ -448,15 +833,15 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getAvailab * Signature: (Ljava/lang/String;)V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setDefaultLocale - (JNIEnv *env, jobject me, jstring localeNameJS) { + (JNIEnv *env, jobject me, jstring localeNameJS) { - init(); + init(env); - const char *localeName = env->GetStringUTFChars(localeNameJS, NULL); + const char *localeName = env->GetStringUTFChars(localeNameJS, NULL); LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(localeName); - env->ReleaseStringUTFChars(localeNameJS, localeName); + env->ReleaseStringUTFChars(localeNameJS, localeName); } @@ -464,9 +849,10 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setDefaultLocale // SWModule methods ---------------------------------------------------------------------------------- -SWModule *getModule(JNIEnv *env, jobject me) { +SWModule *getModule + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = 0; jclass clazzSWModule = env->FindClass("org/crosswire/android/sword/SWModule"); @@ -474,10 +860,10 @@ SWModule *getModule(JNIEnv *env, jobject me) { jfieldID sourceFieldID = env->GetFieldID(clazzSWModule, "remoteSourceName", "Ljava/lang/String;"); jstring modNameJS = (jstring)env->GetObjectField(me, fieldID); jstring sourceNameJS = (jstring)env->GetObjectField(me, sourceFieldID); - const char *modName = (modNameJS?env->GetStringUTFChars(modNameJS, NULL):0); - const char *sourceName = (sourceNameJS?env->GetStringUTFChars(sourceNameJS, NULL):0); + const char *modName = (modNameJS?env->GetStringUTFChars(modNameJS, NULL):0); + const char *sourceName = (sourceNameJS?env->GetStringUTFChars(sourceNameJS, NULL):0); if (sourceName && *sourceName) { - initInstall(); + initInstall(env); InstallSourceMap::iterator source = installMgr->sources.find(sourceName); if (source == installMgr->sources.end()) { SWMgr *mgr = source->second->getMgr(); @@ -485,8 +871,8 @@ SWModule *getModule(JNIEnv *env, jobject me) { } } else module = mgr->getModule(modName); - if (modName) env->ReleaseStringUTFChars(modNameJS, modName); - if (sourceName) env->ReleaseStringUTFChars(sourceNameJS, sourceName); + if (modName) env->ReleaseStringUTFChars(modNameJS, modName); + if (sourceName) env->ReleaseStringUTFChars(sourceNameJS, sourceName); return module; } @@ -496,9 +882,9 @@ SWModule *getModule(JNIEnv *env, jobject me) { * Signature: (Ljava/lang/String;)V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_setKeyText - (JNIEnv *env, jobject me, jstring keyTextJS) { + (JNIEnv *env, jobject me, jstring keyTextJS) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -509,7 +895,9 @@ SWLog::getSystemLog()->logDebug("setKeyText(%s, %s)", module->getName(), keyText sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey && (*keyText=='+' ||*keyText=='-')) { if (!stricmp(keyText+1, "book")) { - vkey->setBook(vkey->getBook() + ((*keyText=='+')?1:-1)); + int newBook = vkey->getBook() + ((*keyText=='+')?1:-1); +SWLog::getSystemLog()->logDebug("setting book to %d", newBook); + vkey->setBook(newBook); env->ReleaseStringUTFChars(keyTextJS, keyText); return; } @@ -532,9 +920,9 @@ SWLog::getSystemLog()->logDebug("setKeyText(%s, %s)", module->getName(), keyText * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getKeyText - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -552,9 +940,9 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getKeyText * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRenderText - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -568,13 +956,33 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRenderTex /* * Class: org_crosswire_android_sword_SWModule + * Method: getRenderHeader + * Signature: ()Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRenderHeader + (JNIEnv *env, jobject me) { + + init(env); + + SWModule *module = getModule(env, me); + + jstring retVal = 0; + if (module) { + retVal = env->NewStringUTF(assureValidUTF8(((const char *)(module->getRenderHeader() ? module->getRenderHeader():"")))); + } + return retVal; +} + + +/* + * Class: org_crosswire_android_sword_SWModule * Method: terminateSearch * Signature: ()V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_terminateSearch - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -590,13 +998,14 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_terminateSearch * Signature: ()C */ JNIEXPORT jchar JNICALL Java_org_crosswire_android_sword_SWModule_error - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); - return (module) ? module->popError() : -99; + int error = (module) ? module->popError() : -99; + return error; } @@ -606,9 +1015,9 @@ JNIEXPORT jchar JNICALL Java_org_crosswire_android_sword_SWModule_error * Signature: ()J */ JNIEXPORT jlong JNICALL Java_org_crosswire_android_sword_SWModule_getEntrySize - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -622,9 +1031,9 @@ JNIEXPORT jlong JNICALL Java_org_crosswire_android_sword_SWModule_getEntrySize * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)[Ljava/lang/String; */ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getEntryAttribute - (JNIEnv *env, jobject me, jstring level1JS, jstring level2JS, jstring level3JS, jboolean filteredJS) { + (JNIEnv *env, jobject me, jstring level1JS, jstring level2JS, jstring level3JS, jboolean filteredJS) { - init(); + init(env); const char *level1 = env->GetStringUTFChars(level1JS, NULL); const char *level2 = env->GetStringUTFChars(level2JS, NULL); @@ -646,7 +1055,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getEntr sword::AttributeList::iterator i2Start, i2End; sword::AttributeValue::iterator i3Start, i3End; - if ((level1) && (*level1)) { + if ((level1) && (*level1) && *level1 != '-') { i1Start = entryAttribs.find(level1); i1End = i1Start; if (i1End != entryAttribs.end()) @@ -657,35 +1066,54 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getEntr i1End = entryAttribs.end(); } for (;i1Start != i1End; ++i1Start) { - if ((level2) && (*level2)) { - i2Start = i1Start->second.find(level2); - i2End = i2Start; - if (i2End != i1Start->second.end()) - ++i2End; + if (level1 && *level1 && *level1 == '-') { + results.push_back(i1Start->first); } else { - i2Start = i1Start->second.begin(); - i2End = i1Start->second.end(); - } - for (;i2Start != i2End; ++i2Start) { - if ((level3) && (*level3)) { - i3Start = i2Start->second.find(level3); - i3End = i3Start; - if (i3End != i2Start->second.end()) - ++i3End; + if (level2 && *level2 && *level2 != '-') { + i2Start = i1Start->second.find(level2); + i2End = i2Start; + if (i2End != i1Start->second.end()) + ++i2End; } else { - i3Start = i2Start->second.begin(); - i3End = i2Start->second.end(); + i2Start = i1Start->second.begin(); + i2End = i1Start->second.end(); } - for (;i3Start != i3End; ++i3Start) { - results.push_back(i3Start->second); + for (;i2Start != i2End; ++i2Start) { + if (level2 && *level2 && *level2 == '-') { + results.push_back(i2Start->first); + } + else { + // allow '-' to get all keys; allow '*' to get all key=value + if (level3 && *level3 && *level3 != '-' && *level3 != '*') { + i3Start = i2Start->second.find(level3); + i3End = i3Start; + if (i3End != i2Start->second.end()) + ++i3End; + } + else { + i3Start = i2Start->second.begin(); + i3End = i2Start->second.end(); + } + for (;i3Start != i3End; ++i3Start) { + if (level3 && *level3 && *level3 == '-') { + results.push_back(i3Start->first); + } + else if (level3 && *level3 && *level3 == '*') { + results.push_back(i3Start->first + "=" + i3Start->second); + } + else { + results.push_back(i3Start->second); + } + } + if (i3Start != i3End) + break; + } } - if (i3Start != i3End) + if (i2Start != i2End) break; } - if (i2Start != i2End) - break; } ret = (jobjectArray) env->NewObjectArray(results.size(), clazzString, NULL); @@ -716,9 +1144,9 @@ SWLog::getSystemLog()->logDebug("getEntryAttributes: size returned: %d", results * Signature: (Ljava/lang/String;)[Ljava/lang/String; */ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_parseKeyList - (JNIEnv *env, jobject me, jstring keyListTextJS) { + (JNIEnv *env, jobject me, jstring keyListTextJS) { - init(); + init(env); const char *keyListText = env->GetStringUTFChars(keyListTextJS, NULL); @@ -761,9 +1189,9 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_parseKe * Signature: ()Z */ JNIEXPORT jboolean JNICALL Java_org_crosswire_android_sword_SWModule_hasKeyChildren - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -786,9 +1214,9 @@ JNIEXPORT jboolean JNICALL Java_org_crosswire_android_sword_SWModule_hasKeyChild * Signature: ()[Ljava/lang/String; */ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getKeyChildren - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); jclass clazzString = env->FindClass("java/lang/String"); @@ -802,7 +1230,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getKeyC sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey) { - ret = (jobjectArray) env->NewObjectArray(7, clazzString, NULL); + ret = (jobjectArray) env->NewObjectArray(10, clazzString, NULL); SWBuf num; num.appendFormatted("%d", vkey->getTestament()); env->SetObjectArrayElement(ret, 0, env->NewStringUTF(assureValidUTF8(num.c_str()))); @@ -822,6 +1250,9 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getKeyC num.appendFormatted("%d", vkey->getVerseMax()); env->SetObjectArrayElement(ret, 5, env->NewStringUTF(assureValidUTF8(num.c_str()))); env->SetObjectArrayElement(ret, 6, env->NewStringUTF(assureValidUTF8(vkey->getBookName()))); + env->SetObjectArrayElement(ret, 7, env->NewStringUTF(assureValidUTF8(vkey->getOSISRef()))); + env->SetObjectArrayElement(ret, 8, env->NewStringUTF(assureValidUTF8(vkey->getShortText()))); + env->SetObjectArrayElement(ret, 9, env->NewStringUTF(assureValidUTF8(vkey->getBookAbbrev()))); } else { TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key); @@ -844,8 +1275,8 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getKeyC } } } - return ret; } + return ret; } @@ -855,9 +1286,9 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getKeyC * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getKeyParent - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWBuf retVal = ""; @@ -885,9 +1316,9 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getKeyParent * Signature: ()V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_previous - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -904,9 +1335,9 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_previous * Signature: ()V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_next - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -923,9 +1354,9 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_next * Signature: ()V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_begin - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -942,9 +1373,9 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_begin * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getStripText - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWBuf retVal = ""; @@ -965,9 +1396,9 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getStripText * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRawEntry - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWBuf retVal = ""; @@ -988,9 +1419,9 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRawEntry * Signature: (Ljava/lang/String;)V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_setRawEntry - (JNIEnv *env, jobject me, jstring newEntryTextJS) { + (JNIEnv *env, jobject me, jstring newEntryTextJS) { - init(); + init(env); const char *newEntryText = env->GetStringUTFChars(newEntryTextJS, NULL); @@ -1005,34 +1436,15 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_setRawEntry } -jstring newBigString(JNIEnv *env, const char *buf) { - SWBuf str = assureValidUTF8(buf); - jclass stringClass = env->FindClass("java/lang/String"); - jmethodID ctorID = env->GetMethodID(stringClass, "<init>", "([B)V"); - - jstring result; -SWLog::getSystemLog()->logDebug("newBigString: making byte array size: %d", str.size()); - jbyteArray bytes = env->NewByteArray(str.size()); -SWLog::getSystemLog()->logDebug("newBigString: setting array region"); - - env->SetByteArrayRegion(bytes, 0, str.size(), (jbyte *)str.c_str()); -SWLog::getSystemLog()->logDebug("newBigString: newing string"); - result = (jstring)env->NewObject(stringClass, ctorID, bytes); - env->DeleteLocalRef(bytes); -SWLog::getSystemLog()->logDebug("newBigString: returning"); - return result; -} - - /* * Class: org_crosswire_android_sword_SWModule * Method: getConfigEntry * Signature: (Ljava/lang/String;)Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getConfigEntry - (JNIEnv *env, jobject me, jstring configKeyJS) { + (JNIEnv *env, jobject me, jstring configKeyJS) { - init(); + init(env); jstring retVal = 0; @@ -1043,8 +1455,12 @@ SWLog::getSystemLog()->logDebug("getConfigEntry(%s)\n", configKey); SWModule *module = getModule(env, me); if (module) { - SWBuf about = module->getConfigEntry(configKey); - SWBuf assuredBuf = assureValidUTF8(about.c_str()); + SWBuf confValue = module->getConfigEntry(configKey); + // special processing if we're requesting About-- kindof cheese + if (!strcmp("About", configKey)) { + RTFHTML().processText(confValue); + } + SWBuf assuredBuf = assureValidUTF8(confValue.c_str()); retVal = env->NewStringUTF(assuredBuf.c_str()); } @@ -1060,9 +1476,9 @@ SWLog::getSystemLog()->logDebug("getConfigEntry(%s)\n", configKey); * Signature: ()V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_deleteSearchFramework - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -1079,9 +1495,9 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_deleteSearchFra * Signature: ()Z */ JNIEXPORT jboolean JNICALL Java_org_crosswire_android_sword_SWModule_hasSearchFramework - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - init(); + init(env); SWModule *module = getModule(env, me); @@ -1101,6 +1517,9 @@ struct pu { void percentUpdate(char percent, void *userData) { struct pu *p = (struct pu *)userData; + // assert we've actually been given a progressReporter + if (!p->progressReporter) return; + if (percent != p->last) { p->last = percent; jclass cls = p->env->GetObjectClass(p->progressReporter); @@ -1108,6 +1527,7 @@ void percentUpdate(char percent, void *userData) { if (mid != 0) { p->env->CallVoidMethod(p->progressReporter, mid, (jint)percent); } + p->env->DeleteLocalRef(cls); } } @@ -1118,14 +1538,14 @@ void percentUpdate(char percent, void *userData) { * Signature: (Ljava/lang/String;IJLjava/lang/String;Lorg/crosswire/android/sword/SWModule/SearchProgressReporter;)[Lorg/crosswire/android/sword/SWModule/SearchHit; */ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search - (JNIEnv *env, jobject me, jstring expressionJS, jint srchType, jlong flags, jstring scopeJS, jobject progressReporter) { + (JNIEnv *env, jobject me, jstring expressionJS, jint srchType, jlong flags, jstring scopeJS, jobject progressReporter) { - init(); + init(env); const int MAX_RETURN_COUNT = 999999; const char *expression = env->GetStringUTFChars(expressionJS, NULL); - const char *scope = env->GetStringUTFChars(scopeJS, NULL); + const char *scope = scopeJS ? env->GetStringUTFChars(scopeJS, NULL) : 0; jclass clazzSearchHit = env->FindClass("org/crosswire/android/sword/SWModule$SearchHit"); jobjectArray ret = 0; @@ -1133,7 +1553,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search SWModule *module = getModule(env, me); // TODO: remove this from the stack - struct pu peeuuu(env, progressReporter); + pu *peeuuu = new pu(env, progressReporter); if (module) { sword::ListKey lscope; @@ -1148,10 +1568,12 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search } *parser = module->getKeyText(); lscope = parser->parseVerseList(scope, *parser, true); - result = module->search(expression, srchType, flags, &lscope, 0, &percentUpdate, &peeuuu); + result = module->search(expression, srchType, flags, &lscope, 0, &percentUpdate, peeuuu); delete parser; } - else result = module->search(expression, srchType, flags, 0, 0, &percentUpdate, &peeuuu); + else result = module->search(expression, srchType, flags, 0, 0, &percentUpdate, peeuuu); + + delete peeuuu; int count = 0; for (result = sword::TOP; !result.popError(); result++) count++; @@ -1187,7 +1609,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search env->DeleteLocalRef(modName); } - env->ReleaseStringUTFChars(scopeJS, scope); + if (scope) env->ReleaseStringUTFChars(scopeJS, scope); env->ReleaseStringUTFChars(expressionJS, expression); return (ret) ? ret : (jobjectArray) env->NewObjectArray(0, clazzSearchHit, NULL); @@ -1204,7 +1626,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search * Signature: ()V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_InstallMgr_reInit - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { delete installMgr; installMgr = 0; @@ -1217,9 +1639,9 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_InstallMgr_reInit * Signature: ()I */ JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_syncConfig - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - initInstall(); + initInstall(env); return installMgr->refreshRemoteSourceConfiguration(); } @@ -1231,10 +1653,10 @@ JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_syncConfig * Signature: (Ljava/lang/String;)I */ JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_uninstallModule - (JNIEnv *env, jobject me, jstring modNameJS) { + (JNIEnv *env, jobject me, jstring modNameJS) { - init(); - initInstall(); + init(env); + initInstall(env); const char *modName = env->GetStringUTFChars(modNameJS, NULL); @@ -1260,9 +1682,9 @@ SWLog::getSystemLog()->logDebug("uninstallModule %s\n", modName); * Signature: ()[Ljava/lang/String; */ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteSources - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - initInstall(); + initInstall(env); jclass clazzString = env->FindClass("java/lang/String"); jobjectArray ret; @@ -1271,6 +1693,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRe for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) { count++; } +SWLog::getSystemLog()->logDebug("getRemoteSources: count: %d\n", count); ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL); count = 0; for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) { @@ -1287,9 +1710,9 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRe * Signature: (Ljava/lang/String;)I */ JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_refreshRemoteSource - (JNIEnv *env, jobject me, jstring sourceNameJS) { + (JNIEnv *env, jobject me, jstring sourceNameJS) { - initInstall(); + initInstall(env); const char *sourceName = env->GetStringUTFChars(sourceNameJS, NULL); @@ -1310,11 +1733,11 @@ JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_refreshRemote * Signature: (Ljava/lang/String;)[Lorg/crosswire/android/sword/SWMgr/ModInfo; */ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteModInfoList - (JNIEnv *env, jobject me, jstring sourceNameJS) { + (JNIEnv *env, jobject me, jstring sourceNameJS) { SWLog::getSystemLog()->logDebug("getRemoteModInfoList\n"); - init(); - initInstall(); + init(env); + initInstall(env); const char *sourceName = env->GetStringUTFChars(sourceNameJS, NULL); SWLog::getSystemLog()->logDebug("sourceName: %s\n", sourceName); @@ -1378,16 +1801,16 @@ SWLog::getSystemLog()->logDebug("remoteListModules returning %d length array\n", return ret; } - /* * Class: org_crosswire_android_sword_InstallMgr * Method: remoteInstallModule * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_remoteInstallModule - (JNIEnv *env, jobject me, jstring sourceNameJS, jstring modNameJS) { + (JNIEnv *env, jobject me, jstring sourceNameJS, jstring modNameJS, jobject progressReporter) { - initInstall(); + init(env); + initInstall(env, progressReporter); const char *sourceName = env->GetStringUTFChars(sourceNameJS, NULL); SWLog::getSystemLog()->logDebug("remoteInstallModule: sourceName: %s\n", sourceName); @@ -1415,6 +1838,17 @@ SWLog::getSystemLog()->logDebug("remoteInstallModule: modName: %s\n", modName); int error = installMgr->installModule(mgr, 0, module->getName(), is); + if (progressReporter) { + jclass cls = env->GetObjectClass(progressReporter); + jmethodID mid = env->GetMethodID(cls, "preStatus", "(JJLjava/lang/String;)V"); + if (mid != 0) { + jstring msg = env->NewStringUTF("Complete"); + env->CallVoidMethod(progressReporter, mid, (jlong)0, (jlong)0, msg); + env->DeleteLocalRef(msg); + } + env->DeleteLocalRef(cls); + } + return error; } @@ -1425,11 +1859,11 @@ SWLog::getSystemLog()->logDebug("remoteInstallModule: modName: %s\n", modName); * Signature: (Ljava/lang/String;Ljava/lang/String;)Lorg/crosswire/android/sword/SWModule; */ JNIEXPORT jobject JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteModuleByName - (JNIEnv *env, jobject me, jstring sourceNameJS, jstring modNameJS) { + (JNIEnv *env, jobject me, jstring sourceNameJS, jstring modNameJS) { jobject retVal = 0; - initInstall(); + initInstall(env); const char *sourceName = env->GetStringUTFChars(sourceNameJS, NULL); SWLog::getSystemLog()->logDebug("getRemoteModuleByName: sourceName: %s\n", sourceName); @@ -1443,9 +1877,9 @@ SWLog::getSystemLog()->logDebug("Couldn't find remote source [%s]\n", sourceName SWMgr *mgr = source->second->getMgr(); - const char *modName = env->GetStringUTFChars(modNameJS, NULL); + const char *modName = env->GetStringUTFChars(modNameJS, NULL); sword::SWModule *module = mgr->getModule(modName); - env->ReleaseStringUTFChars(modNameJS, modName); + env->ReleaseStringUTFChars(modNameJS, modName); if (module) { SWBuf type = module->getType(); @@ -1471,10 +1905,56 @@ SWLog::getSystemLog()->logDebug("Couldn't find remote source [%s]\n", sourceName * Signature: ()V */ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_InstallMgr_setUserDisclaimerConfirmed - (JNIEnv *env, jobject me) { + (JNIEnv *env, jobject me) { - initInstall(); + initInstall(env); + disclaimerConfirmed = true; installMgr->setUserDisclaimerConfirmed(true); } + +/* + * Class: org_crosswire_android_sword_SWMgr + * Method: sendBibleSyncMessage + * Signature: (Ljava/lang/String;)V + */ +JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_sendBibleSyncMessage + (JNIEnv *env, jobject me, jstring osisRefJS) { + + initBibleSync(); + const char *osisRef = env->GetStringUTFChars(osisRefJS, NULL); + +#ifdef BIBLESYNC + BibleSync_xmit_status retval = bibleSync->Transmit(BSP_SYNC, "Bible", osisRef); +#endif + + env->ReleaseStringUTFChars(osisRefJS, osisRef); +} + + +/* + * NOTE: this method blocks and should be called in a new thread + * Class: org_crosswire_android_sword_SWMgr + * Method: registerBibleSyncListener + * Signature: (Ljava/lang/Object;)V + */ +JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_registerBibleSyncListener + (JNIEnv *env, jobject me, jobject bibleSyncListener) { + +#ifdef BIBLESYNC +SWLog::getSystemLog()->logDebug("registerBibleSyncListener"); + ::bibleSyncListener = bibleSyncListener; + ::bibleSyncListenerEnv = env; +SWLog::getSystemLog()->logDebug("registerBibleSyncListener - calling init"); + initBibleSync(); +SWLog::getSystemLog()->logDebug("registerBibleSyncListener - starting while listener"); + while(::bibleSyncListener) { +SWLog::getSystemLog()->logDebug("bibleSyncListener - while loop iteration"); + BibleSync::Receive(bibleSync); +SWLog::getSystemLog()->logDebug("bibleSyncListener - sleeping for 2 seconds"); + sleep(2); + } +#endif +} + diff --git a/bindings/java-jni/jni/webmgr.hpp b/bindings/java-jni/jni/webmgr.hpp deleted file mode 100644 index e70adbf..0000000 --- a/bindings/java-jni/jni/webmgr.hpp +++ /dev/null @@ -1,120 +0,0 @@ -/****************************************************************************** - * - * webmgr.cpp - - * - * $Id: webmgr.hpp 2894 2013-07-16 04:38:43Z scribe $ - * - * Copyright 2009-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. - * - */ - -#ifndef WEBMGR_HPP -#define WEBMGR_HPP - -#include <swmgr.h> -#include <swmodule.h> -#include <swfilter.h> -#include <markupfiltmgr.h> -#include <osiswordjs.h> -#include <thmlwordjs.h> -#include <gbfwordjs.h> - -using namespace sword; - -class WebMgr : public SWMgr { - OSISWordJS *osisWordJS; - ThMLWordJS *thmlWordJS; - GBFWordJS *gbfWordJS; - SWModule *defaultGreekLex; - SWModule *defaultHebLex; - SWModule *defaultGreekParse; - SWModule *defaultHebParse; - -public: -// WebMgr(SWConfig *sysConf) : SWMgr(0, sysConf, false, new MarkupFilterMgr(FMT_WEBIF)) { - WebMgr(const char *path) : SWMgr(path, false, new MarkupFilterMgr(FMT_WEBIF)) { - defaultGreekLex = 0; - defaultHebLex = 0; - defaultGreekParse = 0; - defaultHebParse = 0; - - osisWordJS = new OSISWordJS(); - thmlWordJS = new ThMLWordJS(); - gbfWordJS = new GBFWordJS(); - Load(); - osisWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse); - thmlWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse); - gbfWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse); - osisWordJS->setMgr(this); - thmlWordJS->setMgr(this); - gbfWordJS->setMgr(this); - setGlobalOption("Textual Variants", "Primary Reading"); - } - - ~WebMgr() { - delete osisWordJS; - delete thmlWordJS; - delete gbfWordJS; - } - - - void AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) { - - // ThML word stuff needs to process before strongs strip - if (module->getMarkup() == FMT_THML) { - module->addOptionFilter(thmlWordJS); - } - - if (module->getMarkup() == FMT_GBF) { - module->addOptionFilter(gbfWordJS); - } - - // add other module filters - SWMgr::AddGlobalOptions(module, section, start, end); - - // add our special filters - if (module->getConfig().has("Feature", "GreekDef")) { - defaultGreekLex = module; - } - if (module->getConfig().has("Feature", "HebrewDef")) { - defaultHebLex = module; - } - if (module->getConfig().has("Feature", "GreekParse")) { - defaultGreekParse = module; - } - if (module->getConfig().has("Feature", "HebrewParse")) { - defaultHebParse = module; - } - if (module->getConfig().has("GlobalOptionFilter", "ThMLVariants")) { - OptionFilterMap::iterator it = optionFilters.find("ThMLVariants"); - if (it != optionFilters.end()) { - module->addOptionFilter((*it).second); // add filter to module and option as a valid option - } - } - - if (module->getMarkup() == FMT_OSIS) { - module->addOptionFilter(osisWordJS); - } - } - - - void setJavascript(bool val) { - osisWordJS->setOptionValue((val)?"On":"Off"); - thmlWordJS->setOptionValue((val)?"On":"Off"); - gbfWordJS->setOptionValue((val)?"On":"Off"); - } -}; - -#endif diff --git a/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java b/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java index 3edbd58..b1b5b0a 100644 --- a/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java +++ b/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java @@ -2,7 +2,7 @@ * * InstallMgr.java - * - * $Id: InstallMgr.java 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: InstallMgr.java 3229 2014-05-09 09:32:36Z scribe $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -23,6 +23,11 @@ package org.crosswire.android.sword; public class InstallMgr { + + public static interface InstallProgressReporter { + public void update(long totalBytes, long completedBytes); + public void preStatus(long totalBytes, long completedBytes, String message); + } public native void reInit(); @@ -32,7 +37,8 @@ public class InstallMgr { public native String [] getRemoteSources(); public native int refreshRemoteSource(String sourceName); public native SWMgr.ModInfo [] getRemoteModInfoList(String sourceName); - public native int remoteInstallModule(String sourceName, String modName); + public native int remoteInstallModule(String sourceName, String modName, InstallProgressReporter progressReporter); + public int remoteInstallModule(String sourceName, String modName) { return remoteInstallModule(sourceName, modName, null); } public native SWModule getRemoteModuleByName(String source, String name); } diff --git a/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java b/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java index 2ae2e01..a77ef8b 100644 --- a/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java +++ b/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java @@ -2,7 +2,7 @@ * * SWMgr.java - * - * $Id: SWMgr.java 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: SWMgr.java 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -37,6 +37,12 @@ public class SWMgr { public String delta; } + public SWMgr() { + reInit(); + } + public SWMgr(boolean init) { + if (init) reInit(); + } public native String version(); public native void reInit(); @@ -55,6 +61,31 @@ public class SWMgr { public native void setJavascript(boolean val); public native String[] getAvailableLocales(); public native void setDefaultLocale(String name); + + /** + * add a conf snippet to extraConfig. This is useful for adding a config section + * sent from a module unlock key app. + * @param blob + * @return an array of section names which were contained in the blob + */ + public native String[] addExtraConfig(String blob); + public native void setExtraConfigValue(String section, String key, String value); + public native String[] getExtraConfigSections(); + public native String[] getExtraConfigKeys(String section); + public native String getExtraConfigValue(String section, String key); + + public static interface BibleSyncListener { + public void messageReceived(String osisRef); + } + public native void sendBibleSyncMessage(String osisRef); + public native void registerBibleSyncListener(BibleSyncListener listener); + public String getStorageBasePath() { + return "."; +/* + Context context = app.getApplicationContext(); + return context.getFilesDir().getAbsolutePath(); +*/ + } } diff --git a/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java b/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java index c7d4707..238bf28 100644 --- a/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java +++ b/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java @@ -2,7 +2,7 @@ * * SWModule.java - * - * $Id: SWModule.java 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: SWModule.java 3237 2014-05-22 08:02:06Z scribe $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -38,6 +38,17 @@ public class SWModule { public static final int SEARCHTYPE_ENTRYATTR = -3; public static final int SEARCHTYPE_LUCENE = -4; + public static final int VERSEKEY_TESTAMENT = 0; + public static final int VERSEKEY_BOOK = 1; + public static final int VERSEKEY_CHAPTER = 2; + public static final int VERSEKEY_VERSE = 3; + public static final int VERSEKEY_CHAPTERMAX = 4; + public static final int VERSEKEY_VERSEMAX = 5; + public static final int VERSEKEY_BOOKNAME = 6; + public static final int VERSEKEY_OSISREF = 7; + public static final int VERSEKEY_SHORTTEXT = 8; + public static final int VERSEKEY_BOOKABBREV = 9; + private SWModule() {} // don't allow allocation, instead use factory method SWMgr.getModuleByName to retrieve an instance public static class SearchHit { @@ -78,6 +89,7 @@ public class SWModule { public native void next(); public native void begin(); public native String getStripText(); + public native String getRenderHeader(); public native String getRenderText(); public native String getRawEntry(); public native void setRawEntry(String entryBuffer); diff --git a/bindings/objc/LongRunningTests/Info.plist b/bindings/objc/LongRunningTests/Info.plist new file mode 100644 index 0000000..ba72822 --- /dev/null +++ b/bindings/objc/LongRunningTests/Info.plist @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>en</string> + <key>CFBundleExecutable</key> + <string>$(EXECUTABLE_NAME)</string> + <key>CFBundleIdentifier</key> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>$(PRODUCT_NAME)</string> + <key>CFBundlePackageType</key> + <string>BNDL</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleVersion</key> + <string>1</string> +</dict> +</plist> diff --git a/bindings/objc/Makefile b/bindings/objc/Makefile new file mode 100644 index 0000000..c74e120 --- /dev/null +++ b/bindings/objc/Makefile @@ -0,0 +1,21 @@ +# +# First enter dependencies/ and run make +# +# Then open this project ObjCSword.xcodeproj with xcode, select Product|Scheme|SWORD (note all caps) +# Build +# +# Then come here and type make +# + +all: deploycordova + +deploycordova: + mkdir -p ../cordova/org.crosswire.sword.cordova.SWORD/libs/ios/ + cp ./dependencies/curl/lib/libcurl.a ../cordova/org.crosswire.sword.cordova.SWORD/libs/ios/ +# cp ./Build/Debug-iphonesimulator/libSWORD.a ../cordova/org.crosswire.sword.cordova.SWORD/libs/ios/ +# cp ./Build/Debug-iphoneos/libSWORD.a ../cordova/org.crosswire.sword.cordova.SWORD/libs/ios/ + cp SWORD/Release-universal/libSWORD.a ../cordova/org.crosswire.sword.cordova.SWORD/libs/ios/ + cp ../../include/defs.h ../../include/flatapi.h ../cordova/org.crosswire.sword.cordova.SWORD/src/ios/ + + + diff --git a/bindings/objc/ObjCSword.h b/bindings/objc/ObjCSword.h index 5f2f5ce..f96009b 100644 --- a/bindings/objc/ObjCSword.h +++ b/bindings/objc/ObjCSword.h @@ -26,6 +26,9 @@ #import <ObjCSword/SwordInstallSourceManager.h> #import <ObjCSword/SwordModuleTextEntry.h> #import <ObjCSword/SwordModuleTreeEntry.h> +#import <ObjCSword/SwordFilter.h> #import <ObjCSword/VerseEnumerator.h> #import <ObjCSword/Configuration.h> #import <ObjCSword/OSXConfiguration.h> +#import <ObjCSword/FilterProviderFactory.h> +#import <ObjCSword/DefaultFilterProvider.h> diff --git a/bindings/objc/ObjCSword.xcodeproj/project.pbxproj b/bindings/objc/ObjCSword.xcodeproj/project.pbxproj index 8598424..58e6b0d 100644 --- a/bindings/objc/ObjCSword.xcodeproj/project.pbxproj +++ b/bindings/objc/ObjCSword.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ buildPhases = ( ); dependencies = ( - A9D271FF14D7193A00DA8926 /* PBXTargetDependency */, A9D2720114D7194E00DA8926 /* PBXTargetDependency */, A9D2720314D7194E00DA8926 /* PBXTargetDependency */, A9D2720514D7194E00DA8926 /* PBXTargetDependency */, @@ -37,14 +36,540 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 0A011DA71FB4142500778C2B /* sword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A011D9E1FB4142500778C2B /* sword.framework */; }; + 0A011DAC1FB4142500778C2B /* SWORDTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A011DAB1FB4142500778C2B /* SWORDTests.m */; }; + 0A011DB51FB4149000778C2B /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67401C6BCD9600EB1A49 /* adler32.c */; }; + 0A011DB61FB4149000778C2B /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67411C6BCD9600EB1A49 /* compress.c */; }; + 0A011DB71FB4149000778C2B /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67421C6BCD9600EB1A49 /* crc32.c */; }; + 0A011DB81FB4149000778C2B /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67441C6BCD9600EB1A49 /* deflate.c */; }; + 0A011DB91FB4149000778C2B /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67461C6BCD9600EB1A49 /* gzclose.c */; }; + 0A011DBA1FB4149000778C2B /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67481C6BCD9600EB1A49 /* gzlib.c */; }; + 0A011DBB1FB4149000778C2B /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67491C6BCD9600EB1A49 /* gzread.c */; }; + 0A011DBC1FB4149000778C2B /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB674A1C6BCD9600EB1A49 /* gzwrite.c */; }; + 0A011DBD1FB4149000778C2B /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB674B1C6BCD9600EB1A49 /* infback.c */; }; + 0A011DBE1FB4149000778C2B /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB674C1C6BCD9600EB1A49 /* inffast.c */; }; + 0A011DBF1FB4149000778C2B /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB674F1C6BCD9600EB1A49 /* inflate.c */; }; + 0A011DC01FB4149000778C2B /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67511C6BCD9600EB1A49 /* inftrees.c */; }; + 0A011DC11FB4149000778C2B /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67531C6BCD9600EB1A49 /* trees.c */; }; + 0A011DC21FB4149000778C2B /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67551C6BCD9600EB1A49 /* uncompr.c */; }; + 0A011DC31FB4149000778C2B /* untgz.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67561C6BCD9600EB1A49 /* untgz.c */; }; + 0A011DC41FB4149000778C2B /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67591C6BCD9600EB1A49 /* zutil.c */; }; + 0A011DC51FB4149000778C2B /* ftplib.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D013EE98B30094E3FE /* ftplib.c */; }; + 0A011DC61FB4149000778C2B /* ftpparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D113EE98B30094E3FE /* ftpparse.c */; }; + 0A011DC71FB4149000778C2B /* roman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D513EE98B30094E3FE /* roman.cpp */; }; + 0A011DC81FB4149000778C2B /* swbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D613EE98B30094E3FE /* swbuf.cpp */; }; + 0A011DC91FB4149000778C2B /* swobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D713EE98B30094E3FE /* swobject.cpp */; }; + 0A011DCA1FB4149000778C2B /* swversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D913EE98B30094E3FE /* swversion.cpp */; }; + 0A011DCB1FB4149000778C2B /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DA13EE98B30094E3FE /* url.cpp */; }; + 0A011DCC1FB4149000778C2B /* utilstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DB13EE98B30094E3FE /* utilstr.cpp */; }; + 0A011DCD1FB4149000778C2B /* utilxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DC13EE98B30094E3FE /* utilxml.cpp */; }; + 0A011DCE1FB414A900778C2B /* remotetrans.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2351176AF188008D714B /* remotetrans.cpp */; }; + 0A011DCF1FB414A900778C2B /* versificationmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A91C8B66175233F3008702B9 /* versificationmgr.cpp */; }; + 0A011DD01FB414A900778C2B /* curlftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81813EE98B30094E3FE /* curlftpt.cpp */; }; + 0A011DD11FB414A900778C2B /* curlhttpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81913EE98B30094E3FE /* curlhttpt.cpp */; }; + 0A011DD21FB414A900778C2B /* encfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81A13EE98B30094E3FE /* encfiltmgr.cpp */; }; + 0A011DD31FB414A900778C2B /* filemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81B13EE98B30094E3FE /* filemgr.cpp */; }; + 0A011DD41FB414A900778C2B /* ftplibftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81C13EE98B30094E3FE /* ftplibftpt.cpp */; }; + 0A011DD51FB414A900778C2B /* installmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81E13EE98B30094E3FE /* installmgr.cpp */; }; + 0A011DD61FB414A900778C2B /* localemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81F13EE98B30094E3FE /* localemgr.cpp */; }; + 0A011DD71FB414A900778C2B /* markupfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82213EE98B30094E3FE /* markupfiltmgr.cpp */; }; + 0A011DD81FB414A900778C2B /* stringmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82313EE98B30094E3FE /* stringmgr.cpp */; }; + 0A011DD91FB414A900778C2B /* swcacher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82413EE98B30094E3FE /* swcacher.cpp */; }; + 0A011DDA1FB414A900778C2B /* swconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82513EE98B30094E3FE /* swconfig.cpp */; }; + 0A011DDB1FB414A900778C2B /* swfiltermgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82613EE98B30094E3FE /* swfiltermgr.cpp */; }; + 0A011DDC1FB414A900778C2B /* swlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82713EE98B30094E3FE /* swlocale.cpp */; }; + 0A011DDD1FB414A900778C2B /* swmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82813EE98B30094E3FE /* swmgr.cpp */; }; + 0A011DDE1FB414A900778C2B /* swsearchable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82913EE98B30094E3FE /* swsearchable.cpp */; }; + 0A011DDF1FB414B200778C2B /* listkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80913EE98B30094E3FE /* listkey.cpp */; }; + 0A011DE01FB414B200778C2B /* strkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81013EE98B30094E3FE /* strkey.cpp */; }; + 0A011DE11FB414B200778C2B /* swkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81113EE98B30094E3FE /* swkey.cpp */; }; + 0A011DE21FB414B200778C2B /* treekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81213EE98B30094E3FE /* treekey.cpp */; }; + 0A011DE31FB414B200778C2B /* treekeyidx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81313EE98B30094E3FE /* treekeyidx.cpp */; }; + 0A011DE41FB414B200778C2B /* versekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81413EE98B30094E3FE /* versekey.cpp */; }; + 0A011DE51FB414B200778C2B /* versetreekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81513EE98B30094E3FE /* versetreekey.cpp */; }; + 0A011DE61FB414BE00778C2B /* swdisp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80113EE98B30094E3FE /* swdisp.cpp */; }; + 0A011DE71FB414BE00778C2B /* swlog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80213EE98B30094E3FE /* swlog.cpp */; }; + 0A1F169A1FBB70E300E0AEFA /* flatapi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0A1F16991FBB70E200E0AEFA /* flatapi.cpp */; }; + 0A1F169B1FBB70ED00E0AEFA /* flatapi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0A1F16991FBB70E200E0AEFA /* flatapi.cpp */; }; + 0A1F16A41FBB755B00E0AEFA /* SWORD.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A1F16A31FBB755B00E0AEFA /* SWORD.m */; }; + 0A1F16A51FBB755B00E0AEFA /* SWORD.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A1F16A21FBB755B00E0AEFA /* SWORD.h */; }; + 0A1F16A91FBB75AB00E0AEFA /* flatapi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0A1F16991FBB70E200E0AEFA /* flatapi.cpp */; }; + 0A1F16AA1FBB75D600E0AEFA /* swdisp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80113EE98B30094E3FE /* swdisp.cpp */; }; + 0A1F16AB1FBB75D600E0AEFA /* swlog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80213EE98B30094E3FE /* swlog.cpp */; }; + 0A1F16AC1FBB75D600E0AEFA /* listkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80913EE98B30094E3FE /* listkey.cpp */; }; + 0A1F16AD1FBB75D600E0AEFA /* strkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81013EE98B30094E3FE /* strkey.cpp */; }; + 0A1F16AE1FBB75D600E0AEFA /* swkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81113EE98B30094E3FE /* swkey.cpp */; }; + 0A1F16AF1FBB75D600E0AEFA /* treekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81213EE98B30094E3FE /* treekey.cpp */; }; + 0A1F16B01FBB75D600E0AEFA /* treekeyidx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81313EE98B30094E3FE /* treekeyidx.cpp */; }; + 0A1F16B11FBB75D600E0AEFA /* versekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81413EE98B30094E3FE /* versekey.cpp */; }; + 0A1F16B21FBB75D600E0AEFA /* versetreekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81513EE98B30094E3FE /* versetreekey.cpp */; }; + 0A1F16B31FBB75D600E0AEFA /* remotetrans.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2351176AF188008D714B /* remotetrans.cpp */; }; + 0A1F16B41FBB75D600E0AEFA /* versificationmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A91C8B66175233F3008702B9 /* versificationmgr.cpp */; }; + 0A1F16B51FBB75D600E0AEFA /* curlftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81813EE98B30094E3FE /* curlftpt.cpp */; }; + 0A1F16B61FBB75D600E0AEFA /* curlhttpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81913EE98B30094E3FE /* curlhttpt.cpp */; }; + 0A1F16B71FBB75D600E0AEFA /* encfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81A13EE98B30094E3FE /* encfiltmgr.cpp */; }; + 0A1F16B81FBB75D600E0AEFA /* filemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81B13EE98B30094E3FE /* filemgr.cpp */; }; + 0A1F16B91FBB75D600E0AEFA /* ftplibftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81C13EE98B30094E3FE /* ftplibftpt.cpp */; }; + 0A1F16BA1FBB75D600E0AEFA /* installmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81E13EE98B30094E3FE /* installmgr.cpp */; }; + 0A1F16BB1FBB75D600E0AEFA /* localemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81F13EE98B30094E3FE /* localemgr.cpp */; }; + 0A1F16BC1FBB75D600E0AEFA /* markupfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82213EE98B30094E3FE /* markupfiltmgr.cpp */; }; + 0A1F16BD1FBB75D600E0AEFA /* stringmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82313EE98B30094E3FE /* stringmgr.cpp */; }; + 0A1F16BE1FBB75D600E0AEFA /* swcacher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82413EE98B30094E3FE /* swcacher.cpp */; }; + 0A1F16BF1FBB75D600E0AEFA /* swconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82513EE98B30094E3FE /* swconfig.cpp */; }; + 0A1F16C01FBB75D600E0AEFA /* swfiltermgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82613EE98B30094E3FE /* swfiltermgr.cpp */; }; + 0A1F16C11FBB75D600E0AEFA /* swlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82713EE98B30094E3FE /* swlocale.cpp */; }; + 0A1F16C21FBB75D600E0AEFA /* swmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82813EE98B30094E3FE /* swmgr.cpp */; }; + 0A1F16C31FBB75D600E0AEFA /* swsearchable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82913EE98B30094E3FE /* swsearchable.cpp */; }; + 0A1F16C41FBB762D00E0AEFA /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67401C6BCD9600EB1A49 /* adler32.c */; }; + 0A1F16C51FBB762D00E0AEFA /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67411C6BCD9600EB1A49 /* compress.c */; }; + 0A1F16C61FBB762D00E0AEFA /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67421C6BCD9600EB1A49 /* crc32.c */; }; + 0A1F16C71FBB762D00E0AEFA /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67441C6BCD9600EB1A49 /* deflate.c */; }; + 0A1F16C81FBB762D00E0AEFA /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67461C6BCD9600EB1A49 /* gzclose.c */; }; + 0A1F16C91FBB762D00E0AEFA /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67481C6BCD9600EB1A49 /* gzlib.c */; }; + 0A1F16CA1FBB762D00E0AEFA /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67491C6BCD9600EB1A49 /* gzread.c */; }; + 0A1F16CB1FBB762D00E0AEFA /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB674A1C6BCD9600EB1A49 /* gzwrite.c */; }; + 0A1F16CC1FBB762D00E0AEFA /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB674B1C6BCD9600EB1A49 /* infback.c */; }; + 0A1F16CD1FBB762D00E0AEFA /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB674C1C6BCD9600EB1A49 /* inffast.c */; }; + 0A1F16CE1FBB762D00E0AEFA /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB674F1C6BCD9600EB1A49 /* inflate.c */; }; + 0A1F16CF1FBB762D00E0AEFA /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67511C6BCD9600EB1A49 /* inftrees.c */; }; + 0A1F16D01FBB762D00E0AEFA /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67531C6BCD9600EB1A49 /* trees.c */; }; + 0A1F16D11FBB762D00E0AEFA /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67551C6BCD9600EB1A49 /* uncompr.c */; }; + 0A1F16D21FBB762D00E0AEFA /* untgz.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67561C6BCD9600EB1A49 /* untgz.c */; }; + 0A1F16D31FBB762D00E0AEFA /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = A9BB67591C6BCD9600EB1A49 /* zutil.c */; }; + 0A1F16D41FBB762D00E0AEFA /* ftplib.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D013EE98B30094E3FE /* ftplib.c */; }; + 0A1F16D51FBB762D00E0AEFA /* ftpparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D113EE98B30094E3FE /* ftpparse.c */; }; + 0A1F16D61FBB762D00E0AEFA /* roman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D513EE98B30094E3FE /* roman.cpp */; }; + 0A1F16D71FBB762D00E0AEFA /* swbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D613EE98B30094E3FE /* swbuf.cpp */; }; + 0A1F16D81FBB762D00E0AEFA /* swobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D713EE98B30094E3FE /* swobject.cpp */; }; + 0A1F16D91FBB762D00E0AEFA /* swversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D913EE98B30094E3FE /* swversion.cpp */; }; + 0A1F16DA1FBB762D00E0AEFA /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DA13EE98B30094E3FE /* url.cpp */; }; + 0A1F16DB1FBB762D00E0AEFA /* utilstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DB13EE98B30094E3FE /* utilstr.cpp */; }; + 0A1F16DC1FBB762D00E0AEFA /* utilxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DC13EE98B30094E3FE /* utilxml.cpp */; }; + 0A1F16DD1FBB765A00E0AEFA /* rawgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A713EE98B30094E3FE /* rawgenbook.cpp */; }; + 0A1F16DE1FBB765A00E0AEFA /* swgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A813EE98B30094E3FE /* swgenbook.cpp */; }; + 0A1F16DF1FBB765A00E0AEFA /* rawld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8AF13EE98B30094E3FE /* rawld.cpp */; }; + 0A1F16E01FBB765A00E0AEFA /* rawld4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B313EE98B30094E3FE /* rawld4.cpp */; }; + 0A1F16E11FBB765A00E0AEFA /* swld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B413EE98B30094E3FE /* swld.cpp */; }; + 0A1F16E21FBB765A00E0AEFA /* zld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B813EE98B30094E3FE /* zld.cpp */; }; + 0A1F16E31FBB765A00E0AEFA /* swmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8BC13EE98B30094E3FE /* swmodule.cpp */; }; + 0A1F16E41FBB765A00E0AEFA /* rawtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8C613EE98B30094E3FE /* rawtext.cpp */; }; + 0A1F16E51FBB765A00E0AEFA /* rawtext4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8C913EE98B30094E3FE /* rawtext4.cpp */; }; + 0A1F16E61FBB765A00E0AEFA /* swtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8CA13EE98B30094E3FE /* swtext.cpp */; }; + 0A1F16E71FBB765A00E0AEFA /* ztext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8CE13EE98B30094E3FE /* ztext.cpp */; }; + 0A1F16E81FBB765A00E0AEFA /* ztext4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982038819A09BC000DD808C /* ztext4.cpp */; }; + 0A1F16E91FBB768100E0AEFA /* scsuutf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982039D19A0A5FA00DD808C /* scsuutf8.cpp */; }; + 0A1F16EA1FBB768100E0AEFA /* utf8scsu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982039E19A0A5FA00DD808C /* utf8scsu.cpp */; }; + 0A1F16EB1FBB768100E0AEFA /* gbflatex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037919A09B7800DD808C /* gbflatex.cpp */; }; + 0A1F16EC1FBB768100E0AEFA /* osislatex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037A19A09B7800DD808C /* osislatex.cpp */; }; + 0A1F16ED1FBB768100E0AEFA /* osisxlit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037B19A09B7800DD808C /* osisxlit.cpp */; }; + 0A1F16EE1FBB768100E0AEFA /* teilatex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037C19A09B7800DD808C /* teilatex.cpp */; }; + 0A1F16EF1FBB768100E0AEFA /* thmllatex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037D19A09B7800DD808C /* thmllatex.cpp */; }; + 0A1F16F01FBB768100E0AEFA /* osisenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2353176AF19C008D714B /* osisenum.cpp */; }; + 0A1F16F11FBB768100E0AEFA /* osisglosses.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2354176AF19C008D714B /* osisglosses.cpp */; }; + 0A1F16F21FBB768100E0AEFA /* osisreferencelinks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2355176AF19C008D714B /* osisreferencelinks.cpp */; }; + 0A1F16F31FBB768100E0AEFA /* teixhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */; }; + 0A1F16F41FBB768100E0AEFA /* cipherfil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85513EE98B30094E3FE /* cipherfil.cpp */; }; + 0A1F16F51FBB768100E0AEFA /* gbffootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85613EE98B30094E3FE /* gbffootnotes.cpp */; }; + 0A1F16F61FBB768100E0AEFA /* gbfheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85713EE98B30094E3FE /* gbfheadings.cpp */; }; + 0A1F16F71FBB768100E0AEFA /* gbfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85813EE98B30094E3FE /* gbfhtml.cpp */; }; + 0A1F16F81FBB768100E0AEFA /* gbfhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85913EE98B30094E3FE /* gbfhtmlhref.cpp */; }; + 0A1F16F91FBB768100E0AEFA /* gbfmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85A13EE98B30094E3FE /* gbfmorph.cpp */; }; + 0A1F16FA1FBB768100E0AEFA /* gbfosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85B13EE98B30094E3FE /* gbfosis.cpp */; }; + 0A1F16FB1FBB768100E0AEFA /* gbfplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85C13EE98B30094E3FE /* gbfplain.cpp */; }; + 0A1F16FC1FBB768100E0AEFA /* gbfredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85D13EE98B30094E3FE /* gbfredletterwords.cpp */; }; + 0A1F16FD1FBB768100E0AEFA /* gbfrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85E13EE98B30094E3FE /* gbfrtf.cpp */; }; + 0A1F16FE1FBB768100E0AEFA /* gbfstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85F13EE98B30094E3FE /* gbfstrongs.cpp */; }; + 0A1F16FF1FBB768100E0AEFA /* gbfthml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86013EE98B30094E3FE /* gbfthml.cpp */; }; + 0A1F17001FBB768100E0AEFA /* gbfwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86113EE98B30094E3FE /* gbfwebif.cpp */; }; + 0A1F17011FBB768100E0AEFA /* gbfwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86213EE98B30094E3FE /* gbfwordjs.cpp */; }; + 0A1F17021FBB768100E0AEFA /* gbfxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86313EE98B30094E3FE /* gbfxhtml.cpp */; }; + 0A1F17031FBB768100E0AEFA /* greeklexattribs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86413EE98B30094E3FE /* greeklexattribs.cpp */; }; + 0A1F17041FBB768100E0AEFA /* latin1utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86513EE98B30094E3FE /* latin1utf16.cpp */; }; + 0A1F17051FBB768100E0AEFA /* latin1utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86613EE98B30094E3FE /* latin1utf8.cpp */; }; + 0A1F17061FBB768100E0AEFA /* osisfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86913EE98B30094E3FE /* osisfootnotes.cpp */; }; + 0A1F17071FBB768100E0AEFA /* osisheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86A13EE98B30094E3FE /* osisheadings.cpp */; }; + 0A1F17081FBB768100E0AEFA /* osishtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86B13EE98B30094E3FE /* osishtmlhref.cpp */; }; + 0A1F17091FBB768100E0AEFA /* osislemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86C13EE98B30094E3FE /* osislemma.cpp */; }; + 0A1F170A1FBB768100E0AEFA /* osismorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86D13EE98B30094E3FE /* osismorph.cpp */; }; + 0A1F170B1FBB768100E0AEFA /* osismorphsegmentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86E13EE98B30094E3FE /* osismorphsegmentation.cpp */; }; + 0A1F170C1FBB768100E0AEFA /* osisosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86F13EE98B30094E3FE /* osisosis.cpp */; }; + 0A1F170D1FBB768100E0AEFA /* osisplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87013EE98B30094E3FE /* osisplain.cpp */; }; + 0A1F170E1FBB768100E0AEFA /* osisredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87113EE98B30094E3FE /* osisredletterwords.cpp */; }; + 0A1F170F1FBB768100E0AEFA /* osisrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87213EE98B30094E3FE /* osisrtf.cpp */; }; + 0A1F17101FBB768100E0AEFA /* osisscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87413EE98B30094E3FE /* osisscripref.cpp */; }; + 0A1F17111FBB768100E0AEFA /* osisstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87513EE98B30094E3FE /* osisstrongs.cpp */; }; + 0A1F17121FBB768100E0AEFA /* osisvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87613EE98B30094E3FE /* osisvariants.cpp */; }; + 0A1F17131FBB768100E0AEFA /* osiswebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87713EE98B30094E3FE /* osiswebif.cpp */; }; + 0A1F17141FBB768100E0AEFA /* osiswordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87813EE98B30094E3FE /* osiswordjs.cpp */; }; + 0A1F17151FBB768100E0AEFA /* osisxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87913EE98B30094E3FE /* osisxhtml.cpp */; }; + 0A1F17161FBB768100E0AEFA /* papyriplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87A13EE98B30094E3FE /* papyriplain.cpp */; }; + 0A1F17171FBB768100E0AEFA /* rtfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87D13EE98B30094E3FE /* rtfhtml.cpp */; }; + 0A1F17181FBB768100E0AEFA /* swbasicfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87E13EE98B30094E3FE /* swbasicfilter.cpp */; }; + 0A1F17191FBB768100E0AEFA /* swoptfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87F13EE98B30094E3FE /* swoptfilter.cpp */; }; + 0A1F171A1FBB768100E0AEFA /* teihtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88013EE98B30094E3FE /* teihtmlhref.cpp */; }; + 0A1F171B1FBB768100E0AEFA /* teiplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88113EE98B30094E3FE /* teiplain.cpp */; }; + 0A1F171C1FBB768100E0AEFA /* teirtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88213EE98B30094E3FE /* teirtf.cpp */; }; + 0A1F171D1FBB768100E0AEFA /* thmlfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88313EE98B30094E3FE /* thmlfootnotes.cpp */; }; + 0A1F171E1FBB768100E0AEFA /* thmlgbf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88413EE98B30094E3FE /* thmlgbf.cpp */; }; + 0A1F171F1FBB768100E0AEFA /* thmlheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88513EE98B30094E3FE /* thmlheadings.cpp */; }; + 0A1F17201FBB768100E0AEFA /* thmlhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88613EE98B30094E3FE /* thmlhtml.cpp */; }; + 0A1F17211FBB768100E0AEFA /* thmlhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88713EE98B30094E3FE /* thmlhtmlhref.cpp */; }; + 0A1F17221FBB768100E0AEFA /* thmllemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88813EE98B30094E3FE /* thmllemma.cpp */; }; + 0A1F17231FBB768100E0AEFA /* thmlmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88913EE98B30094E3FE /* thmlmorph.cpp */; }; + 0A1F17241FBB768100E0AEFA /* thmlosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88A13EE98B30094E3FE /* thmlosis.cpp */; }; + 0A1F17251FBB768100E0AEFA /* thmlplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88B13EE98B30094E3FE /* thmlplain.cpp */; }; + 0A1F17261FBB768100E0AEFA /* thmlrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88C13EE98B30094E3FE /* thmlrtf.cpp */; }; + 0A1F17271FBB768100E0AEFA /* thmlscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88D13EE98B30094E3FE /* thmlscripref.cpp */; }; + 0A1F17281FBB768100E0AEFA /* thmlstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88E13EE98B30094E3FE /* thmlstrongs.cpp */; }; + 0A1F17291FBB768100E0AEFA /* thmlvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88F13EE98B30094E3FE /* thmlvariants.cpp */; }; + 0A1F172A1FBB768100E0AEFA /* thmlwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89013EE98B30094E3FE /* thmlwebif.cpp */; }; + 0A1F172B1FBB768100E0AEFA /* thmlwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89113EE98B30094E3FE /* thmlwordjs.cpp */; }; + 0A1F172C1FBB768100E0AEFA /* thmlxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89213EE98B30094E3FE /* thmlxhtml.cpp */; }; + 0A1F172D1FBB768100E0AEFA /* unicodertf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89313EE98B30094E3FE /* unicodertf.cpp */; }; + 0A1F172E1FBB768100E0AEFA /* utf16utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89413EE98B30094E3FE /* utf16utf8.cpp */; }; + 0A1F172F1FBB768100E0AEFA /* utf8arabicpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89513EE98B30094E3FE /* utf8arabicpoints.cpp */; }; + 0A1F17301FBB768100E0AEFA /* utf8arshaping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89613EE98B30094E3FE /* utf8arshaping.cpp */; }; + 0A1F17311FBB768100E0AEFA /* utf8bidireorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89713EE98B30094E3FE /* utf8bidireorder.cpp */; }; + 0A1F17321FBB768100E0AEFA /* utf8cantillation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89813EE98B30094E3FE /* utf8cantillation.cpp */; }; + 0A1F17331FBB768100E0AEFA /* utf8greekaccents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89913EE98B30094E3FE /* utf8greekaccents.cpp */; }; + 0A1F17341FBB768100E0AEFA /* utf8hebrewpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89A13EE98B30094E3FE /* utf8hebrewpoints.cpp */; }; + 0A1F17351FBB768100E0AEFA /* utf8html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89B13EE98B30094E3FE /* utf8html.cpp */; }; + 0A1F17361FBB768100E0AEFA /* utf8latin1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89C13EE98B30094E3FE /* utf8latin1.cpp */; }; + 0A1F17371FBB768100E0AEFA /* utf8nfc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89D13EE98B30094E3FE /* utf8nfc.cpp */; }; + 0A1F17381FBB768100E0AEFA /* utf8nfkd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89E13EE98B30094E3FE /* utf8nfkd.cpp */; }; + 0A1F17391FBB768100E0AEFA /* utf8transliterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89F13EE98B30094E3FE /* utf8transliterator.cpp */; }; + 0A1F173A1FBB768100E0AEFA /* utf8utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A013EE98B30094E3FE /* utf8utf16.cpp */; }; + 0A1F173B1FBB76A700E0AEFA /* hrefcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82E13EE98B30094E3FE /* hrefcom.cpp */; }; + 0A1F173C1FBB76A700E0AEFA /* rawcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83613EE98B30094E3FE /* rawcom.cpp */; }; + 0A1F173D1FBB76A700E0AEFA /* rawcom4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83913EE98B30094E3FE /* rawcom4.cpp */; }; + 0A1F173E1FBB76A700E0AEFA /* rawfiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83D13EE98B30094E3FE /* rawfiles.cpp */; }; + 0A1F173F1FBB76A700E0AEFA /* swcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83E13EE98B30094E3FE /* swcom.cpp */; }; + 0A1F17401FBB76A700E0AEFA /* zcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84213EE98B30094E3FE /* zcom.cpp */; }; + 0A1F17411FBB76A700E0AEFA /* zcom4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037319A09AE500DD808C /* zcom4.cpp */; }; + 0A1F17421FBB76A700E0AEFA /* bz2comprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A999FF3917951C8900E65919 /* bz2comprs.cpp */; }; + 0A1F17431FBB76A700E0AEFA /* entriesblk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84513EE98B30094E3FE /* entriesblk.cpp */; }; + 0A1F17441FBB76A700E0AEFA /* lzsscomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84613EE98B30094E3FE /* lzsscomprs.cpp */; }; + 0A1F17451FBB76A700E0AEFA /* rawstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84913EE98B30094E3FE /* rawstr.cpp */; }; + 0A1F17461FBB76A700E0AEFA /* rawstr4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84A13EE98B30094E3FE /* rawstr4.cpp */; }; + 0A1F17471FBB76A700E0AEFA /* rawverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84B13EE98B30094E3FE /* rawverse.cpp */; }; + 0A1F17481FBB76A700E0AEFA /* rawverse4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84C13EE98B30094E3FE /* rawverse4.cpp */; }; + 0A1F17491FBB76A700E0AEFA /* sapphire.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84D13EE98B30094E3FE /* sapphire.cpp */; }; + 0A1F174A1FBB76A700E0AEFA /* swcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84E13EE98B30094E3FE /* swcipher.cpp */; }; + 0A1F174B1FBB76A700E0AEFA /* swcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84F13EE98B30094E3FE /* swcomprs.cpp */; }; + 0A1F174C1FBB76A700E0AEFA /* zipcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85113EE98B30094E3FE /* zipcomprs.cpp */; }; + 0A1F174D1FBB76A700E0AEFA /* zstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85213EE98B30094E3FE /* zstr.cpp */; }; + 0A1F174E1FBB76A700E0AEFA /* zverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85313EE98B30094E3FE /* zverse.cpp */; }; + 0A1F174F1FBB76A700E0AEFA /* zverse4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037719A09B5C00DD808C /* zverse4.cpp */; }; + 0A58878C1FB41DCF00F7DAA3 /* entriesblk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84513EE98B30094E3FE /* entriesblk.cpp */; }; + 0A58878D1FB41DCF00F7DAA3 /* lzsscomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84613EE98B30094E3FE /* lzsscomprs.cpp */; }; + 0A58878E1FB41DCF00F7DAA3 /* rawstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84913EE98B30094E3FE /* rawstr.cpp */; }; + 0A58878F1FB41DCF00F7DAA3 /* rawstr4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84A13EE98B30094E3FE /* rawstr4.cpp */; }; + 0A5887901FB41DCF00F7DAA3 /* rawverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84B13EE98B30094E3FE /* rawverse.cpp */; }; + 0A5887911FB41DCF00F7DAA3 /* rawverse4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84C13EE98B30094E3FE /* rawverse4.cpp */; }; + 0A5887921FB41DCF00F7DAA3 /* sapphire.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84D13EE98B30094E3FE /* sapphire.cpp */; }; + 0A5887931FB41DCF00F7DAA3 /* swcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84E13EE98B30094E3FE /* swcipher.cpp */; }; + 0A5887941FB41DCF00F7DAA3 /* swcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84F13EE98B30094E3FE /* swcomprs.cpp */; }; + 0A5887951FB41DCF00F7DAA3 /* zipcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85113EE98B30094E3FE /* zipcomprs.cpp */; }; + 0A5887961FB41DCF00F7DAA3 /* zstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85213EE98B30094E3FE /* zstr.cpp */; }; + 0A5887971FB41DCF00F7DAA3 /* zverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85313EE98B30094E3FE /* zverse.cpp */; }; + 0A5887981FB41DCF00F7DAA3 /* zverse4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037719A09B5C00DD808C /* zverse4.cpp */; }; + 0A5887991FB41DED00F7DAA3 /* hrefcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82E13EE98B30094E3FE /* hrefcom.cpp */; }; + 0A58879A1FB41DED00F7DAA3 /* rawcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83613EE98B30094E3FE /* rawcom.cpp */; }; + 0A58879B1FB41DED00F7DAA3 /* rawcom4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83913EE98B30094E3FE /* rawcom4.cpp */; }; + 0A58879C1FB41DED00F7DAA3 /* rawfiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83D13EE98B30094E3FE /* rawfiles.cpp */; }; + 0A58879D1FB41DED00F7DAA3 /* swcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83E13EE98B30094E3FE /* swcom.cpp */; }; + 0A58879E1FB41DED00F7DAA3 /* zcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84213EE98B30094E3FE /* zcom.cpp */; }; + 0A58879F1FB41DED00F7DAA3 /* zcom4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037319A09AE500DD808C /* zcom4.cpp */; }; + 0A5887A01FB41E1500F7DAA3 /* scsuutf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982039D19A0A5FA00DD808C /* scsuutf8.cpp */; }; + 0A5887A11FB41E1500F7DAA3 /* utf8scsu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982039E19A0A5FA00DD808C /* utf8scsu.cpp */; }; + 0A5887A21FB41E1500F7DAA3 /* gbflatex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037919A09B7800DD808C /* gbflatex.cpp */; }; + 0A5887A31FB41E1500F7DAA3 /* osislatex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037A19A09B7800DD808C /* osislatex.cpp */; }; + 0A5887A41FB41E1500F7DAA3 /* osisxlit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037B19A09B7800DD808C /* osisxlit.cpp */; }; + 0A5887A51FB41E1500F7DAA3 /* teilatex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037C19A09B7800DD808C /* teilatex.cpp */; }; + 0A5887A61FB41E1500F7DAA3 /* thmllatex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982037D19A09B7800DD808C /* thmllatex.cpp */; }; + 0A5887A71FB41E1500F7DAA3 /* osisenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2353176AF19C008D714B /* osisenum.cpp */; }; + 0A5887A81FB41E1500F7DAA3 /* osisglosses.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2354176AF19C008D714B /* osisglosses.cpp */; }; + 0A5887A91FB41E1500F7DAA3 /* osisreferencelinks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2355176AF19C008D714B /* osisreferencelinks.cpp */; }; + 0A5887AA1FB41E1500F7DAA3 /* teixhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */; }; + 0A5887AB1FB41E1500F7DAA3 /* cipherfil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85513EE98B30094E3FE /* cipherfil.cpp */; }; + 0A5887AC1FB41E1500F7DAA3 /* gbffootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85613EE98B30094E3FE /* gbffootnotes.cpp */; }; + 0A5887AD1FB41E1500F7DAA3 /* gbfheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85713EE98B30094E3FE /* gbfheadings.cpp */; }; + 0A5887AE1FB41E1500F7DAA3 /* gbfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85813EE98B30094E3FE /* gbfhtml.cpp */; }; + 0A5887AF1FB41E1500F7DAA3 /* gbfhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85913EE98B30094E3FE /* gbfhtmlhref.cpp */; }; + 0A5887B01FB41E1500F7DAA3 /* gbfmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85A13EE98B30094E3FE /* gbfmorph.cpp */; }; + 0A5887B11FB41E1500F7DAA3 /* gbfosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85B13EE98B30094E3FE /* gbfosis.cpp */; }; + 0A5887B21FB41E1500F7DAA3 /* gbfplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85C13EE98B30094E3FE /* gbfplain.cpp */; }; + 0A5887B31FB41E1500F7DAA3 /* gbfredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85D13EE98B30094E3FE /* gbfredletterwords.cpp */; }; + 0A5887B41FB41E1500F7DAA3 /* gbfrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85E13EE98B30094E3FE /* gbfrtf.cpp */; }; + 0A5887B51FB41E1500F7DAA3 /* gbfstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85F13EE98B30094E3FE /* gbfstrongs.cpp */; }; + 0A5887B61FB41E1500F7DAA3 /* gbfthml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86013EE98B30094E3FE /* gbfthml.cpp */; }; + 0A5887B71FB41E1500F7DAA3 /* gbfwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86113EE98B30094E3FE /* gbfwebif.cpp */; }; + 0A5887B81FB41E1500F7DAA3 /* gbfwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86213EE98B30094E3FE /* gbfwordjs.cpp */; }; + 0A5887B91FB41E1500F7DAA3 /* gbfxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86313EE98B30094E3FE /* gbfxhtml.cpp */; }; + 0A5887BA1FB41E1500F7DAA3 /* greeklexattribs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86413EE98B30094E3FE /* greeklexattribs.cpp */; }; + 0A5887BB1FB41E1500F7DAA3 /* latin1utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86513EE98B30094E3FE /* latin1utf16.cpp */; }; + 0A5887BC1FB41E1500F7DAA3 /* latin1utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86613EE98B30094E3FE /* latin1utf8.cpp */; }; + 0A5887BD1FB41E1500F7DAA3 /* osisfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86913EE98B30094E3FE /* osisfootnotes.cpp */; }; + 0A5887BE1FB41E1500F7DAA3 /* osisheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86A13EE98B30094E3FE /* osisheadings.cpp */; }; + 0A5887BF1FB41E1500F7DAA3 /* osishtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86B13EE98B30094E3FE /* osishtmlhref.cpp */; }; + 0A5887C01FB41E1500F7DAA3 /* osislemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86C13EE98B30094E3FE /* osislemma.cpp */; }; + 0A5887C11FB41E1500F7DAA3 /* osismorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86D13EE98B30094E3FE /* osismorph.cpp */; }; + 0A5887C21FB41E1500F7DAA3 /* osismorphsegmentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86E13EE98B30094E3FE /* osismorphsegmentation.cpp */; }; + 0A5887C31FB41E1500F7DAA3 /* osisosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86F13EE98B30094E3FE /* osisosis.cpp */; }; + 0A5887C41FB41E1500F7DAA3 /* osisplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87013EE98B30094E3FE /* osisplain.cpp */; }; + 0A5887C51FB41E1500F7DAA3 /* osisredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87113EE98B30094E3FE /* osisredletterwords.cpp */; }; + 0A5887C61FB41E1500F7DAA3 /* osisrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87213EE98B30094E3FE /* osisrtf.cpp */; }; + 0A5887C71FB41E1500F7DAA3 /* osisscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87413EE98B30094E3FE /* osisscripref.cpp */; }; + 0A5887C81FB41E1500F7DAA3 /* osisstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87513EE98B30094E3FE /* osisstrongs.cpp */; }; + 0A5887C91FB41E1500F7DAA3 /* osisvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87613EE98B30094E3FE /* osisvariants.cpp */; }; + 0A5887CA1FB41E1500F7DAA3 /* osiswebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87713EE98B30094E3FE /* osiswebif.cpp */; }; + 0A5887CB1FB41E1500F7DAA3 /* osiswordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87813EE98B30094E3FE /* osiswordjs.cpp */; }; + 0A5887CC1FB41E1500F7DAA3 /* osisxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87913EE98B30094E3FE /* osisxhtml.cpp */; }; + 0A5887CD1FB41E1500F7DAA3 /* papyriplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87A13EE98B30094E3FE /* papyriplain.cpp */; }; + 0A5887CE1FB41E1500F7DAA3 /* rtfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87D13EE98B30094E3FE /* rtfhtml.cpp */; }; + 0A5887CF1FB41E1500F7DAA3 /* swbasicfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87E13EE98B30094E3FE /* swbasicfilter.cpp */; }; + 0A5887D01FB41E1500F7DAA3 /* swoptfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87F13EE98B30094E3FE /* swoptfilter.cpp */; }; + 0A5887D11FB41E1500F7DAA3 /* teihtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88013EE98B30094E3FE /* teihtmlhref.cpp */; }; + 0A5887D21FB41E1500F7DAA3 /* teiplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88113EE98B30094E3FE /* teiplain.cpp */; }; + 0A5887D31FB41E1500F7DAA3 /* teirtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88213EE98B30094E3FE /* teirtf.cpp */; }; + 0A5887D41FB41E1500F7DAA3 /* thmlfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88313EE98B30094E3FE /* thmlfootnotes.cpp */; }; + 0A5887D51FB41E1500F7DAA3 /* thmlgbf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88413EE98B30094E3FE /* thmlgbf.cpp */; }; + 0A5887D61FB41E1500F7DAA3 /* thmlheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88513EE98B30094E3FE /* thmlheadings.cpp */; }; + 0A5887D71FB41E1500F7DAA3 /* thmlhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88613EE98B30094E3FE /* thmlhtml.cpp */; }; + 0A5887D81FB41E1500F7DAA3 /* thmlhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88713EE98B30094E3FE /* thmlhtmlhref.cpp */; }; + 0A5887D91FB41E1500F7DAA3 /* thmllemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88813EE98B30094E3FE /* thmllemma.cpp */; }; + 0A5887DA1FB41E1500F7DAA3 /* thmlmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88913EE98B30094E3FE /* thmlmorph.cpp */; }; + 0A5887DB1FB41E1500F7DAA3 /* thmlosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88A13EE98B30094E3FE /* thmlosis.cpp */; }; + 0A5887DC1FB41E1500F7DAA3 /* thmlplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88B13EE98B30094E3FE /* thmlplain.cpp */; }; + 0A5887DD1FB41E1500F7DAA3 /* thmlrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88C13EE98B30094E3FE /* thmlrtf.cpp */; }; + 0A5887DE1FB41E1500F7DAA3 /* thmlscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88D13EE98B30094E3FE /* thmlscripref.cpp */; }; + 0A5887DF1FB41E1500F7DAA3 /* thmlstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88E13EE98B30094E3FE /* thmlstrongs.cpp */; }; + 0A5887E01FB41E1500F7DAA3 /* thmlvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88F13EE98B30094E3FE /* thmlvariants.cpp */; }; + 0A5887E11FB41E1500F7DAA3 /* thmlwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89013EE98B30094E3FE /* thmlwebif.cpp */; }; + 0A5887E21FB41E1500F7DAA3 /* thmlwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89113EE98B30094E3FE /* thmlwordjs.cpp */; }; + 0A5887E31FB41E1500F7DAA3 /* thmlxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89213EE98B30094E3FE /* thmlxhtml.cpp */; }; + 0A5887E41FB41E1500F7DAA3 /* unicodertf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89313EE98B30094E3FE /* unicodertf.cpp */; }; + 0A5887E51FB41E1500F7DAA3 /* utf16utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89413EE98B30094E3FE /* utf16utf8.cpp */; }; + 0A5887E61FB41E1500F7DAA3 /* utf8arabicpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89513EE98B30094E3FE /* utf8arabicpoints.cpp */; }; + 0A5887E71FB41E1500F7DAA3 /* utf8arshaping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89613EE98B30094E3FE /* utf8arshaping.cpp */; }; + 0A5887E81FB41E1500F7DAA3 /* utf8bidireorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89713EE98B30094E3FE /* utf8bidireorder.cpp */; }; + 0A5887E91FB41E1500F7DAA3 /* utf8cantillation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89813EE98B30094E3FE /* utf8cantillation.cpp */; }; + 0A5887EA1FB41E1500F7DAA3 /* utf8greekaccents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89913EE98B30094E3FE /* utf8greekaccents.cpp */; }; + 0A5887EB1FB41E1500F7DAA3 /* utf8hebrewpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89A13EE98B30094E3FE /* utf8hebrewpoints.cpp */; }; + 0A5887EC1FB41E1500F7DAA3 /* utf8html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89B13EE98B30094E3FE /* utf8html.cpp */; }; + 0A5887ED1FB41E1500F7DAA3 /* utf8latin1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89C13EE98B30094E3FE /* utf8latin1.cpp */; }; + 0A5887EE1FB41E1500F7DAA3 /* utf8nfc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89D13EE98B30094E3FE /* utf8nfc.cpp */; }; + 0A5887EF1FB41E1500F7DAA3 /* utf8nfkd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89E13EE98B30094E3FE /* utf8nfkd.cpp */; }; + 0A5887F01FB41E1500F7DAA3 /* utf8transliterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89F13EE98B30094E3FE /* utf8transliterator.cpp */; }; + 0A5887F11FB41E1500F7DAA3 /* utf8utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A013EE98B30094E3FE /* utf8utf16.cpp */; }; + 0A5887F21FB41E5800F7DAA3 /* rawgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A713EE98B30094E3FE /* rawgenbook.cpp */; }; + 0A5887F31FB41E5800F7DAA3 /* swgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A813EE98B30094E3FE /* swgenbook.cpp */; }; + 0A5887F41FB41E5800F7DAA3 /* rawld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8AF13EE98B30094E3FE /* rawld.cpp */; }; + 0A5887F51FB41E5800F7DAA3 /* rawld4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B313EE98B30094E3FE /* rawld4.cpp */; }; + 0A5887F61FB41E5800F7DAA3 /* swld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B413EE98B30094E3FE /* swld.cpp */; }; + 0A5887F71FB41E5800F7DAA3 /* zld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B813EE98B30094E3FE /* zld.cpp */; }; + 0A5887F81FB41E5800F7DAA3 /* swmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8BC13EE98B30094E3FE /* swmodule.cpp */; }; + 0A5887F91FB41E5800F7DAA3 /* rawtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8C613EE98B30094E3FE /* rawtext.cpp */; }; + 0A5887FA1FB41E5800F7DAA3 /* rawtext4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8C913EE98B30094E3FE /* rawtext4.cpp */; }; + 0A5887FB1FB41E5800F7DAA3 /* swtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8CA13EE98B30094E3FE /* swtext.cpp */; }; + 0A5887FC1FB41E5800F7DAA3 /* ztext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8CE13EE98B30094E3FE /* ztext.cpp */; }; + 0A5887FD1FB41E5800F7DAA3 /* ztext4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A982038819A09BC000DD808C /* ztext4.cpp */; }; + 0A5888051FB44ABE00F7DAA3 /* canon_calvin.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A94A351DCB21AB00F69260 /* canon_calvin.h */; }; + 0A5888061FB44ABE00F7DAA3 /* canon_darbyfr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A94A361DCB21AB00F69260 /* canon_darbyfr.h */; }; + 0A5888071FB44ABE00F7DAA3 /* canon_segond.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A94A371DCB21AB00F69260 /* canon_segond.h */; }; + 0A5888081FB44ABE00F7DAA3 /* bz2comprs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1291C19DF144D005BCBC1 /* bz2comprs.h */; }; + 0A5888091FB44ABE00F7DAA3 /* canon.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1291D19DF144D005BCBC1 /* canon.h */; }; + 0A58880A1FB44ABE00F7DAA3 /* canon_abbrevs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1291E19DF144D005BCBC1 /* canon_abbrevs.h */; }; + 0A58880B1FB44ABE00F7DAA3 /* canon_catholic.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1291F19DF144D005BCBC1 /* canon_catholic.h */; }; + 0A58880C1FB44ABE00F7DAA3 /* canon_catholic2.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292019DF144D005BCBC1 /* canon_catholic2.h */; }; + 0A58880D1FB44ABE00F7DAA3 /* canon_german.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292119DF144D005BCBC1 /* canon_german.h */; }; + 0A58880E1FB44ABE00F7DAA3 /* canon_kjva.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292219DF144D005BCBC1 /* canon_kjva.h */; }; + 0A58880F1FB44ABE00F7DAA3 /* canon_leningrad.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292319DF144D005BCBC1 /* canon_leningrad.h */; }; + 0A5888101FB44ABE00F7DAA3 /* canon_luther.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292419DF144D005BCBC1 /* canon_luther.h */; }; + 0A5888111FB44ABE00F7DAA3 /* canon_lxx.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292519DF144D005BCBC1 /* canon_lxx.h */; }; + 0A5888121FB44ABE00F7DAA3 /* canon_mt.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292619DF144D005BCBC1 /* canon_mt.h */; }; + 0A5888131FB44ABE00F7DAA3 /* canon_nrsv.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292719DF144D005BCBC1 /* canon_nrsv.h */; }; + 0A5888141FB44ABE00F7DAA3 /* canon_nrsva.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292819DF144D005BCBC1 /* canon_nrsva.h */; }; + 0A5888151FB44ABE00F7DAA3 /* canon_null.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292919DF144D005BCBC1 /* canon_null.h */; }; + 0A5888161FB44ABE00F7DAA3 /* canon_orthodox.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292A19DF144D005BCBC1 /* canon_orthodox.h */; }; + 0A5888171FB44ABE00F7DAA3 /* canon_synodal.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292B19DF144D005BCBC1 /* canon_synodal.h */; }; + 0A5888181FB44ABE00F7DAA3 /* canon_synodalprot.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292C19DF144D005BCBC1 /* canon_synodalprot.h */; }; + 0A5888191FB44ABE00F7DAA3 /* canon_vulg.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292D19DF144D005BCBC1 /* canon_vulg.h */; }; + 0A58881A1FB44ABE00F7DAA3 /* cipherfil.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292E19DF144D005BCBC1 /* cipherfil.h */; }; + 0A58881B1FB44ABE00F7DAA3 /* curlftpt.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293019DF144D005BCBC1 /* curlftpt.h */; }; + 0A58881C1FB44ABE00F7DAA3 /* curlhttpt.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293119DF144D005BCBC1 /* curlhttpt.h */; }; + 0A58881D1FB44ABE00F7DAA3 /* defs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293219DF144D005BCBC1 /* defs.h */; }; + 0A58881E1FB44ABE00F7DAA3 /* echomod.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293319DF144D005BCBC1 /* echomod.h */; }; + 0A58881F1FB44ABE00F7DAA3 /* encfiltmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293419DF144D005BCBC1 /* encfiltmgr.h */; }; + 0A5888201FB44ABE00F7DAA3 /* entriesblk.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293519DF144D005BCBC1 /* entriesblk.h */; }; + 0A5888211FB44ABE00F7DAA3 /* femain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293619DF144D005BCBC1 /* femain.h */; }; + 0A5888221FB44ABE00F7DAA3 /* filemgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293719DF144D005BCBC1 /* filemgr.h */; }; + 0A5888231FB44ABE00F7DAA3 /* flatapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293819DF144D005BCBC1 /* flatapi.h */; }; + 0A5888241FB44ABE00F7DAA3 /* ftplib.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293919DF144D005BCBC1 /* ftplib.h */; }; + 0A5888251FB44ABE00F7DAA3 /* ftplibftpt.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293A19DF144D005BCBC1 /* ftplibftpt.h */; }; + 0A5888261FB44ABE00F7DAA3 /* ftpparse.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293B19DF144D005BCBC1 /* ftpparse.h */; }; + 0A5888271FB44ABE00F7DAA3 /* gbffootnotes.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293C19DF144D005BCBC1 /* gbffootnotes.h */; }; + 0A5888281FB44ABE00F7DAA3 /* gbfheadings.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293D19DF144D005BCBC1 /* gbfheadings.h */; }; + 0A5888291FB44ABE00F7DAA3 /* gbfhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293E19DF144D005BCBC1 /* gbfhtml.h */; }; + 0A58882A1FB44ABE00F7DAA3 /* gbfhtmlhref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293F19DF144D005BCBC1 /* gbfhtmlhref.h */; }; + 0A58882B1FB44ABE00F7DAA3 /* gbflatex.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294019DF144D005BCBC1 /* gbflatex.h */; }; + 0A58882C1FB44ABE00F7DAA3 /* gbfmorph.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294119DF144D005BCBC1 /* gbfmorph.h */; }; + 0A58882D1FB44ABE00F7DAA3 /* gbfosis.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294219DF144D005BCBC1 /* gbfosis.h */; }; + 0A58882E1FB44ABE00F7DAA3 /* gbfplain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294319DF144D005BCBC1 /* gbfplain.h */; }; + 0A58882F1FB44ABE00F7DAA3 /* gbfredletterwords.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294419DF144D005BCBC1 /* gbfredletterwords.h */; }; + 0A5888301FB44ABE00F7DAA3 /* gbfrtf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294519DF144D005BCBC1 /* gbfrtf.h */; }; + 0A5888311FB44ABE00F7DAA3 /* gbfstrongs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294619DF144D005BCBC1 /* gbfstrongs.h */; }; + 0A5888321FB44ABE00F7DAA3 /* gbfthml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294719DF144D005BCBC1 /* gbfthml.h */; }; + 0A5888331FB44ABE00F7DAA3 /* gbfwebif.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294819DF144D005BCBC1 /* gbfwebif.h */; }; + 0A5888341FB44ABE00F7DAA3 /* gbfwordjs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294919DF144D005BCBC1 /* gbfwordjs.h */; }; + 0A5888351FB44ABE00F7DAA3 /* gbfxhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294A19DF144D005BCBC1 /* gbfxhtml.h */; }; + 0A5888361FB44ABE00F7DAA3 /* greeklexattribs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294B19DF144D005BCBC1 /* greeklexattribs.h */; }; + 0A5888371FB44ABE00F7DAA3 /* hebrewmcim.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294C19DF144D005BCBC1 /* hebrewmcim.h */; }; + 0A5888381FB44ABE00F7DAA3 /* hrefcom.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294D19DF144D005BCBC1 /* hrefcom.h */; }; + 0A5888391FB44ABE00F7DAA3 /* installmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294E19DF144D005BCBC1 /* installmgr.h */; }; + 0A58883A1FB44ABE00F7DAA3 /* latin1utf16.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295219DF144D005BCBC1 /* latin1utf16.h */; }; + 0A58883B1FB44ABE00F7DAA3 /* latin1utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295319DF144D005BCBC1 /* latin1utf8.h */; }; + 0A58883C1FB44ABE00F7DAA3 /* listkey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295419DF144D005BCBC1 /* listkey.h */; }; + 0A58883D1FB44ABE00F7DAA3 /* localemgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295519DF144D005BCBC1 /* localemgr.h */; }; + 0A58883E1FB44ABE00F7DAA3 /* lzsscomprs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295619DF144D005BCBC1 /* lzsscomprs.h */; }; + 0A58883F1FB44ABE00F7DAA3 /* markupfiltmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295919DF144D005BCBC1 /* markupfiltmgr.h */; }; + 0A5888401FB44ABE00F7DAA3 /* multimapwdef.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295A19DF144D005BCBC1 /* multimapwdef.h */; }; + 0A5888411FB44ABE00F7DAA3 /* nullim.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295B19DF144D005BCBC1 /* nullim.h */; }; + 0A5888421FB44ABE00F7DAA3 /* osisenum.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295C19DF144D005BCBC1 /* osisenum.h */; }; + 0A5888431FB44ABE00F7DAA3 /* osisfootnotes.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295D19DF144D005BCBC1 /* osisfootnotes.h */; }; + 0A5888441FB44ABE00F7DAA3 /* osisglosses.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295E19DF144D005BCBC1 /* osisglosses.h */; }; + 0A5888451FB44ABE00F7DAA3 /* osisheadings.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295F19DF144D005BCBC1 /* osisheadings.h */; }; + 0A5888461FB44ABE00F7DAA3 /* osishtmlhref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296019DF144D005BCBC1 /* osishtmlhref.h */; }; + 0A5888471FB44ABE00F7DAA3 /* osislatex.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296119DF144D005BCBC1 /* osislatex.h */; }; + 0A5888481FB44ABE00F7DAA3 /* osislemma.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296219DF144D005BCBC1 /* osislemma.h */; }; + 0A5888491FB44ABE00F7DAA3 /* osismorph.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296319DF144D005BCBC1 /* osismorph.h */; }; + 0A58884A1FB44ABE00F7DAA3 /* osismorphsegmentation.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296419DF144D005BCBC1 /* osismorphsegmentation.h */; }; + 0A58884B1FB44ABE00F7DAA3 /* osisosis.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296519DF144D005BCBC1 /* osisosis.h */; }; + 0A58884C1FB44ABE00F7DAA3 /* osisplain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296619DF144D005BCBC1 /* osisplain.h */; }; + 0A58884D1FB44ABE00F7DAA3 /* osisredletterwords.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296719DF144D005BCBC1 /* osisredletterwords.h */; }; + 0A58884E1FB44ABE00F7DAA3 /* osisreferencelinks.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296819DF144D005BCBC1 /* osisreferencelinks.h */; }; + 0A58884F1FB44ABE00F7DAA3 /* osisrtf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296919DF144D005BCBC1 /* osisrtf.h */; }; + 0A5888501FB44ABE00F7DAA3 /* osisscripref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296A19DF144D005BCBC1 /* osisscripref.h */; }; + 0A5888511FB44ABE00F7DAA3 /* osisstrongs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296B19DF144D005BCBC1 /* osisstrongs.h */; }; + 0A5888521FB44ABE00F7DAA3 /* osisvariants.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296C19DF144D005BCBC1 /* osisvariants.h */; }; + 0A5888531FB44ABE00F7DAA3 /* osiswebif.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296D19DF144D005BCBC1 /* osiswebif.h */; }; + 0A5888541FB44ABE00F7DAA3 /* osiswordjs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296E19DF144D005BCBC1 /* osiswordjs.h */; }; + 0A5888551FB44ABE00F7DAA3 /* osisxhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296F19DF144D005BCBC1 /* osisxhtml.h */; }; + 0A5888561FB44ABE00F7DAA3 /* osisxlit.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297019DF144D005BCBC1 /* osisxlit.h */; }; + 0A5888571FB44ABE00F7DAA3 /* papyriplain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297119DF144D005BCBC1 /* papyriplain.h */; }; + 0A5888581FB44ABE00F7DAA3 /* rawcom.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297219DF144D005BCBC1 /* rawcom.h */; }; + 0A5888591FB44ABE00F7DAA3 /* rawcom4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297319DF144D005BCBC1 /* rawcom4.h */; }; + 0A58885A1FB44ABE00F7DAA3 /* rawfiles.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297419DF144D005BCBC1 /* rawfiles.h */; }; + 0A58885B1FB44ABE00F7DAA3 /* rawgenbook.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297519DF144D005BCBC1 /* rawgenbook.h */; }; + 0A58885C1FB44ABE00F7DAA3 /* rawld.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297619DF144D005BCBC1 /* rawld.h */; }; + 0A58885D1FB44ABE00F7DAA3 /* rawld4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297719DF144D005BCBC1 /* rawld4.h */; }; + 0A58885E1FB44ABE00F7DAA3 /* rawstr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297819DF144D005BCBC1 /* rawstr.h */; }; + 0A58885F1FB44ABE00F7DAA3 /* rawstr4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297919DF144D005BCBC1 /* rawstr4.h */; }; + 0A5888601FB44ABE00F7DAA3 /* rawtext.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297A19DF144D005BCBC1 /* rawtext.h */; }; + 0A5888611FB44ABE00F7DAA3 /* rawtext4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297B19DF144D005BCBC1 /* rawtext4.h */; }; + 0A5888621FB44ABE00F7DAA3 /* rawverse.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297C19DF144D005BCBC1 /* rawverse.h */; }; + 0A5888631FB44ABE00F7DAA3 /* rawverse4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297D19DF144D005BCBC1 /* rawverse4.h */; }; + 0A5888641FB44ABE00F7DAA3 /* remotetrans.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297E19DF144D005BCBC1 /* remotetrans.h */; }; + 0A5888651FB44ABE00F7DAA3 /* roman.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297F19DF144D005BCBC1 /* roman.h */; }; + 0A5888661FB44ABE00F7DAA3 /* rtfhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298019DF144D005BCBC1 /* rtfhtml.h */; }; + 0A5888671FB44ABE00F7DAA3 /* sapphire.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298119DF144D005BCBC1 /* sapphire.h */; }; + 0A5888681FB44ABE00F7DAA3 /* scsuutf8.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298219DF144D005BCBC1 /* scsuutf8.h */; }; + 0A5888691FB44ABE00F7DAA3 /* stringmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298419DF144D005BCBC1 /* stringmgr.h */; }; + 0A58886A1FB44ABE00F7DAA3 /* strkey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298519DF144D005BCBC1 /* strkey.h */; }; + 0A58886B1FB44ABE00F7DAA3 /* swbasicfilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298619DF144D005BCBC1 /* swbasicfilter.h */; }; + 0A58886C1FB44ABE00F7DAA3 /* swbuf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298719DF144D005BCBC1 /* swbuf.h */; }; + 0A58886D1FB44ABE00F7DAA3 /* swcacher.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298819DF144D005BCBC1 /* swcacher.h */; }; + 0A58886E1FB44ABE00F7DAA3 /* swcipher.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298919DF144D005BCBC1 /* swcipher.h */; }; + 0A58886F1FB44ABE00F7DAA3 /* swcom.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298A19DF144D005BCBC1 /* swcom.h */; }; + 0A5888701FB44ABE00F7DAA3 /* swcomprs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298B19DF144D005BCBC1 /* swcomprs.h */; }; + 0A5888711FB44ABE00F7DAA3 /* swconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298C19DF144D005BCBC1 /* swconfig.h */; }; + 0A5888721FB44ABE00F7DAA3 /* swdisp.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298D19DF144D005BCBC1 /* swdisp.h */; }; + 0A5888731FB44ABE00F7DAA3 /* swfilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298E19DF144D005BCBC1 /* swfilter.h */; }; + 0A5888741FB44ABE00F7DAA3 /* swfiltermgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298F19DF144D005BCBC1 /* swfiltermgr.h */; }; + 0A5888751FB44ABE00F7DAA3 /* swgenbook.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299019DF144D005BCBC1 /* swgenbook.h */; }; + 0A5888761FB44ABE00F7DAA3 /* swinputmeth.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299119DF144D005BCBC1 /* swinputmeth.h */; }; + 0A5888771FB44ABE00F7DAA3 /* swkey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299219DF144D005BCBC1 /* swkey.h */; }; + 0A5888781FB44ABE00F7DAA3 /* swld.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299319DF144D005BCBC1 /* swld.h */; }; + 0A5888791FB44ABE00F7DAA3 /* swlocale.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299419DF144D005BCBC1 /* swlocale.h */; }; + 0A58887A1FB44ABE00F7DAA3 /* swlog.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299519DF144D005BCBC1 /* swlog.h */; }; + 0A58887B1FB44ABE00F7DAA3 /* swmacs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299619DF144D005BCBC1 /* swmacs.h */; }; + 0A58887C1FB44ABE00F7DAA3 /* swmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299719DF144D005BCBC1 /* swmgr.h */; }; + 0A58887D1FB44ABE00F7DAA3 /* swmodule.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299819DF144D005BCBC1 /* swmodule.h */; }; + 0A58887E1FB44ABE00F7DAA3 /* swobject.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299919DF144D005BCBC1 /* swobject.h */; }; + 0A58887F1FB44ABE00F7DAA3 /* swoptfilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299A19DF144D005BCBC1 /* swoptfilter.h */; }; + 0A5888801FB44ABF00F7DAA3 /* swsearchable.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299C19DF144D005BCBC1 /* swsearchable.h */; }; + 0A5888811FB44ABF00F7DAA3 /* swtext.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299D19DF144D005BCBC1 /* swtext.h */; }; + 0A5888821FB44ABF00F7DAA3 /* swversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299E19DF144D005BCBC1 /* swversion.h */; }; + 0A5888831FB44ABF00F7DAA3 /* sysdata.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A019DF144D005BCBC1 /* sysdata.h */; }; + 0A5888841FB44ABF00F7DAA3 /* teihtmlhref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A119DF144D005BCBC1 /* teihtmlhref.h */; }; + 0A5888851FB44ABF00F7DAA3 /* teilatex.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A219DF144D005BCBC1 /* teilatex.h */; }; + 0A5888861FB44ABF00F7DAA3 /* teiplain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A319DF144D005BCBC1 /* teiplain.h */; }; + 0A5888871FB44ABF00F7DAA3 /* teirtf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A419DF144D005BCBC1 /* teirtf.h */; }; + 0A5888881FB44ABF00F7DAA3 /* teixhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A519DF144D005BCBC1 /* teixhtml.h */; }; + 0A5888891FB44ABF00F7DAA3 /* thmlfootnotes.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A619DF144D005BCBC1 /* thmlfootnotes.h */; }; + 0A58888A1FB44ABF00F7DAA3 /* thmlgbf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A719DF144D005BCBC1 /* thmlgbf.h */; }; + 0A58888B1FB44ABF00F7DAA3 /* thmlheadings.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A819DF144D005BCBC1 /* thmlheadings.h */; }; + 0A58888C1FB44ABF00F7DAA3 /* thmlhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A919DF144D005BCBC1 /* thmlhtml.h */; }; + 0A58888D1FB44ABF00F7DAA3 /* thmlhtmlhref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AA19DF144D005BCBC1 /* thmlhtmlhref.h */; }; + 0A58888E1FB44ABF00F7DAA3 /* thmllatex.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AB19DF144D005BCBC1 /* thmllatex.h */; }; + 0A58888F1FB44ABF00F7DAA3 /* thmllemma.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AC19DF144D005BCBC1 /* thmllemma.h */; }; + 0A5888901FB44ABF00F7DAA3 /* thmlmorph.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AD19DF144D005BCBC1 /* thmlmorph.h */; }; + 0A5888911FB44ABF00F7DAA3 /* thmlosis.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AE19DF144D005BCBC1 /* thmlosis.h */; }; + 0A5888921FB44ABF00F7DAA3 /* thmlplain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AF19DF144D005BCBC1 /* thmlplain.h */; }; + 0A5888931FB44ABF00F7DAA3 /* thmlrtf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B019DF144D005BCBC1 /* thmlrtf.h */; }; + 0A5888941FB44ABF00F7DAA3 /* thmlscripref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B119DF144D005BCBC1 /* thmlscripref.h */; }; + 0A5888951FB44ABF00F7DAA3 /* thmlstrongs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B219DF144D005BCBC1 /* thmlstrongs.h */; }; + 0A5888961FB44ABF00F7DAA3 /* thmlvariants.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B319DF144D005BCBC1 /* thmlvariants.h */; }; + 0A5888971FB44ABF00F7DAA3 /* thmlwebif.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B419DF144D005BCBC1 /* thmlwebif.h */; }; + 0A5888981FB44ABF00F7DAA3 /* thmlwordjs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B519DF144D005BCBC1 /* thmlwordjs.h */; }; + 0A5888991FB44ABF00F7DAA3 /* thmlxhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B619DF144D005BCBC1 /* thmlxhtml.h */; }; + 0A58889A1FB44ABF00F7DAA3 /* treekey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B719DF144D005BCBC1 /* treekey.h */; }; + 0A58889B1FB44ABF00F7DAA3 /* treekeyidx.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B819DF144D005BCBC1 /* treekeyidx.h */; }; + 0A58889C1FB44ABF00F7DAA3 /* unicodertf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B919DF144D005BCBC1 /* unicodertf.h */; }; + 0A58889D1FB44ABF00F7DAA3 /* untgz.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BA19DF144D005BCBC1 /* untgz.h */; }; + 0A58889E1FB44ABF00F7DAA3 /* url.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BB19DF144D005BCBC1 /* url.h */; }; + 0A58889F1FB44ABF00F7DAA3 /* utf16utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BC19DF144D005BCBC1 /* utf16utf8.h */; }; + 0A5888A01FB44ABF00F7DAA3 /* utf8arabicpoints.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BD19DF144D005BCBC1 /* utf8arabicpoints.h */; }; + 0A5888A11FB44ABF00F7DAA3 /* utf8arshaping.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BE19DF144D005BCBC1 /* utf8arshaping.h */; }; + 0A5888A21FB44ABF00F7DAA3 /* utf8bidireorder.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BF19DF144D005BCBC1 /* utf8bidireorder.h */; }; + 0A5888A31FB44ABF00F7DAA3 /* utf8cantillation.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C019DF144D005BCBC1 /* utf8cantillation.h */; }; + 0A5888A41FB44ABF00F7DAA3 /* utf8greekaccents.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C119DF144D005BCBC1 /* utf8greekaccents.h */; }; + 0A5888A51FB44ABF00F7DAA3 /* utf8hebrewpoints.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C219DF144D005BCBC1 /* utf8hebrewpoints.h */; }; + 0A5888A61FB44ABF00F7DAA3 /* utf8html.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C319DF144D005BCBC1 /* utf8html.h */; }; + 0A5888A71FB44ABF00F7DAA3 /* utf8latin1.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C419DF144D005BCBC1 /* utf8latin1.h */; }; + 0A5888A81FB44ABF00F7DAA3 /* utf8nfc.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C519DF144D005BCBC1 /* utf8nfc.h */; }; + 0A5888A91FB44ABF00F7DAA3 /* utf8nfkd.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C619DF144D005BCBC1 /* utf8nfkd.h */; }; + 0A5888AA1FB44ABF00F7DAA3 /* utf8scsu.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C719DF144D005BCBC1 /* utf8scsu.h */; }; + 0A5888AB1FB44ABF00F7DAA3 /* utf8transliterator.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C819DF144D005BCBC1 /* utf8transliterator.h */; }; + 0A5888AC1FB44ABF00F7DAA3 /* utf8utf16.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C919DF144D005BCBC1 /* utf8utf16.h */; }; + 0A5888AD1FB44ABF00F7DAA3 /* utilstr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CA19DF144D005BCBC1 /* utilstr.h */; }; + 0A5888AE1FB44ABF00F7DAA3 /* utilxml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CB19DF144D005BCBC1 /* utilxml.h */; }; + 0A5888AF1FB44ABF00F7DAA3 /* versekey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CC19DF144D005BCBC1 /* versekey.h */; }; + 0A5888B01FB44ABF00F7DAA3 /* versetreekey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CD19DF144D005BCBC1 /* versetreekey.h */; }; + 0A5888B11FB44ABF00F7DAA3 /* versificationmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CE19DF144D005BCBC1 /* versificationmgr.h */; }; + 0A5888B21FB44ABF00F7DAA3 /* xzcomprs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CF19DF144D005BCBC1 /* xzcomprs.h */; }; + 0A5888B31FB44ABF00F7DAA3 /* zcom.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D019DF144D005BCBC1 /* zcom.h */; }; + 0A5888B41FB44ABF00F7DAA3 /* zcom4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D119DF144D005BCBC1 /* zcom4.h */; }; + 0A5888B51FB44ABF00F7DAA3 /* zconf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D219DF144D005BCBC1 /* zconf.h */; }; + 0A5888B61FB44ABF00F7DAA3 /* zipcomprs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D319DF144D005BCBC1 /* zipcomprs.h */; }; + 0A5888B71FB44ABF00F7DAA3 /* zld.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D419DF144D005BCBC1 /* zld.h */; }; + 0A5888B81FB44ABF00F7DAA3 /* zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D519DF144D005BCBC1 /* zlib.h */; }; + 0A5888B91FB44ABF00F7DAA3 /* zstr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D619DF144D005BCBC1 /* zstr.h */; }; + 0A5888BA1FB44ABF00F7DAA3 /* ztext.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D719DF144D005BCBC1 /* ztext.h */; }; + 0A5888BB1FB44ABF00F7DAA3 /* ztext4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D819DF144D005BCBC1 /* ztext4.h */; }; + 0A5888BC1FB44ABF00F7DAA3 /* zverse.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D919DF144D005BCBC1 /* zverse.h */; }; + 0A5888BD1FB44ABF00F7DAA3 /* zverse4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129DA19DF144D005BCBC1 /* zverse4.h */; }; + 0A5888BE1FB44ACC00F7DAA3 /* regex.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295119DF144D005BCBC1 /* regex.h */; }; + 0AA1DD361FB46FD00082E131 /* sword.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AA1DD341FB46FD00082E131 /* sword.m */; }; + 0AA1DD371FB46FD00082E131 /* sword.h in Headers */ = {isa = PBXBuildFile; fileRef = 0AA1DD351FB46FD00082E131 /* sword.h */; }; 8C92C31DC92DF0671FCEB5B3 /* SwordFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92CC111DC521DE0C054C60 /* SwordFilter.mm */; }; 8C92CC7B68FDCDFFFB8B4A31 /* DefaultFilterProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */; }; + 8C92CC9CEC8A341B902C53E2 /* SwordInstallSourceManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C0CA467F3114A1DC89DD /* SwordInstallSourceManagerTest.m */; }; 8C92CE0B19FBB659FB8F8B71 /* FilterProviderFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */; }; 8C92CE39E231FF9CAAB5308B /* SwordUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C291C40A77060C12A21B /* SwordUtil.m */; }; 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; }; A917AF2616B1BE38006367FC /* Tests-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A917AF2516B1BE38006367FC /* Tests-Info.plist */; }; - A91C8B6817523609008702B9 /* versificationmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A91C8B66175233F3008702B9 /* versificationmgr.cpp */; }; A929619C16B1BA240094E5BE /* SwordBibleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */; }; A929619D16B1BA240094E5BE /* SwordKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619716B1BA240094E5BE /* SwordKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; A929619E16B1BA240094E5BE /* SwordKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A929619816B1BA240094E5BE /* SwordKey.mm */; }; @@ -81,358 +606,243 @@ A94EAC30117B28920018B06F /* SwordVerseManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC08117B28920018B06F /* SwordVerseManager.mm */; }; A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC09117B28920018B06F /* VerseEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC32117B28920018B06F /* VerseEnumerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC0A117B28920018B06F /* VerseEnumerator.mm */; }; - A954ABCB13EE9E460094E3FE /* AnalysisHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9E413EE9A2B0094E3FE /* AnalysisHeader.cpp */; }; - A954ABCC13EE9E460094E3FE /* Analyzers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9E613EE9A2B0094E3FE /* Analyzers.cpp */; }; - A954ABCD13EE9E470094E3FE /* StandardAnalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9E913EE9A2B0094E3FE /* StandardAnalyzer.cpp */; }; - A954ABCE13EE9E470094E3FE /* StandardFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9EB13EE9A2B0094E3FE /* StandardFilter.cpp */; }; - A954ABCF13EE9E470094E3FE /* StandardTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9ED13EE9A2B0094E3FE /* StandardTokenizer.cpp */; }; - A954ABD013EE9E470094E3FE /* gunichartables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9F913EE9A2B0094E3FE /* gunichartables.cpp */; }; - A954ABD113EE9E470094E3FE /* repl_lltot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9FE13EE9A2B0094E3FE /* repl_lltot.cpp */; }; - A954ABD213EE9E470094E3FE /* repl_tcscasecmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0013EE9A2B0094E3FE /* repl_tcscasecmp.cpp */; }; - A954ABD313EE9E470094E3FE /* repl_tcslwr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0113EE9A2B0094E3FE /* repl_tcslwr.cpp */; }; - A954ABD413EE9E470094E3FE /* repl_tcstod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0213EE9A2B0094E3FE /* repl_tcstod.cpp */; }; - A954ABD513EE9E470094E3FE /* repl_tcstoll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0313EE9A2B0094E3FE /* repl_tcstoll.cpp */; }; - A954ABD613EE9E470094E3FE /* repl_tprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0413EE9A2B0094E3FE /* repl_tprintf.cpp */; }; - A954ABD713EE9E470094E3FE /* threads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0813EE9A2B0094E3FE /* threads.cpp */; }; - A954ABD813EE9E470094E3FE /* utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0913EE9A2B0094E3FE /* utf8.cpp */; }; - A954ABD913EE9E470094E3FE /* condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0B13EE9A2B0094E3FE /* condition.cpp */; }; - A954ABDA13EE9E470094E3FE /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0D13EE9A2B0094E3FE /* error.cpp */; }; - A954ABDB13EE9E470094E3FE /* memtracking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1113EE9A2B0094E3FE /* memtracking.cpp */; }; - A954ABDC13EE9E470094E3FE /* DateField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1313EE9A2B0094E3FE /* DateField.cpp */; }; - A954ABDD13EE9E470094E3FE /* Document.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1513EE9A2B0094E3FE /* Document.cpp */; }; - A954ABDE13EE9E470094E3FE /* Field.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1713EE9A2B0094E3FE /* Field.cpp */; }; - A954ABDF13EE9E470094E3FE /* CompoundFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1A13EE9A2B0094E3FE /* CompoundFile.cpp */; }; - A954ABE013EE9E470094E3FE /* DocumentWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1C13EE9A2B0094E3FE /* DocumentWriter.cpp */; }; - A954ABE113EE9E470094E3FE /* FieldInfos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1F13EE9A2B0094E3FE /* FieldInfos.cpp */; }; - A954ABE213EE9E470094E3FE /* FieldsReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2113EE9A2B0094E3FE /* FieldsReader.cpp */; }; - A954ABE313EE9E470094E3FE /* FieldsWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2313EE9A2B0094E3FE /* FieldsWriter.cpp */; }; - A954ABE413EE9E470094E3FE /* IndexModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2513EE9A2B0094E3FE /* IndexModifier.cpp */; }; - A954ABE513EE9E470094E3FE /* IndexReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2713EE9A2B0094E3FE /* IndexReader.cpp */; }; - A954ABE613EE9E470094E3FE /* IndexWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2913EE9A2B0094E3FE /* IndexWriter.cpp */; }; - A954ABE713EE9E470094E3FE /* MultiReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2B13EE9A2B0094E3FE /* MultiReader.cpp */; }; - A954ABE813EE9E470094E3FE /* SegmentInfos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2E13EE9A2B0094E3FE /* SegmentInfos.cpp */; }; - A954ABE913EE9E470094E3FE /* SegmentMergeInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3013EE9A2B0094E3FE /* SegmentMergeInfo.cpp */; }; - A954ABEA13EE9E470094E3FE /* SegmentMergeQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3213EE9A2B0094E3FE /* SegmentMergeQueue.cpp */; }; - A954ABEB13EE9E470094E3FE /* SegmentMerger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3413EE9A2B0094E3FE /* SegmentMerger.cpp */; }; - A954ABEC13EE9E470094E3FE /* SegmentReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3613EE9A2B0094E3FE /* SegmentReader.cpp */; }; - A954ABED13EE9E470094E3FE /* SegmentTermDocs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3713EE9A2B0094E3FE /* SegmentTermDocs.cpp */; }; - A954ABEE13EE9E470094E3FE /* SegmentTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3813EE9A2B0094E3FE /* SegmentTermEnum.cpp */; }; - A954ABEF13EE9E470094E3FE /* SegmentTermPositions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3A13EE9A2B0094E3FE /* SegmentTermPositions.cpp */; }; - A954ABF013EE9E470094E3FE /* SegmentTermVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3B13EE9A2B0094E3FE /* SegmentTermVector.cpp */; }; - A954ABF113EE9E470094E3FE /* Term.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3C13EE9A2B0094E3FE /* Term.cpp */; }; - A954ABF213EE9E470094E3FE /* TermInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3E13EE9A2B0094E3FE /* TermInfo.cpp */; }; - A954ABF313EE9E470094E3FE /* TermInfosReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4013EE9A2B0094E3FE /* TermInfosReader.cpp */; }; - A954ABF413EE9E470094E3FE /* TermInfosWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4213EE9A2B0094E3FE /* TermInfosWriter.cpp */; }; - A954ABF513EE9E470094E3FE /* TermVectorReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4613EE9A2B0094E3FE /* TermVectorReader.cpp */; }; - A954ABF613EE9E470094E3FE /* TermVectorWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4713EE9A2B0094E3FE /* TermVectorWriter.cpp */; }; - A954ABF713EE9E470094E3FE /* Lexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4A13EE9A2B0094E3FE /* Lexer.cpp */; }; - A954ABF813EE9E470094E3FE /* MultiFieldQueryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4C13EE9A2B0094E3FE /* MultiFieldQueryParser.cpp */; }; - A954ABF913EE9E470094E3FE /* QueryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4E13EE9A2B0094E3FE /* QueryParser.cpp */; }; - A954ABFA13EE9E470094E3FE /* QueryParserBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5013EE9A2B0094E3FE /* QueryParserBase.cpp */; }; - A954ABFB13EE9E470094E3FE /* QueryToken.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5213EE9A2B0094E3FE /* QueryToken.cpp */; }; - A954ABFC13EE9E470094E3FE /* TokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5413EE9A2B0094E3FE /* TokenList.cpp */; }; - A954ABFD13EE9E470094E3FE /* BooleanQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5813EE9A2B0094E3FE /* BooleanQuery.cpp */; }; - A954ABFE13EE9E470094E3FE /* BooleanScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5A13EE9A2B0094E3FE /* BooleanScorer.cpp */; }; - A954ABFF13EE9E470094E3FE /* CachingWrapperFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5C13EE9A2B0094E3FE /* CachingWrapperFilter.cpp */; }; - A954AC0013EE9E470094E3FE /* ChainedFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5E13EE9A2B0094E3FE /* ChainedFilter.cpp */; }; - A954AC0113EE9E470094E3FE /* ConjunctionScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6113EE9A2B0094E3FE /* ConjunctionScorer.cpp */; }; - A954AC0213EE9E470094E3FE /* DateFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6313EE9A2B0094E3FE /* DateFilter.cpp */; }; - A954AC0313EE9E470094E3FE /* ExactPhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6513EE9A2B0094E3FE /* ExactPhraseScorer.cpp */; }; - A954AC0413EE9E470094E3FE /* Explanation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6713EE9A2B0094E3FE /* Explanation.cpp */; }; - A954AC0513EE9E470094E3FE /* FieldCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6913EE9A2B0094E3FE /* FieldCache.cpp */; }; - A954AC0613EE9E470094E3FE /* FieldCacheImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6B13EE9A2B0094E3FE /* FieldCacheImpl.cpp */; }; - A954AC0713EE9E470094E3FE /* FieldDocSortedHitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6E13EE9A2B0094E3FE /* FieldDocSortedHitQueue.cpp */; }; - A954AC0813EE9E470094E3FE /* FieldSortedHitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7013EE9A2B0094E3FE /* FieldSortedHitQueue.cpp */; }; - A954AC0913EE9E470094E3FE /* FilteredTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7313EE9A2B0094E3FE /* FilteredTermEnum.cpp */; }; - A954AC0A13EE9E470094E3FE /* FuzzyQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7513EE9A2B0094E3FE /* FuzzyQuery.cpp */; }; - A954AC0B13EE9E470094E3FE /* HitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7713EE9A2B0094E3FE /* HitQueue.cpp */; }; - A954AC0C13EE9E470094E3FE /* Hits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7913EE9A2B0094E3FE /* Hits.cpp */; }; - A954AC0D13EE9E470094E3FE /* IndexSearcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7A13EE9A2B0094E3FE /* IndexSearcher.cpp */; }; - A954AC0E13EE9E470094E3FE /* MultiSearcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7C13EE9A2B0094E3FE /* MultiSearcher.cpp */; }; - A954AC0F13EE9E470094E3FE /* MultiTermQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7E13EE9A2B0094E3FE /* MultiTermQuery.cpp */; }; - A954AC1013EE9E470094E3FE /* PhrasePositions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8013EE9A2B0094E3FE /* PhrasePositions.cpp */; }; - A954AC1113EE9E470094E3FE /* PhraseQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8213EE9A2B0094E3FE /* PhraseQuery.cpp */; }; - A954AC1213EE9E470094E3FE /* PhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8513EE9A2B0094E3FE /* PhraseScorer.cpp */; }; - A954AC1313EE9E470094E3FE /* PrefixQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8713EE9A2B0094E3FE /* PrefixQuery.cpp */; }; - A954AC1413EE9E470094E3FE /* QueryFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8913EE9A2B0094E3FE /* QueryFilter.cpp */; }; - A954AC1513EE9E470094E3FE /* RangeFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8B13EE9A2B0094E3FE /* RangeFilter.cpp */; }; - A954AC1613EE9E470094E3FE /* RangeQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8D13EE9A2B0094E3FE /* RangeQuery.cpp */; }; - A954AC1713EE9E470094E3FE /* SearchHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9013EE9A2B0094E3FE /* SearchHeader.cpp */; }; - A954AC1813EE9E470094E3FE /* Similarity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9213EE9A2B0094E3FE /* Similarity.cpp */; }; - A954AC1913EE9E470094E3FE /* SloppyPhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9413EE9A2B0094E3FE /* SloppyPhraseScorer.cpp */; }; - A954AC1A13EE9E470094E3FE /* Sort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9613EE9A2B0094E3FE /* Sort.cpp */; }; - A954AC1B13EE9E470094E3FE /* TermQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9813EE9A2B0094E3FE /* TermQuery.cpp */; }; - A954AC1C13EE9E470094E3FE /* TermScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9A13EE9A2B0094E3FE /* TermScorer.cpp */; }; - A954AC1D13EE9E470094E3FE /* WildcardQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9C13EE9A2B0094E3FE /* WildcardQuery.cpp */; }; - A954AC1E13EE9E470094E3FE /* WildcardTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9E13EE9A2B0094E3FE /* WildcardTermEnum.cpp */; }; - A954AC1F13EE9E470094E3FE /* StdHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA013EE9A2B0094E3FE /* StdHeader.cpp */; }; - A954AC2013EE9E470094E3FE /* FSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA413EE9A2B0094E3FE /* FSDirectory.cpp */; }; - A954AC2113EE9E470094E3FE /* IndexInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA613EE9A2B0094E3FE /* IndexInput.cpp */; }; - A954AC2213EE9E470094E3FE /* IndexOutput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA813EE9A2B0094E3FE /* IndexOutput.cpp */; }; - A954AC2313EE9E470094E3FE /* Lock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAAB13EE9A2B0094E3FE /* Lock.cpp */; }; - A954AC2413EE9E470094E3FE /* MMapInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAAD13EE9A2B0094E3FE /* MMapInput.cpp */; }; - A954AC2513EE9E470094E3FE /* RAMDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAAF13EE9A2B0094E3FE /* RAMDirectory.cpp */; }; - A954AC2613EE9E470094E3FE /* TransactionalRAMDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAB113EE9A2B0094E3FE /* TransactionalRAMDirectory.cpp */; }; - A954AC2713EE9E470094E3FE /* BitSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAB513EE9A2B0094E3FE /* BitSet.cpp */; }; - A954AC2813EE9E470094E3FE /* dirent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAB813EE9A2B0094E3FE /* dirent.cpp */; }; - A954AC2913EE9E470094E3FE /* Equators.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AABA13EE9A2B0094E3FE /* Equators.cpp */; }; - A954AC2A13EE9E470094E3FE /* FastCharStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AABC13EE9A2B0094E3FE /* FastCharStream.cpp */; }; - A954AC2B13EE9E470094E3FE /* fileinputstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AABE13EE9A2B0094E3FE /* fileinputstream.cpp */; }; - A954AC2C13EE9E470094E3FE /* MD5Digester.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAC313EE9A2B0094E3FE /* MD5Digester.cpp */; }; - A954AC2D13EE9E470094E3FE /* Misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAC513EE9A2B0094E3FE /* Misc.cpp */; }; - A954AC2E13EE9E470094E3FE /* Reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAC813EE9A2B0094E3FE /* Reader.cpp */; }; - A954AC2F13EE9E470094E3FE /* StringBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AACB13EE9A2B0094E3FE /* StringBuffer.cpp */; }; - A954AC3013EE9E470094E3FE /* StringIntern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AACD13EE9A2B0094E3FE /* StringIntern.cpp */; }; - A954AC3113EE9E470094E3FE /* ThreadLocal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAD113EE9A2B0094E3FE /* ThreadLocal.cpp */; }; - A954AC3313EE9F620094E3FE /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3213EE9F620094E3FE /* libcurl.dylib */; }; - A954AC3713EE9FA10094E3FE /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3413EE9FA10094E3FE /* libicucore.dylib */; }; - A954AC3813EE9FA10094E3FE /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3513EE9FA10094E3FE /* libstdc++.dylib */; }; - A954AC3913EE9FA10094E3FE /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3613EE9FA10094E3FE /* libz.dylib */; }; - A954AC3A13EEA0C10094E3FE /* swdisp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80113EE98B30094E3FE /* swdisp.cpp */; }; - A954AC3B13EEA0C10094E3FE /* swlog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80213EE98B30094E3FE /* swlog.cpp */; }; - A954AC3C13EEA0C10094E3FE /* listkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80913EE98B30094E3FE /* listkey.cpp */; }; - A954AC3D13EEA0C10094E3FE /* strkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81013EE98B30094E3FE /* strkey.cpp */; }; - A954AC3E13EEA0C10094E3FE /* swkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81113EE98B30094E3FE /* swkey.cpp */; }; - A954AC3F13EEA0C10094E3FE /* treekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81213EE98B30094E3FE /* treekey.cpp */; }; - A954AC4013EEA0C10094E3FE /* treekeyidx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81313EE98B30094E3FE /* treekeyidx.cpp */; }; - A954AC4113EEA0C10094E3FE /* versekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81413EE98B30094E3FE /* versekey.cpp */; }; - A954AC4213EEA0C10094E3FE /* versetreekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81513EE98B30094E3FE /* versetreekey.cpp */; }; - A954AC4313EEA0C10094E3FE /* curlftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81813EE98B30094E3FE /* curlftpt.cpp */; }; - A954AC4413EEA0C10094E3FE /* curlhttpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81913EE98B30094E3FE /* curlhttpt.cpp */; }; - A954AC4513EEA0C10094E3FE /* encfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81A13EE98B30094E3FE /* encfiltmgr.cpp */; }; - A954AC4613EEA0C10094E3FE /* filemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81B13EE98B30094E3FE /* filemgr.cpp */; }; - A954AC4713EEA0C10094E3FE /* ftplibftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81C13EE98B30094E3FE /* ftplibftpt.cpp */; }; - A954AC4913EEA0C10094E3FE /* installmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81E13EE98B30094E3FE /* installmgr.cpp */; }; - A954AC4A13EEA0C10094E3FE /* localemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81F13EE98B30094E3FE /* localemgr.cpp */; }; - A954AC4B13EEA0C10094E3FE /* markupfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82213EE98B30094E3FE /* markupfiltmgr.cpp */; }; - A954AC4C13EEA0C10094E3FE /* stringmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82313EE98B30094E3FE /* stringmgr.cpp */; }; - A954AC4D13EEA0C10094E3FE /* swcacher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82413EE98B30094E3FE /* swcacher.cpp */; }; - A954AC4E13EEA0C10094E3FE /* swconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82513EE98B30094E3FE /* swconfig.cpp */; }; - A954AC4F13EEA0C10094E3FE /* swfiltermgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82613EE98B30094E3FE /* swfiltermgr.cpp */; }; - A954AC5013EEA0C10094E3FE /* swlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82713EE98B30094E3FE /* swlocale.cpp */; }; - A954AC5113EEA0C10094E3FE /* swmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82813EE98B30094E3FE /* swmgr.cpp */; }; - A954AC5213EEA0C10094E3FE /* swsearchable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82913EE98B30094E3FE /* swsearchable.cpp */; }; - A954AC5413EEA0C10094E3FE /* hrefcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82E13EE98B30094E3FE /* hrefcom.cpp */; }; - A954AC5513EEA0C10094E3FE /* rawcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83613EE98B30094E3FE /* rawcom.cpp */; }; - A954AC5613EEA0C10094E3FE /* rawcom4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83913EE98B30094E3FE /* rawcom4.cpp */; }; - A954AC5713EEA0C10094E3FE /* rawfiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83D13EE98B30094E3FE /* rawfiles.cpp */; }; - A954AC5813EEA0C10094E3FE /* swcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83E13EE98B30094E3FE /* swcom.cpp */; }; - A954AC5913EEA0C10094E3FE /* zcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84213EE98B30094E3FE /* zcom.cpp */; }; - A954AC5A13EEA0C10094E3FE /* entriesblk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84513EE98B30094E3FE /* entriesblk.cpp */; }; - A954AC5B13EEA0C10094E3FE /* lzsscomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84613EE98B30094E3FE /* lzsscomprs.cpp */; }; - A954AC5C13EEA0C10094E3FE /* rawstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84913EE98B30094E3FE /* rawstr.cpp */; }; - A954AC5D13EEA0C10094E3FE /* rawstr4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84A13EE98B30094E3FE /* rawstr4.cpp */; }; - A954AC5E13EEA0C10094E3FE /* rawverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84B13EE98B30094E3FE /* rawverse.cpp */; }; - A954AC5F13EEA0C10094E3FE /* rawverse4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84C13EE98B30094E3FE /* rawverse4.cpp */; }; - A954AC6013EEA0C10094E3FE /* sapphire.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84D13EE98B30094E3FE /* sapphire.cpp */; }; - A954AC6113EEA0C10094E3FE /* swcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84E13EE98B30094E3FE /* swcipher.cpp */; }; - A954AC6213EEA0C10094E3FE /* swcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84F13EE98B30094E3FE /* swcomprs.cpp */; }; - A954AC6313EEA0C10094E3FE /* zipcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85113EE98B30094E3FE /* zipcomprs.cpp */; }; - A954AC6413EEA0C10094E3FE /* zstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85213EE98B30094E3FE /* zstr.cpp */; }; - A954AC6513EEA0C10094E3FE /* zverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85313EE98B30094E3FE /* zverse.cpp */; }; - A954AC6613EEA0C10094E3FE /* cipherfil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85513EE98B30094E3FE /* cipherfil.cpp */; }; - A954AC6713EEA0C10094E3FE /* gbffootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85613EE98B30094E3FE /* gbffootnotes.cpp */; }; - A954AC6813EEA0C10094E3FE /* gbfheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85713EE98B30094E3FE /* gbfheadings.cpp */; }; - A954AC6913EEA0C10094E3FE /* gbfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85813EE98B30094E3FE /* gbfhtml.cpp */; }; - A954AC6A13EEA0C10094E3FE /* gbfhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85913EE98B30094E3FE /* gbfhtmlhref.cpp */; }; - A954AC6B13EEA0C10094E3FE /* gbfmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85A13EE98B30094E3FE /* gbfmorph.cpp */; }; - A954AC6C13EEA0C10094E3FE /* gbfosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85B13EE98B30094E3FE /* gbfosis.cpp */; }; - A954AC6D13EEA0C10094E3FE /* gbfplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85C13EE98B30094E3FE /* gbfplain.cpp */; }; - A954AC6E13EEA0C10094E3FE /* gbfredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85D13EE98B30094E3FE /* gbfredletterwords.cpp */; }; - A954AC6F13EEA0C10094E3FE /* gbfrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85E13EE98B30094E3FE /* gbfrtf.cpp */; }; - A954AC7013EEA0C10094E3FE /* gbfstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85F13EE98B30094E3FE /* gbfstrongs.cpp */; }; - A954AC7113EEA0C10094E3FE /* gbfthml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86013EE98B30094E3FE /* gbfthml.cpp */; }; - A954AC7213EEA0C10094E3FE /* gbfwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86113EE98B30094E3FE /* gbfwebif.cpp */; }; - A954AC7313EEA0C10094E3FE /* gbfwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86213EE98B30094E3FE /* gbfwordjs.cpp */; }; - A954AC7413EEA0C10094E3FE /* gbfxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86313EE98B30094E3FE /* gbfxhtml.cpp */; }; - A954AC7513EEA0C10094E3FE /* greeklexattribs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86413EE98B30094E3FE /* greeklexattribs.cpp */; }; - A954AC7613EEA0C10094E3FE /* latin1utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86513EE98B30094E3FE /* latin1utf16.cpp */; }; - A954AC7713EEA0C10094E3FE /* latin1utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86613EE98B30094E3FE /* latin1utf8.cpp */; }; - A954AC7813EEA0C10094E3FE /* osisfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86913EE98B30094E3FE /* osisfootnotes.cpp */; }; - A954AC7913EEA0C10094E3FE /* osisheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86A13EE98B30094E3FE /* osisheadings.cpp */; }; - A954AC7A13EEA0C10094E3FE /* osishtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86B13EE98B30094E3FE /* osishtmlhref.cpp */; }; - A954AC7B13EEA0C10094E3FE /* osislemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86C13EE98B30094E3FE /* osislemma.cpp */; }; - A954AC7C13EEA0C10094E3FE /* osismorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86D13EE98B30094E3FE /* osismorph.cpp */; }; - A954AC7D13EEA0C10094E3FE /* osismorphsegmentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86E13EE98B30094E3FE /* osismorphsegmentation.cpp */; }; - A954AC7E13EEA0C10094E3FE /* osisosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86F13EE98B30094E3FE /* osisosis.cpp */; }; - A954AC7F13EEA0C10094E3FE /* osisplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87013EE98B30094E3FE /* osisplain.cpp */; }; - A954AC8013EEA0C10094E3FE /* osisredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87113EE98B30094E3FE /* osisredletterwords.cpp */; }; - A954AC8113EEA0C10094E3FE /* osisrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87213EE98B30094E3FE /* osisrtf.cpp */; }; - A954AC8313EEA0C10094E3FE /* osisscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87413EE98B30094E3FE /* osisscripref.cpp */; }; - A954AC8413EEA0C10094E3FE /* osisstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87513EE98B30094E3FE /* osisstrongs.cpp */; }; - A954AC8513EEA0C10094E3FE /* osisvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87613EE98B30094E3FE /* osisvariants.cpp */; }; - A954AC8613EEA0C10094E3FE /* osiswebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87713EE98B30094E3FE /* osiswebif.cpp */; }; - A954AC8713EEA0C10094E3FE /* osiswordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87813EE98B30094E3FE /* osiswordjs.cpp */; }; - A954AC8813EEA0C10094E3FE /* osisxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87913EE98B30094E3FE /* osisxhtml.cpp */; }; - A954AC8913EEA0C10094E3FE /* papyriplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87A13EE98B30094E3FE /* papyriplain.cpp */; }; - A954AC8C13EEA0C10094E3FE /* rtfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87D13EE98B30094E3FE /* rtfhtml.cpp */; }; - A954AC8D13EEA0C10094E3FE /* swbasicfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87E13EE98B30094E3FE /* swbasicfilter.cpp */; }; - A954AC8E13EEA0C10094E3FE /* swoptfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87F13EE98B30094E3FE /* swoptfilter.cpp */; }; - A954AC8F13EEA0C10094E3FE /* teihtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88013EE98B30094E3FE /* teihtmlhref.cpp */; }; - A954AC9013EEA0C10094E3FE /* teiplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88113EE98B30094E3FE /* teiplain.cpp */; }; - A954AC9113EEA0C10094E3FE /* teirtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88213EE98B30094E3FE /* teirtf.cpp */; }; - A954AC9213EEA0C10094E3FE /* thmlfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88313EE98B30094E3FE /* thmlfootnotes.cpp */; }; - A954AC9313EEA0C10094E3FE /* thmlgbf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88413EE98B30094E3FE /* thmlgbf.cpp */; }; - A954AC9413EEA0C10094E3FE /* thmlheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88513EE98B30094E3FE /* thmlheadings.cpp */; }; - A954AC9513EEA0C10094E3FE /* thmlhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88613EE98B30094E3FE /* thmlhtml.cpp */; }; - A954AC9613EEA0C10094E3FE /* thmlhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88713EE98B30094E3FE /* thmlhtmlhref.cpp */; }; - A954AC9713EEA0C10094E3FE /* thmllemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88813EE98B30094E3FE /* thmllemma.cpp */; }; - A954AC9813EEA0C10094E3FE /* thmlmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88913EE98B30094E3FE /* thmlmorph.cpp */; }; - A954AC9913EEA0C10094E3FE /* thmlosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88A13EE98B30094E3FE /* thmlosis.cpp */; }; - A954AC9A13EEA0C10094E3FE /* thmlplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88B13EE98B30094E3FE /* thmlplain.cpp */; }; - A954AC9B13EEA0C10094E3FE /* thmlrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88C13EE98B30094E3FE /* thmlrtf.cpp */; }; - A954AC9C13EEA0C10094E3FE /* thmlscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88D13EE98B30094E3FE /* thmlscripref.cpp */; }; - A954AC9D13EEA0C10094E3FE /* thmlstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88E13EE98B30094E3FE /* thmlstrongs.cpp */; }; - A954AC9E13EEA0C10094E3FE /* thmlvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88F13EE98B30094E3FE /* thmlvariants.cpp */; }; - A954AC9F13EEA0C10094E3FE /* thmlwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89013EE98B30094E3FE /* thmlwebif.cpp */; }; - A954ACA013EEA0C10094E3FE /* thmlwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89113EE98B30094E3FE /* thmlwordjs.cpp */; }; - A954ACA113EEA0C10094E3FE /* thmlxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89213EE98B30094E3FE /* thmlxhtml.cpp */; }; - A954ACA213EEA0C10094E3FE /* unicodertf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89313EE98B30094E3FE /* unicodertf.cpp */; }; - A954ACA313EEA0C10094E3FE /* utf16utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89413EE98B30094E3FE /* utf16utf8.cpp */; }; - A954ACA413EEA0C10094E3FE /* utf8arabicpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89513EE98B30094E3FE /* utf8arabicpoints.cpp */; }; - A954ACA513EEA0C10094E3FE /* utf8arshaping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89613EE98B30094E3FE /* utf8arshaping.cpp */; }; - A954ACA613EEA0C10094E3FE /* utf8bidireorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89713EE98B30094E3FE /* utf8bidireorder.cpp */; }; - A954ACA713EEA0C10094E3FE /* utf8cantillation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89813EE98B30094E3FE /* utf8cantillation.cpp */; }; - A954ACA813EEA0C10094E3FE /* utf8greekaccents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89913EE98B30094E3FE /* utf8greekaccents.cpp */; }; - A954ACA913EEA0C10094E3FE /* utf8hebrewpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89A13EE98B30094E3FE /* utf8hebrewpoints.cpp */; }; - A954ACAA13EEA0C10094E3FE /* utf8html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89B13EE98B30094E3FE /* utf8html.cpp */; }; - A954ACAB13EEA0C10094E3FE /* utf8latin1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89C13EE98B30094E3FE /* utf8latin1.cpp */; }; - A954ACAC13EEA0C10094E3FE /* utf8nfc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89D13EE98B30094E3FE /* utf8nfc.cpp */; }; - A954ACAD13EEA0C10094E3FE /* utf8nfkd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89E13EE98B30094E3FE /* utf8nfkd.cpp */; }; - A954ACAE13EEA0C10094E3FE /* utf8transliterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89F13EE98B30094E3FE /* utf8transliterator.cpp */; }; - A954ACAF13EEA0C10094E3FE /* utf8utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A013EE98B30094E3FE /* utf8utf16.cpp */; }; - A954ACB013EEA0C10094E3FE /* rawgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A713EE98B30094E3FE /* rawgenbook.cpp */; }; - A954ACB113EEA0C10094E3FE /* swgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A813EE98B30094E3FE /* swgenbook.cpp */; }; - A954ACB213EEA0C10094E3FE /* rawld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8AF13EE98B30094E3FE /* rawld.cpp */; }; - A954ACB313EEA0C10094E3FE /* rawld4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B313EE98B30094E3FE /* rawld4.cpp */; }; - A954ACB413EEA0C10094E3FE /* swld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B413EE98B30094E3FE /* swld.cpp */; }; - A954ACB513EEA0C10094E3FE /* zld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B813EE98B30094E3FE /* zld.cpp */; }; - A954ACB613EEA0C10094E3FE /* swmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8BC13EE98B30094E3FE /* swmodule.cpp */; }; - A954ACB713EEA0C10094E3FE /* rawtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8C613EE98B30094E3FE /* rawtext.cpp */; }; - A954ACB813EEA0C10094E3FE /* rawtext4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8C913EE98B30094E3FE /* rawtext4.cpp */; }; - A954ACB913EEA0C10094E3FE /* swtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8CA13EE98B30094E3FE /* swtext.cpp */; }; - A954ACBA13EEA0C10094E3FE /* ztext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8CE13EE98B30094E3FE /* ztext.cpp */; }; - A954ACBB13EEA0C10094E3FE /* roman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D513EE98B30094E3FE /* roman.cpp */; }; - A954ACBC13EEA0C10094E3FE /* swbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D613EE98B30094E3FE /* swbuf.cpp */; }; - A954ACBD13EEA0C10094E3FE /* swobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D713EE98B30094E3FE /* swobject.cpp */; }; - A954ACBF13EEA0C10094E3FE /* swversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D913EE98B30094E3FE /* swversion.cpp */; }; - A954ACC013EEA0C10094E3FE /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DA13EE98B30094E3FE /* url.cpp */; }; - A954ACC113EEA0C10094E3FE /* utilstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DB13EE98B30094E3FE /* utilstr.cpp */; }; - A954ACC213EEA0C10094E3FE /* utilxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DC13EE98B30094E3FE /* utilxml.cpp */; }; - A954ACCA13EEA5340094E3FE /* ftplib.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D013EE98B30094E3FE /* ftplib.c */; }; - A954ACCB13EEA5340094E3FE /* ftpparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D113EE98B30094E3FE /* ftpparse.c */; }; - A954ACCD13EEA5340094E3FE /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E113EE98B30094E3FE /* adler32.c */; }; - A954ACCE13EEA5340094E3FE /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E213EE98B30094E3FE /* compress.c */; }; - A954ACCF13EEA5340094E3FE /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E313EE98B30094E3FE /* crc32.c */; }; - A954ACD013EEA5340094E3FE /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E413EE98B30094E3FE /* deflate.c */; }; - A954ACD413EEA5340094E3FE /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8EB13EE98B30094E3FE /* inffast.c */; }; - A954ACD513EEA5340094E3FE /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8EE13EE98B30094E3FE /* inflate.c */; }; - A954ACD613EEA5340094E3FE /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8EF13EE98B30094E3FE /* inftrees.c */; }; - A954ACD913EEA5340094E3FE /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F413EE98B30094E3FE /* trees.c */; }; - A954ACDA13EEA5340094E3FE /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F613EE98B30094E3FE /* uncompr.c */; }; - A954ACDB13EEA5340094E3FE /* untgz.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F713EE98B30094E3FE /* untgz.c */; }; - A954ACDC13EEA5340094E3FE /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F813EE98B30094E3FE /* zutil.c */; }; - A954ACDD13EEA6780094E3FE /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; - A967FB5616806B16004ED73C /* teixhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */; }; - A96C2359176AFA3C008D714B /* remotetrans.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2351176AF188008D714B /* remotetrans.cpp */; }; - A96C235A176AFA3C008D714B /* osisenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2353176AF19C008D714B /* osisenum.cpp */; }; - A96C235B176AFA3C008D714B /* osisglosses.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2354176AF19C008D714B /* osisglosses.cpp */; }; - A96C235C176AFA3C008D714B /* osisxlit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2355176AF19C008D714B /* osisxlit.cpp */; }; - A96C235C176AFA3C008D714B /* osisreferencelinks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2355176AF19C008D714B /* osisreferencelinks.cpp */; }; - A96C235D176AFA3C008D714B /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C233E176AF139008D714B /* gzclose.c */; }; - A96C235E176AFA3C008D714B /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2340176AF139008D714B /* gzlib.c */; }; - A96C235F176AFA3C008D714B /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2341176AF139008D714B /* gzread.c */; }; - A96C2360176AFA3C008D714B /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2342176AF139008D714B /* gzwrite.c */; }; - A96C2361176AFA3C008D714B /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2343176AF139008D714B /* infback.c */; }; + A968BE4D19DFF832002C9B78 /* SwordBibleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A968BE4C19DFF832002C9B78 /* SwordBibleTest.swift */; }; + A969DC7B1DA1289100C8E976 /* SwordLocaleManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A969DC7A1DA1289100C8E976 /* SwordLocaleManagerTest.swift */; }; A975EAC511C77862007C1532 /* ObjCSword.h in Headers */ = {isa = PBXBuildFile; fileRef = A975EAC411C77862007C1532 /* ObjCSword.h */; settings = {ATTRIBUTES = (Public, ); }; }; A975EEE511C79308007C1532 /* mod2osis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAC11C7925C007C1532 /* mod2osis.cpp */; }; - A999FF3F17951CCE00E65919 /* bz2comprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A999FF3917951C8900E65919 /* bz2comprs.cpp */; }; - A999FF4017951CCE00E65919 /* xzcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A999FF3A17951C8900E65919 /* xzcomprs.cpp */; }; - A999FF4117951CCE00E65919 /* scsuutf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A999FF3D17951CA000E65919 /* scsuutf8.cpp */; }; + A995E6241C876E8900843E13 /* TestModules in Resources */ = {isa = PBXBuildFile; fileRef = A995E6231C876E8900843E13 /* TestModules */; }; + A995E6271C877DD000843E13 /* SwordManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A995E6261C877DD000843E13 /* SwordManagerTest.m */; }; + A9A127A519DE93A0005BCBC1 /* SwordUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C92C7B2EB245D47FEB5E3B0 /* SwordUtil.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A9A127A619DE93A0005BCBC1 /* FilterProviderFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C92C72ADACB017A434CD268 /* FilterProviderFactory.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A9A127A719DE93A0005BCBC1 /* DefaultFilterProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C92C980D4DE32C7AB93159D /* DefaultFilterProvider.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A9A127A819DE93A0005BCBC1 /* SwordFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C92C02A5C86E1C75ED1CEF4 /* SwordFilter.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A9A129DB19DF144D005BCBC1 /* bz2comprs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1291C19DF144D005BCBC1 /* bz2comprs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129DC19DF144D005BCBC1 /* canon.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1291D19DF144D005BCBC1 /* canon.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129DD19DF144D005BCBC1 /* canon_abbrevs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1291E19DF144D005BCBC1 /* canon_abbrevs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129DE19DF144D005BCBC1 /* canon_catholic.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1291F19DF144D005BCBC1 /* canon_catholic.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129DF19DF144D005BCBC1 /* canon_catholic2.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292019DF144D005BCBC1 /* canon_catholic2.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129E019DF144D005BCBC1 /* canon_german.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292119DF144D005BCBC1 /* canon_german.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129E119DF144D005BCBC1 /* canon_kjva.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292219DF144D005BCBC1 /* canon_kjva.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129E219DF144D005BCBC1 /* canon_leningrad.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292319DF144D005BCBC1 /* canon_leningrad.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129E319DF144D005BCBC1 /* canon_luther.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292419DF144D005BCBC1 /* canon_luther.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129E419DF144D005BCBC1 /* canon_lxx.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292519DF144D005BCBC1 /* canon_lxx.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129E519DF144D005BCBC1 /* canon_mt.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292619DF144D005BCBC1 /* canon_mt.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129E619DF144D005BCBC1 /* canon_nrsv.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292719DF144D005BCBC1 /* canon_nrsv.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129E719DF144D005BCBC1 /* canon_nrsva.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292819DF144D005BCBC1 /* canon_nrsva.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129E819DF144D005BCBC1 /* canon_null.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292919DF144D005BCBC1 /* canon_null.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129E919DF144D005BCBC1 /* canon_orthodox.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292A19DF144D005BCBC1 /* canon_orthodox.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129EA19DF144D005BCBC1 /* canon_synodal.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292B19DF144D005BCBC1 /* canon_synodal.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129EB19DF144D005BCBC1 /* canon_synodalprot.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292C19DF144D005BCBC1 /* canon_synodalprot.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129EC19DF144D005BCBC1 /* canon_vulg.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292D19DF144D005BCBC1 /* canon_vulg.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129ED19DF144D005BCBC1 /* cipherfil.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1292E19DF144D005BCBC1 /* cipherfil.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129EF19DF144D005BCBC1 /* curlftpt.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293019DF144D005BCBC1 /* curlftpt.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129F019DF144D005BCBC1 /* curlhttpt.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293119DF144D005BCBC1 /* curlhttpt.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129F119DF144D005BCBC1 /* defs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293219DF144D005BCBC1 /* defs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129F219DF144D005BCBC1 /* echomod.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293319DF144D005BCBC1 /* echomod.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129F319DF144D005BCBC1 /* encfiltmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293419DF144D005BCBC1 /* encfiltmgr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129F419DF144D005BCBC1 /* entriesblk.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293519DF144D005BCBC1 /* entriesblk.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129F519DF144E005BCBC1 /* femain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293619DF144D005BCBC1 /* femain.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129F619DF144E005BCBC1 /* filemgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293719DF144D005BCBC1 /* filemgr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129F719DF144E005BCBC1 /* flatapi.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293819DF144D005BCBC1 /* flatapi.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129F819DF144E005BCBC1 /* ftplib.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293919DF144D005BCBC1 /* ftplib.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129F919DF144E005BCBC1 /* ftplibftpt.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293A19DF144D005BCBC1 /* ftplibftpt.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129FA19DF144E005BCBC1 /* ftpparse.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293B19DF144D005BCBC1 /* ftpparse.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129FB19DF144E005BCBC1 /* gbffootnotes.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293C19DF144D005BCBC1 /* gbffootnotes.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129FC19DF144E005BCBC1 /* gbfheadings.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293D19DF144D005BCBC1 /* gbfheadings.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129FD19DF144E005BCBC1 /* gbfhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293E19DF144D005BCBC1 /* gbfhtml.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129FE19DF144E005BCBC1 /* gbfhtmlhref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1293F19DF144D005BCBC1 /* gbfhtmlhref.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A129FF19DF144E005BCBC1 /* gbflatex.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294019DF144D005BCBC1 /* gbflatex.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0019DF144E005BCBC1 /* gbfmorph.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294119DF144D005BCBC1 /* gbfmorph.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0119DF144E005BCBC1 /* gbfosis.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294219DF144D005BCBC1 /* gbfosis.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0219DF144E005BCBC1 /* gbfplain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294319DF144D005BCBC1 /* gbfplain.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0319DF144E005BCBC1 /* gbfredletterwords.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294419DF144D005BCBC1 /* gbfredletterwords.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0419DF144E005BCBC1 /* gbfrtf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294519DF144D005BCBC1 /* gbfrtf.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0519DF144E005BCBC1 /* gbfstrongs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294619DF144D005BCBC1 /* gbfstrongs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0619DF144E005BCBC1 /* gbfthml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294719DF144D005BCBC1 /* gbfthml.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0719DF144E005BCBC1 /* gbfwebif.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294819DF144D005BCBC1 /* gbfwebif.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0819DF144E005BCBC1 /* gbfwordjs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294919DF144D005BCBC1 /* gbfwordjs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0919DF144E005BCBC1 /* gbfxhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294A19DF144D005BCBC1 /* gbfxhtml.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0A19DF144E005BCBC1 /* greeklexattribs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294B19DF144D005BCBC1 /* greeklexattribs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0B19DF144E005BCBC1 /* hebrewmcim.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294C19DF144D005BCBC1 /* hebrewmcim.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0C19DF144F005BCBC1 /* hrefcom.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294D19DF144D005BCBC1 /* hrefcom.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0D19DF144F005BCBC1 /* installmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1294E19DF144D005BCBC1 /* installmgr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0E19DF144F005BCBC1 /* regex.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295119DF144D005BCBC1 /* regex.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A0F19DF144F005BCBC1 /* latin1utf16.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295219DF144D005BCBC1 /* latin1utf16.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1019DF144F005BCBC1 /* latin1utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295319DF144D005BCBC1 /* latin1utf8.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1119DF144F005BCBC1 /* listkey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295419DF144D005BCBC1 /* listkey.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1219DF144F005BCBC1 /* localemgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295519DF144D005BCBC1 /* localemgr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1319DF144F005BCBC1 /* lzsscomprs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295619DF144D005BCBC1 /* lzsscomprs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1619DF144F005BCBC1 /* markupfiltmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295919DF144D005BCBC1 /* markupfiltmgr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1719DF144F005BCBC1 /* multimapwdef.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295A19DF144D005BCBC1 /* multimapwdef.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1819DF144F005BCBC1 /* nullim.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295B19DF144D005BCBC1 /* nullim.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1919DF144F005BCBC1 /* osisenum.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295C19DF144D005BCBC1 /* osisenum.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1A19DF144F005BCBC1 /* osisfootnotes.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295D19DF144D005BCBC1 /* osisfootnotes.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1B19DF144F005BCBC1 /* osisglosses.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295E19DF144D005BCBC1 /* osisglosses.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1C19DF144F005BCBC1 /* osisheadings.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1295F19DF144D005BCBC1 /* osisheadings.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1D19DF1450005BCBC1 /* osishtmlhref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296019DF144D005BCBC1 /* osishtmlhref.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1E19DF1450005BCBC1 /* osislatex.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296119DF144D005BCBC1 /* osislatex.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A1F19DF1450005BCBC1 /* osislemma.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296219DF144D005BCBC1 /* osislemma.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2019DF1450005BCBC1 /* osismorph.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296319DF144D005BCBC1 /* osismorph.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2119DF1450005BCBC1 /* osismorphsegmentation.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296419DF144D005BCBC1 /* osismorphsegmentation.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2219DF1450005BCBC1 /* osisosis.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296519DF144D005BCBC1 /* osisosis.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2319DF1450005BCBC1 /* osisplain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296619DF144D005BCBC1 /* osisplain.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2419DF1450005BCBC1 /* osisredletterwords.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296719DF144D005BCBC1 /* osisredletterwords.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2519DF1450005BCBC1 /* osisreferencelinks.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296819DF144D005BCBC1 /* osisreferencelinks.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2619DF1450005BCBC1 /* osisrtf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296919DF144D005BCBC1 /* osisrtf.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2719DF1450005BCBC1 /* osisscripref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296A19DF144D005BCBC1 /* osisscripref.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2819DF1450005BCBC1 /* osisstrongs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296B19DF144D005BCBC1 /* osisstrongs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2919DF1450005BCBC1 /* osisvariants.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296C19DF144D005BCBC1 /* osisvariants.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2A19DF1451005BCBC1 /* osiswebif.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296D19DF144D005BCBC1 /* osiswebif.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2B19DF1451005BCBC1 /* osiswordjs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296E19DF144D005BCBC1 /* osiswordjs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2C19DF1451005BCBC1 /* osisxhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1296F19DF144D005BCBC1 /* osisxhtml.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2D19DF1451005BCBC1 /* osisxlit.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297019DF144D005BCBC1 /* osisxlit.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2E19DF1451005BCBC1 /* papyriplain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297119DF144D005BCBC1 /* papyriplain.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A2F19DF1451005BCBC1 /* rawcom.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297219DF144D005BCBC1 /* rawcom.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3019DF1451005BCBC1 /* rawcom4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297319DF144D005BCBC1 /* rawcom4.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3119DF1451005BCBC1 /* rawfiles.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297419DF144D005BCBC1 /* rawfiles.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3219DF1451005BCBC1 /* rawgenbook.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297519DF144D005BCBC1 /* rawgenbook.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3319DF1451005BCBC1 /* rawld.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297619DF144D005BCBC1 /* rawld.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3419DF1451005BCBC1 /* rawld4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297719DF144D005BCBC1 /* rawld4.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3519DF1452005BCBC1 /* rawstr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297819DF144D005BCBC1 /* rawstr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3619DF1452005BCBC1 /* rawstr4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297919DF144D005BCBC1 /* rawstr4.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3719DF1452005BCBC1 /* rawtext.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297A19DF144D005BCBC1 /* rawtext.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3819DF1452005BCBC1 /* rawtext4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297B19DF144D005BCBC1 /* rawtext4.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3919DF1452005BCBC1 /* rawverse.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297C19DF144D005BCBC1 /* rawverse.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3A19DF1452005BCBC1 /* rawverse4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297D19DF144D005BCBC1 /* rawverse4.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3B19DF1452005BCBC1 /* remotetrans.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297E19DF144D005BCBC1 /* remotetrans.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3C19DF1452005BCBC1 /* roman.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1297F19DF144D005BCBC1 /* roman.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3D19DF1452005BCBC1 /* rtfhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298019DF144D005BCBC1 /* rtfhtml.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3E19DF1452005BCBC1 /* sapphire.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298119DF144D005BCBC1 /* sapphire.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A3F19DF1453005BCBC1 /* scsuutf8.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298219DF144D005BCBC1 /* scsuutf8.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4119DF1453005BCBC1 /* stringmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298419DF144D005BCBC1 /* stringmgr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4219DF1453005BCBC1 /* strkey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298519DF144D005BCBC1 /* strkey.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4319DF1453005BCBC1 /* swbasicfilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298619DF144D005BCBC1 /* swbasicfilter.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4419DF1453005BCBC1 /* swbuf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298719DF144D005BCBC1 /* swbuf.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4519DF1453005BCBC1 /* swcacher.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298819DF144D005BCBC1 /* swcacher.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4619DF1453005BCBC1 /* swcipher.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298919DF144D005BCBC1 /* swcipher.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4719DF1453005BCBC1 /* swcom.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298A19DF144D005BCBC1 /* swcom.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4819DF1454005BCBC1 /* swcomprs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298B19DF144D005BCBC1 /* swcomprs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4919DF1454005BCBC1 /* swconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298C19DF144D005BCBC1 /* swconfig.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4A19DF1454005BCBC1 /* swdisp.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298D19DF144D005BCBC1 /* swdisp.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4B19DF1454005BCBC1 /* swfilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298E19DF144D005BCBC1 /* swfilter.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4C19DF1454005BCBC1 /* swfiltermgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1298F19DF144D005BCBC1 /* swfiltermgr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4D19DF1454005BCBC1 /* swgenbook.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299019DF144D005BCBC1 /* swgenbook.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4E19DF1454005BCBC1 /* swinputmeth.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299119DF144D005BCBC1 /* swinputmeth.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A4F19DF1454005BCBC1 /* swkey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299219DF144D005BCBC1 /* swkey.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5019DF1455005BCBC1 /* swld.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299319DF144D005BCBC1 /* swld.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5119DF1455005BCBC1 /* swlocale.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299419DF144D005BCBC1 /* swlocale.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5219DF1455005BCBC1 /* swlog.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299519DF144D005BCBC1 /* swlog.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5319DF1455005BCBC1 /* swmacs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299619DF144D005BCBC1 /* swmacs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5419DF1455005BCBC1 /* swmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299719DF144D005BCBC1 /* swmgr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5519DF1455005BCBC1 /* swmodule.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299819DF144D005BCBC1 /* swmodule.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5619DF1455005BCBC1 /* swobject.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299919DF144D005BCBC1 /* swobject.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5719DF1455005BCBC1 /* swoptfilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299A19DF144D005BCBC1 /* swoptfilter.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5919DF1456005BCBC1 /* swsearchable.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299C19DF144D005BCBC1 /* swsearchable.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5A19DF1456005BCBC1 /* swtext.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299D19DF144D005BCBC1 /* swtext.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5B19DF1456005BCBC1 /* swversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A1299E19DF144D005BCBC1 /* swversion.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5D19DF1456005BCBC1 /* sysdata.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A019DF144D005BCBC1 /* sysdata.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5E19DF1456005BCBC1 /* teihtmlhref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A119DF144D005BCBC1 /* teihtmlhref.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A5F19DF1456005BCBC1 /* teilatex.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A219DF144D005BCBC1 /* teilatex.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6019DF1457005BCBC1 /* teiplain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A319DF144D005BCBC1 /* teiplain.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6119DF1457005BCBC1 /* teirtf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A419DF144D005BCBC1 /* teirtf.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6219DF1457005BCBC1 /* teixhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A519DF144D005BCBC1 /* teixhtml.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6319DF1457005BCBC1 /* thmlfootnotes.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A619DF144D005BCBC1 /* thmlfootnotes.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6419DF1457005BCBC1 /* thmlgbf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A719DF144D005BCBC1 /* thmlgbf.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6519DF1457005BCBC1 /* thmlheadings.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A819DF144D005BCBC1 /* thmlheadings.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6619DF1457005BCBC1 /* thmlhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129A919DF144D005BCBC1 /* thmlhtml.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6719DF1458005BCBC1 /* thmlhtmlhref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AA19DF144D005BCBC1 /* thmlhtmlhref.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6819DF1458005BCBC1 /* thmllatex.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AB19DF144D005BCBC1 /* thmllatex.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6919DF1458005BCBC1 /* thmllemma.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AC19DF144D005BCBC1 /* thmllemma.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6A19DF1458005BCBC1 /* thmlmorph.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AD19DF144D005BCBC1 /* thmlmorph.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6B19DF1458005BCBC1 /* thmlosis.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AE19DF144D005BCBC1 /* thmlosis.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6C19DF1458005BCBC1 /* thmlplain.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129AF19DF144D005BCBC1 /* thmlplain.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6D19DF1458005BCBC1 /* thmlrtf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B019DF144D005BCBC1 /* thmlrtf.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6E19DF1459005BCBC1 /* thmlscripref.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B119DF144D005BCBC1 /* thmlscripref.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A6F19DF1459005BCBC1 /* thmlstrongs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B219DF144D005BCBC1 /* thmlstrongs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7019DF1459005BCBC1 /* thmlvariants.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B319DF144D005BCBC1 /* thmlvariants.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7119DF1459005BCBC1 /* thmlwebif.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B419DF144D005BCBC1 /* thmlwebif.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7219DF1459005BCBC1 /* thmlwordjs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B519DF144D005BCBC1 /* thmlwordjs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7319DF1459005BCBC1 /* thmlxhtml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B619DF144D005BCBC1 /* thmlxhtml.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7419DF145A005BCBC1 /* treekey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B719DF144D005BCBC1 /* treekey.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7519DF145A005BCBC1 /* treekeyidx.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B819DF144D005BCBC1 /* treekeyidx.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7619DF145A005BCBC1 /* unicodertf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129B919DF144D005BCBC1 /* unicodertf.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7719DF145A005BCBC1 /* untgz.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BA19DF144D005BCBC1 /* untgz.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7819DF145A005BCBC1 /* url.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BB19DF144D005BCBC1 /* url.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7919DF145A005BCBC1 /* utf16utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BC19DF144D005BCBC1 /* utf16utf8.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7A19DF145B005BCBC1 /* utf8arabicpoints.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BD19DF144D005BCBC1 /* utf8arabicpoints.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7B19DF145B005BCBC1 /* utf8arshaping.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BE19DF144D005BCBC1 /* utf8arshaping.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7C19DF145B005BCBC1 /* utf8bidireorder.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129BF19DF144D005BCBC1 /* utf8bidireorder.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7D19DF145B005BCBC1 /* utf8cantillation.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C019DF144D005BCBC1 /* utf8cantillation.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7E19DF145B005BCBC1 /* utf8greekaccents.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C119DF144D005BCBC1 /* utf8greekaccents.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A7F19DF145C005BCBC1 /* utf8hebrewpoints.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C219DF144D005BCBC1 /* utf8hebrewpoints.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8019DF145C005BCBC1 /* utf8html.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C319DF144D005BCBC1 /* utf8html.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8119DF145C005BCBC1 /* utf8latin1.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C419DF144D005BCBC1 /* utf8latin1.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8219DF145C005BCBC1 /* utf8nfc.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C519DF144D005BCBC1 /* utf8nfc.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8319DF145C005BCBC1 /* utf8nfkd.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C619DF144D005BCBC1 /* utf8nfkd.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8419DF145C005BCBC1 /* utf8scsu.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C719DF144D005BCBC1 /* utf8scsu.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8519DF145D005BCBC1 /* utf8transliterator.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C819DF144D005BCBC1 /* utf8transliterator.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8619DF145D005BCBC1 /* utf8utf16.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129C919DF144D005BCBC1 /* utf8utf16.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8719DF145D005BCBC1 /* utilstr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CA19DF144D005BCBC1 /* utilstr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8819DF145D005BCBC1 /* utilxml.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CB19DF144D005BCBC1 /* utilxml.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8919DF145D005BCBC1 /* versekey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CC19DF144D005BCBC1 /* versekey.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8A19DF145E005BCBC1 /* versetreekey.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CD19DF144D005BCBC1 /* versetreekey.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8B19DF145E005BCBC1 /* versificationmgr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CE19DF144D005BCBC1 /* versificationmgr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8C19DF145E005BCBC1 /* xzcomprs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129CF19DF144D005BCBC1 /* xzcomprs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8D19DF145E005BCBC1 /* zcom.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D019DF144D005BCBC1 /* zcom.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8E19DF145E005BCBC1 /* zcom4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D119DF144D005BCBC1 /* zcom4.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A8F19DF145F005BCBC1 /* zconf.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D219DF144D005BCBC1 /* zconf.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A9019DF145F005BCBC1 /* zipcomprs.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D319DF144D005BCBC1 /* zipcomprs.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A9119DF145F005BCBC1 /* zld.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D419DF144D005BCBC1 /* zld.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A9219DF145F005BCBC1 /* zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D519DF144D005BCBC1 /* zlib.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A9319DF145F005BCBC1 /* zstr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D619DF144D005BCBC1 /* zstr.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A9419DF1460005BCBC1 /* ztext.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D719DF144D005BCBC1 /* ztext.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A9519DF1460005BCBC1 /* ztext4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D819DF144D005BCBC1 /* ztext4.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A9619DF1460005BCBC1 /* zverse.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129D919DF144D005BCBC1 /* zverse.h */; settings = {ATTRIBUTES = (Private, ); }; }; + A9A12A9719DF1460005BCBC1 /* zverse4.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A129DA19DF144D005BCBC1 /* zverse4.h */; settings = {ATTRIBUTES = (Private, ); }; }; A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A2C17C118D9D3D0002873D /* Notifications.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9A7EEAF14D5D4C300B76B6A /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; A9A7EEBE14D5D64C00B76B6A /* osis2mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDB111C7925C007C1532 /* osis2mod.cpp */; }; - A9A7EEBF14D5D65900B76B6A /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; - A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */; }; - A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; }; - A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A964658011C663E200640FAC /* SwordManagerTest.h */; }; - A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A918B8E211C6697400024D84 /* SwordModuleTest.h */; }; - A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */; }; - A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */; }; - A9BFB0A513EDF51100032679 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BFB0A413EDF51000032679 /* SenTestingKit.framework */; }; + A9A94A381DCB21AB00F69260 /* canon_calvin.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A94A351DCB21AB00F69260 /* canon_calvin.h */; }; + A9A94A391DCB21AB00F69260 /* canon_darbyfr.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A94A361DCB21AB00F69260 /* canon_darbyfr.h */; }; + A9A94A3A1DCB21AB00F69260 /* canon_segond.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A94A371DCB21AB00F69260 /* canon_segond.h */; }; A9BFB0A713EDF51100032679 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BFB0A613EDF51100032679 /* Cocoa.framework */; }; - A9BFB0BC13EDF5C900032679 /* SwordManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A964658111C663E200640FAC /* SwordManagerTest.m */; }; A9BFB0BD13EDF5C900032679 /* SwordModuleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A918B8E311C6697400024D84 /* SwordModuleTest.m */; }; A9BFB0BE13EDF5C900032679 /* SwordListKeyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */; }; - A9BFB0BF13EDF5D500032679 /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; }; + A9BFB0BF13EDF5D500032679 /* SWORD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* SWORD.framework */; }; A9C2856F11C446B700803CB5 /* Configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2856D11C446B700803CB5 /* Configuration.h */; settings = {ATTRIBUTES = (Public, ); }; }; A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2857111C4471400803CB5 /* OSXConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; A9C2857411C4471400803CB5 /* OSXConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2857211C4471400803CB5 /* OSXConfiguration.m */; }; A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2858211C44A0A00803CB5 /* Configuration.m */; }; - A9D2714A14D717D800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; A9D2715014D717F600DA8926 /* imp2gbs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9811C7925C007C1532 /* imp2gbs.cpp */; }; - A9D2715714D717FD00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; A9D2715D14D7180F00DA8926 /* imp2ld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9911C7925C007C1532 /* imp2ld.cpp */; }; - A9D2716414D7181200DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; A9D2716A14D7182100DA8926 /* imp2vs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9A11C7925C007C1532 /* imp2vs.cpp */; }; - A9D2717114D7182300DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; A9D2717714D7183700DA8926 /* installmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9B11C7925C007C1532 /* installmgr.cpp */; }; - A9D2717E14D7183B00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; A9D2718414D7184E00DA8926 /* mod2imp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAB11C7925C007C1532 /* mod2imp.cpp */; }; - A9D2718B14D7185800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; A9D2719114D7186800DA8926 /* mod2vpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAD11C7925C007C1532 /* mod2vpl.cpp */; }; - A9D2719814D7186A00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; A9D2719E14D7187A00DA8926 /* mod2zmod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAE11C7925C007C1532 /* mod2zmod.cpp */; }; - A9D271A514D7187E00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; A9D271AB14D7189100DA8926 /* step2vpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDB811C7925C007C1532 /* step2vpl.cpp */; }; - A9D271B214D7189300DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; A9D271B814D718A300DA8926 /* stepdump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDB911C7925C007C1532 /* stepdump.cpp */; }; - A9D271BF14D718A400DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; A9D271C514D718B700DA8926 /* tei2mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDBB11C7925C007C1532 /* tei2mod.cpp */; }; - A9D271CC14D718B800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; A9D271D214D718C600DA8926 /* vpl2mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDD811C7925C007C1532 /* vpl2mod.cpp */; }; - A9D271D914D718C800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; A9D271DF14D718DE00DA8926 /* vs2osisref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDD911C7925C007C1532 /* vs2osisref.cpp */; }; - A9D271E614D718DF00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; A9D271EC14D718F400DA8926 /* vs2osisreftxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */; }; - A9D271F314D718F500DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; A9D271F914D7190400DA8926 /* xml2gbs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDDB11C7925C007C1532 /* xml2gbs.cpp */; }; A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */; settings = {ATTRIBUTES = (Public, ); }; }; A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */; }; A9D4382311C52947007AFE83 /* locales.d in Resources */ = {isa = PBXBuildFile; fileRef = A9D437CE11C52947007AFE83 /* locales.d */; }; - A9D9FA0B13EEE5CF00EA9DEB /* libsword.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; + A9D8FD3819E2EC730055700C /* introtest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D8FD2C19E2EC0E0055700C /* introtest.cpp */; }; + A9EE8A9119E286E500CFFE6A /* SWORD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* SWORD.framework */; }; + A9EE8A9719E2877500CFFE6A /* SwordModuleLongRunTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */; }; A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A9EF1414120595650078A27C /* SwordLocaleManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9EF1415120595650078A27C /* SwordLocaleManager.mm */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - A954ABC913EE9D0F0094E3FE /* PBXContainerItemProxy */ = { + 0A011DA81FB4142500778C2B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9A7EEAD14D5D4BB00B76B6A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9A7EEC014D5D66400B76B6A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8DC2EF4F0486A6940098B216; - remoteInfo = ObjCSword; + remoteGlobalIDString = 0A011D9D1FB4142500778C2B; + remoteInfo = SWORD; }; A9BFB0BA13EDF5B600032679 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -441,111 +851,6 @@ remoteGlobalIDString = 8DC2EF4F0486A6940098B216; remoteInfo = ObjCSword; }; - A9D2714614D717D800DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D2715314D717FD00DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D2716014D7181200DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D2716D14D7182300DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D2717A14D7183B00DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D2718714D7185800DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D2719414D7186A00DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D271A114D7187E00DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D271AE14D7189300DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D271BB14D718A400DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D271C814D718B800DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D271D514D718C800DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D271E214D718DF00DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D271EF14D718F500DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; - A9D271FE14D7193A00DA8926 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A954ABC213EE9AB00094E3FE; - remoteInfo = sword; - }; A9D2720014D7194E00DA8926 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -658,16 +963,32 @@ remoteGlobalIDString = A9D271ED14D718F500DA8926; remoteInfo = xml2gbs; }; + A9EE8A9219E286E500CFFE6A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = ObjCSword; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 0A1F169E1FBB755B00E0AEFA /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/$(PRODUCT_NAME)"; + dstSubfolderSpec = 16; + files = ( + 0A1F16A51FBB755B00E0AEFA /* SWORD.h in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; A9A5050211C75C4B00EB6EA5 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - A9D9FA0B13EEE5CF00EA9DEB /* libsword.dylib in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -677,10 +998,22 @@ 0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; + 0A011D9E1FB4142500778C2B /* sword.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = sword.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0A011DA11FB4142500778C2B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; + 0A011DA61FB4142500778C2B /* SWORDTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SWORDTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 0A011DAB1FB4142500778C2B /* SWORDTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SWORDTests.m; sourceTree = "<group>"; }; + 0A011DAD1FB4142500778C2B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; + 0A1F16991FBB70E200E0AEFA /* flatapi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = flatapi.cpp; path = ../flatapi.cpp; sourceTree = "<group>"; }; + 0A1F16A01FBB755B00E0AEFA /* libSWORD.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSWORD.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 0A1F16A21FBB755B00E0AEFA /* SWORD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SWORD.h; sourceTree = "<group>"; }; + 0A1F16A31FBB755B00E0AEFA /* SWORD.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SWORD.m; sourceTree = "<group>"; }; + 0AA1DD341FB46FD00082E131 /* sword.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sword.m; sourceTree = "<group>"; }; + 0AA1DD351FB46FD00082E131 /* sword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sword.h; sourceTree = "<group>"; }; 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; 32DBCF5E0370ADEE00C91783 /* ObjCSword_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword_Prefix.pch; sourceTree = "<group>"; }; 8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DefaultFilterProvider.mm; path = src/DefaultFilterProvider.mm; sourceTree = "<group>"; }; 8C92C02A5C86E1C75ED1CEF4 /* SwordFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordFilter.h; path = src/SwordFilter.h; sourceTree = "<group>"; }; + 8C92C0CA467F3114A1DC89DD /* SwordInstallSourceManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SwordInstallSourceManagerTest.m; sourceTree = "<group>"; }; 8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FilterProviderFactory.mm; path = src/FilterProviderFactory.mm; sourceTree = "<group>"; }; 8C92C291C40A77060C12A21B /* SwordUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordUtil.m; path = src/SwordUtil.m; sourceTree = "<group>"; }; 8C92C72ADACB017A434CD268 /* FilterProviderFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FilterProviderFactory.h; path = src/FilterProviderFactory.h; sourceTree = "<group>"; }; @@ -688,7 +1021,792 @@ 8C92C980D4DE32C7AB93159D /* DefaultFilterProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultFilterProvider.h; path = src/DefaultFilterProvider.h; sourceTree = "<group>"; }; 8C92CC111DC521DE0C054C60 /* SwordFilter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordFilter.mm; path = src/SwordFilter.mm; sourceTree = "<group>"; }; 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; - 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjCSword.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DC2EF5B0486A6940098B216 /* SWORD.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SWORD.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A90152BE19A9E8E100F7FC7D /* appendable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = appendable.cpp; sourceTree = "<group>"; }; + A90152BF19A9E8E100F7FC7D /* bmpset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bmpset.cpp; sourceTree = "<group>"; }; + A90152C019A9E8E100F7FC7D /* bmpset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bmpset.h; sourceTree = "<group>"; }; + A90152C119A9E8E100F7FC7D /* brkeng.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = brkeng.cpp; sourceTree = "<group>"; }; + A90152C219A9E8E100F7FC7D /* brkeng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = brkeng.h; sourceTree = "<group>"; }; + A90152C319A9E8E100F7FC7D /* brkiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = brkiter.cpp; sourceTree = "<group>"; }; + A90152C419A9E8E100F7FC7D /* bytestream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bytestream.cpp; sourceTree = "<group>"; }; + A90152C519A9E8E100F7FC7D /* bytestrie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bytestrie.cpp; sourceTree = "<group>"; }; + A90152C619A9E8E100F7FC7D /* bytestriebuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bytestriebuilder.cpp; sourceTree = "<group>"; }; + A90152C719A9E8E100F7FC7D /* bytestrieiterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bytestrieiterator.cpp; sourceTree = "<group>"; }; + A90152C819A9E8E100F7FC7D /* caniter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = caniter.cpp; sourceTree = "<group>"; }; + A90152C919A9E8E100F7FC7D /* chariter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chariter.cpp; sourceTree = "<group>"; }; + A90152CA19A9E8E100F7FC7D /* charstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = charstr.cpp; sourceTree = "<group>"; }; + A90152CB19A9E8E100F7FC7D /* charstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = charstr.h; sourceTree = "<group>"; }; + A90152CC19A9E8E100F7FC7D /* cmemory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cmemory.c; sourceTree = "<group>"; }; + A90152CD19A9E8E100F7FC7D /* cmemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cmemory.h; sourceTree = "<group>"; }; + A90152CE19A9E8E100F7FC7D /* cmutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cmutex.h; sourceTree = "<group>"; }; + A90152D219A9E8E100F7FC7D /* cpputils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpputils.h; sourceTree = "<group>"; }; + A90152D319A9E8E100F7FC7D /* cstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cstring.c; sourceTree = "<group>"; }; + A90152D419A9E8E100F7FC7D /* cstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cstring.h; sourceTree = "<group>"; }; + A90152D519A9E8E100F7FC7D /* cwchar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cwchar.c; sourceTree = "<group>"; }; + A90152D619A9E8E100F7FC7D /* cwchar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cwchar.h; sourceTree = "<group>"; }; + A90152D719A9E8E100F7FC7D /* dictbe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dictbe.cpp; sourceTree = "<group>"; }; + A90152D819A9E8E100F7FC7D /* dictbe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dictbe.h; sourceTree = "<group>"; }; + A90152D919A9E8E100F7FC7D /* dictionarydata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dictionarydata.cpp; sourceTree = "<group>"; }; + A90152DA19A9E8E100F7FC7D /* dictionarydata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dictionarydata.h; sourceTree = "<group>"; }; + A90152DB19A9E8E100F7FC7D /* dtintrv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dtintrv.cpp; sourceTree = "<group>"; }; + A90152DC19A9E8E100F7FC7D /* errorcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = errorcode.cpp; sourceTree = "<group>"; }; + A90152DD19A9E8E100F7FC7D /* filterednormalizer2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filterednormalizer2.cpp; sourceTree = "<group>"; }; + A90152DE19A9E8E100F7FC7D /* hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hash.h; sourceTree = "<group>"; }; + A90152DF19A9E8E100F7FC7D /* icudataver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = icudataver.c; sourceTree = "<group>"; }; + A90152E019A9E8E100F7FC7D /* icuplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = icuplug.c; sourceTree = "<group>"; }; + A90152E119A9E8E100F7FC7D /* icuplugimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icuplugimp.h; sourceTree = "<group>"; }; + A90152E219A9E8E100F7FC7D /* listformatter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = listformatter.cpp; sourceTree = "<group>"; }; + A90152E319A9E8E100F7FC7D /* localsvc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = localsvc.h; sourceTree = "<group>"; }; + A90152E419A9E8E100F7FC7D /* locavailable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locavailable.cpp; sourceTree = "<group>"; }; + A90152E519A9E8E100F7FC7D /* locbased.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locbased.cpp; sourceTree = "<group>"; }; + A90152E619A9E8E100F7FC7D /* locbased.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = locbased.h; sourceTree = "<group>"; }; + A90152E719A9E8E100F7FC7D /* locdispnames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locdispnames.cpp; sourceTree = "<group>"; }; + A90152E819A9E8E100F7FC7D /* locid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locid.cpp; sourceTree = "<group>"; }; + A90152E919A9E8E100F7FC7D /* loclikely.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = loclikely.cpp; sourceTree = "<group>"; }; + A90152EA19A9E8E100F7FC7D /* locmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = locmap.c; sourceTree = "<group>"; }; + A90152EB19A9E8E100F7FC7D /* locmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = locmap.h; sourceTree = "<group>"; }; + A90152EC19A9E8E100F7FC7D /* locresdata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locresdata.cpp; sourceTree = "<group>"; }; + A90152ED19A9E8E100F7FC7D /* locutil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locutil.cpp; sourceTree = "<group>"; }; + A90152EE19A9E8E100F7FC7D /* locutil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = locutil.h; sourceTree = "<group>"; }; + A90152EF19A9E8E100F7FC7D /* lrucache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lrucache.cpp; sourceTree = "<group>"; }; + A90152F019A9E8E100F7FC7D /* lrucache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lrucache.h; sourceTree = "<group>"; }; + A90152F319A9E8E100F7FC7D /* messageimpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = messageimpl.h; sourceTree = "<group>"; }; + A90152F419A9E8E100F7FC7D /* messagepattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = messagepattern.cpp; sourceTree = "<group>"; }; + A90152F519A9E8E100F7FC7D /* msvcres.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msvcres.h; sourceTree = "<group>"; }; + A90152F619A9E8E100F7FC7D /* mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mutex.h; sourceTree = "<group>"; }; + A90152F719A9E8E100F7FC7D /* normalizer2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = normalizer2.cpp; sourceTree = "<group>"; }; + A90152F819A9E8E100F7FC7D /* normalizer2impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = normalizer2impl.cpp; sourceTree = "<group>"; }; + A90152F919A9E8E100F7FC7D /* normalizer2impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = normalizer2impl.h; sourceTree = "<group>"; }; + A90152FA19A9E8E100F7FC7D /* normlzr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = normlzr.cpp; sourceTree = "<group>"; }; + A90152FB19A9E8E100F7FC7D /* parsepos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parsepos.cpp; sourceTree = "<group>"; }; + A90152FC19A9E8E100F7FC7D /* patternprops.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = patternprops.cpp; sourceTree = "<group>"; }; + A90152FD19A9E8E100F7FC7D /* patternprops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = patternprops.h; sourceTree = "<group>"; }; + A90152FE19A9E8E100F7FC7D /* propname.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = propname.cpp; sourceTree = "<group>"; }; + A90152FF19A9E8E100F7FC7D /* propname.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = propname.h; sourceTree = "<group>"; }; + A901530019A9E8E100F7FC7D /* propname_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = propname_data.h; sourceTree = "<group>"; }; + A901530119A9E8E100F7FC7D /* propsvec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = propsvec.c; sourceTree = "<group>"; }; + A901530219A9E8E100F7FC7D /* propsvec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = propsvec.h; sourceTree = "<group>"; }; + A901530319A9E8E100F7FC7D /* punycode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = punycode.cpp; sourceTree = "<group>"; }; + A901530419A9E8E100F7FC7D /* punycode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = punycode.h; sourceTree = "<group>"; }; + A901530519A9E8E100F7FC7D /* putil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = putil.cpp; sourceTree = "<group>"; }; + A901530619A9E8E100F7FC7D /* putilimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = putilimp.h; sourceTree = "<group>"; }; + A901530719A9E8E100F7FC7D /* rbbi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbbi.cpp; sourceTree = "<group>"; }; + A901530919A9E8E100F7FC7D /* rbbidata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbbidata.cpp; sourceTree = "<group>"; }; + A901530A19A9E8E100F7FC7D /* rbbidata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbbidata.h; sourceTree = "<group>"; }; + A901530B19A9E8E100F7FC7D /* rbbinode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbbinode.cpp; sourceTree = "<group>"; }; + A901530C19A9E8E100F7FC7D /* rbbinode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbbinode.h; sourceTree = "<group>"; }; + A901530D19A9E8E100F7FC7D /* rbbirb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbbirb.cpp; sourceTree = "<group>"; }; + A901530E19A9E8E100F7FC7D /* rbbirb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbbirb.h; sourceTree = "<group>"; }; + A901530F19A9E8E100F7FC7D /* rbbirpt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbbirpt.h; sourceTree = "<group>"; }; + A901531119A9E8E100F7FC7D /* rbbiscan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbbiscan.cpp; sourceTree = "<group>"; }; + A901531219A9E8E100F7FC7D /* rbbiscan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbbiscan.h; sourceTree = "<group>"; }; + A901531319A9E8E100F7FC7D /* rbbisetb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbbisetb.cpp; sourceTree = "<group>"; }; + A901531419A9E8E100F7FC7D /* rbbisetb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbbisetb.h; sourceTree = "<group>"; }; + A901531519A9E8E100F7FC7D /* rbbistbl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbbistbl.cpp; sourceTree = "<group>"; }; + A901531619A9E8E100F7FC7D /* rbbitblb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbbitblb.cpp; sourceTree = "<group>"; }; + A901531719A9E8E100F7FC7D /* rbbitblb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbbitblb.h; sourceTree = "<group>"; }; + A901531819A9E8E100F7FC7D /* resbund.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resbund.cpp; sourceTree = "<group>"; }; + A901531919A9E8E100F7FC7D /* resbund_cnv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resbund_cnv.cpp; sourceTree = "<group>"; }; + A901531A19A9E8E100F7FC7D /* ruleiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ruleiter.cpp; sourceTree = "<group>"; }; + A901531B19A9E8E100F7FC7D /* ruleiter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ruleiter.h; sourceTree = "<group>"; }; + A901531C19A9E8E100F7FC7D /* schriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = schriter.cpp; sourceTree = "<group>"; }; + A901531D19A9E8E100F7FC7D /* serv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serv.cpp; sourceTree = "<group>"; }; + A901531E19A9E8E100F7FC7D /* serv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serv.h; sourceTree = "<group>"; }; + A901531F19A9E8E100F7FC7D /* servlk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = servlk.cpp; sourceTree = "<group>"; }; + A901532019A9E8E100F7FC7D /* servlkf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = servlkf.cpp; sourceTree = "<group>"; }; + A901532119A9E8E100F7FC7D /* servloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = servloc.h; sourceTree = "<group>"; }; + A901532219A9E8E100F7FC7D /* servls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = servls.cpp; sourceTree = "<group>"; }; + A901532319A9E8E100F7FC7D /* servnotf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = servnotf.cpp; sourceTree = "<group>"; }; + A901532419A9E8E100F7FC7D /* servnotf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = servnotf.h; sourceTree = "<group>"; }; + A901532519A9E8E100F7FC7D /* servrbf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = servrbf.cpp; sourceTree = "<group>"; }; + A901532619A9E8E100F7FC7D /* servslkf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = servslkf.cpp; sourceTree = "<group>"; }; + A901532719A9E8E100F7FC7D /* sharedobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sharedobject.cpp; sourceTree = "<group>"; }; + A901532819A9E8E100F7FC7D /* sharedobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sharedobject.h; sourceTree = "<group>"; }; + A901532919A9E8E100F7FC7D /* sharedptr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sharedptr.h; sourceTree = "<group>"; }; + A901532A19A9E8E100F7FC7D /* simplepatternformatter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = simplepatternformatter.cpp; sourceTree = "<group>"; }; + A901532B19A9E8E100F7FC7D /* simplepatternformatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = simplepatternformatter.h; sourceTree = "<group>"; }; + A901532C19A9E8E100F7FC7D /* sprpimpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sprpimpl.h; sourceTree = "<group>"; }; + A901532D19A9E8E100F7FC7D /* stringpiece.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stringpiece.cpp; sourceTree = "<group>"; }; + A901532E19A9E8E100F7FC7D /* stringtriebuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stringtriebuilder.cpp; sourceTree = "<group>"; }; + A901532F19A9E8E100F7FC7D /* uarrsort.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uarrsort.c; sourceTree = "<group>"; }; + A901533019A9E8E100F7FC7D /* uarrsort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uarrsort.h; sourceTree = "<group>"; }; + A901533119A9E8E100F7FC7D /* uassert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uassert.h; sourceTree = "<group>"; }; + A901533219A9E8E100F7FC7D /* ubidi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ubidi.c; sourceTree = "<group>"; }; + A901533319A9E8E100F7FC7D /* ubidi_props.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ubidi_props.c; sourceTree = "<group>"; }; + A901533419A9E8E100F7FC7D /* ubidi_props.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ubidi_props.h; sourceTree = "<group>"; }; + A901533519A9E8E100F7FC7D /* ubidi_props_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ubidi_props_data.h; sourceTree = "<group>"; }; + A901533619A9E8E100F7FC7D /* ubidiimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ubidiimp.h; sourceTree = "<group>"; }; + A901533719A9E8E100F7FC7D /* ubidiln.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ubidiln.c; sourceTree = "<group>"; }; + A901533819A9E8E100F7FC7D /* ubidiwrt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ubidiwrt.c; sourceTree = "<group>"; }; + A901533919A9E8E100F7FC7D /* ubrk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ubrk.cpp; sourceTree = "<group>"; }; + A901533A19A9E8E100F7FC7D /* ubrkimpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ubrkimpl.h; sourceTree = "<group>"; }; + A901533B19A9E8E100F7FC7D /* ucase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucase.cpp; sourceTree = "<group>"; }; + A901533C19A9E8E100F7FC7D /* ucase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucase.h; sourceTree = "<group>"; }; + A901533D19A9E8E100F7FC7D /* ucase_props_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucase_props_data.h; sourceTree = "<group>"; }; + A901533E19A9E8E100F7FC7D /* ucasemap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucasemap.cpp; sourceTree = "<group>"; }; + A901533F19A9E8E100F7FC7D /* ucasemap_titlecase_brkiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucasemap_titlecase_brkiter.cpp; sourceTree = "<group>"; }; + A901534019A9E8E100F7FC7D /* ucat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucat.c; sourceTree = "<group>"; }; + A901534119A9E8E100F7FC7D /* uchar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uchar.c; sourceTree = "<group>"; }; + A901534219A9E8E100F7FC7D /* uchar_props_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uchar_props_data.h; sourceTree = "<group>"; }; + A901534319A9E8E100F7FC7D /* ucharstrie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucharstrie.cpp; sourceTree = "<group>"; }; + A901534419A9E8E100F7FC7D /* ucharstriebuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucharstriebuilder.cpp; sourceTree = "<group>"; }; + A901534519A9E8E100F7FC7D /* ucharstrieiterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucharstrieiterator.cpp; sourceTree = "<group>"; }; + A901534619A9E8E100F7FC7D /* uchriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uchriter.cpp; sourceTree = "<group>"; }; + A901534719A9E8E100F7FC7D /* ucln.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucln.h; sourceTree = "<group>"; }; + A901534819A9E8E100F7FC7D /* ucln_cmn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucln_cmn.c; sourceTree = "<group>"; }; + A901534919A9E8E100F7FC7D /* ucln_cmn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucln_cmn.h; sourceTree = "<group>"; }; + A901534A19A9E8E100F7FC7D /* ucln_imp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucln_imp.h; sourceTree = "<group>"; }; + A901534B19A9E8E100F7FC7D /* ucmndata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucmndata.c; sourceTree = "<group>"; }; + A901534C19A9E8E100F7FC7D /* ucmndata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucmndata.h; sourceTree = "<group>"; }; + A901534D19A9E8E100F7FC7D /* ucnv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv.c; sourceTree = "<group>"; }; + A901534E19A9E8E100F7FC7D /* ucnv2022.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucnv2022.cpp; sourceTree = "<group>"; }; + A901534F19A9E8E100F7FC7D /* ucnv_bld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucnv_bld.cpp; sourceTree = "<group>"; }; + A901535019A9E8E100F7FC7D /* ucnv_bld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucnv_bld.h; sourceTree = "<group>"; }; + A901535119A9E8E100F7FC7D /* ucnv_cb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv_cb.c; sourceTree = "<group>"; }; + A901535219A9E8E100F7FC7D /* ucnv_cnv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv_cnv.c; sourceTree = "<group>"; }; + A901535319A9E8E100F7FC7D /* ucnv_cnv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucnv_cnv.h; sourceTree = "<group>"; }; + A901535419A9E8E100F7FC7D /* ucnv_ct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv_ct.c; sourceTree = "<group>"; }; + A901535519A9E8E100F7FC7D /* ucnv_err.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv_err.c; sourceTree = "<group>"; }; + A901535619A9E8E100F7FC7D /* ucnv_ext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucnv_ext.cpp; sourceTree = "<group>"; }; + A901535719A9E8E100F7FC7D /* ucnv_ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucnv_ext.h; sourceTree = "<group>"; }; + A901535819A9E8E100F7FC7D /* ucnv_imp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucnv_imp.h; sourceTree = "<group>"; }; + A901535919A9E8E100F7FC7D /* ucnv_io.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucnv_io.cpp; sourceTree = "<group>"; }; + A901535A19A9E8E100F7FC7D /* ucnv_io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucnv_io.h; sourceTree = "<group>"; }; + A901535B19A9E8E100F7FC7D /* ucnv_lmb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv_lmb.c; sourceTree = "<group>"; }; + A901535C19A9E8E100F7FC7D /* ucnv_set.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv_set.c; sourceTree = "<group>"; }; + A901535D19A9E8E100F7FC7D /* ucnv_u16.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv_u16.c; sourceTree = "<group>"; }; + A901535E19A9E8E100F7FC7D /* ucnv_u32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv_u32.c; sourceTree = "<group>"; }; + A901535F19A9E8E100F7FC7D /* ucnv_u7.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv_u7.c; sourceTree = "<group>"; }; + A901536019A9E8E100F7FC7D /* ucnv_u8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnv_u8.c; sourceTree = "<group>"; }; + A901536119A9E8E100F7FC7D /* ucnvbocu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucnvbocu.cpp; sourceTree = "<group>"; }; + A901536219A9E8E100F7FC7D /* ucnvdisp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnvdisp.c; sourceTree = "<group>"; }; + A901536319A9E8E100F7FC7D /* ucnvhz.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnvhz.c; sourceTree = "<group>"; }; + A901536419A9E8E100F7FC7D /* ucnvisci.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnvisci.c; sourceTree = "<group>"; }; + A901536519A9E8E100F7FC7D /* ucnvlat1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnvlat1.c; sourceTree = "<group>"; }; + A901536619A9E8E100F7FC7D /* ucnvmbcs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnvmbcs.c; sourceTree = "<group>"; }; + A901536719A9E8E100F7FC7D /* ucnvmbcs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucnvmbcs.h; sourceTree = "<group>"; }; + A901536819A9E8E100F7FC7D /* ucnvscsu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucnvscsu.c; sourceTree = "<group>"; }; + A901536919A9E8E100F7FC7D /* ucnvsel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucnvsel.cpp; sourceTree = "<group>"; }; + A901536A19A9E8E100F7FC7D /* ucol_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucol_data.h; sourceTree = "<group>"; }; + A901536B19A9E8E100F7FC7D /* ucol_swp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucol_swp.cpp; sourceTree = "<group>"; }; + A901536C19A9E8E100F7FC7D /* ucol_swp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucol_swp.h; sourceTree = "<group>"; }; + A901536D19A9E8E100F7FC7D /* udata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = udata.cpp; sourceTree = "<group>"; }; + A901536E19A9E8E100F7FC7D /* udatamem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = udatamem.c; sourceTree = "<group>"; }; + A901536F19A9E8E100F7FC7D /* udatamem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = udatamem.h; sourceTree = "<group>"; }; + A901537019A9E8E100F7FC7D /* udataswp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = udataswp.c; sourceTree = "<group>"; }; + A901537119A9E8E100F7FC7D /* udataswp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = udataswp.h; sourceTree = "<group>"; }; + A901537219A9E8E100F7FC7D /* uelement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uelement.h; sourceTree = "<group>"; }; + A901537319A9E8E100F7FC7D /* uenum.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uenum.c; sourceTree = "<group>"; }; + A901537419A9E8E100F7FC7D /* uenumimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uenumimp.h; sourceTree = "<group>"; }; + A901537519A9E8E100F7FC7D /* uhash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uhash.c; sourceTree = "<group>"; }; + A901537619A9E8E100F7FC7D /* uhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uhash.h; sourceTree = "<group>"; }; + A901537719A9E8E100F7FC7D /* uhash_us.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uhash_us.cpp; sourceTree = "<group>"; }; + A901537819A9E8E100F7FC7D /* uidna.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uidna.cpp; sourceTree = "<group>"; }; + A901537919A9E8E100F7FC7D /* uinit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uinit.cpp; sourceTree = "<group>"; }; + A901537A19A9E8E100F7FC7D /* uinvchar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uinvchar.c; sourceTree = "<group>"; }; + A901537B19A9E8E100F7FC7D /* uinvchar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uinvchar.h; sourceTree = "<group>"; }; + A901537C19A9E8E100F7FC7D /* uiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uiter.cpp; sourceTree = "<group>"; }; + A901537D19A9E8E100F7FC7D /* ulist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ulist.c; sourceTree = "<group>"; }; + A901537E19A9E8E100F7FC7D /* ulist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ulist.h; sourceTree = "<group>"; }; + A901537F19A9E8E100F7FC7D /* uloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uloc.cpp; sourceTree = "<group>"; }; + A901538019A9E8E100F7FC7D /* uloc_tag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uloc_tag.c; sourceTree = "<group>"; }; + A901538119A9E8E100F7FC7D /* ulocimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ulocimp.h; sourceTree = "<group>"; }; + A901538219A9E8E100F7FC7D /* umapfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = umapfile.c; sourceTree = "<group>"; }; + A901538319A9E8E100F7FC7D /* umapfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = umapfile.h; sourceTree = "<group>"; }; + A901538419A9E8E100F7FC7D /* umath.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = umath.c; sourceTree = "<group>"; }; + A901538519A9E8E100F7FC7D /* umutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = umutex.cpp; sourceTree = "<group>"; }; + A901538619A9E8E100F7FC7D /* umutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = umutex.h; sourceTree = "<group>"; }; + A901538719A9E8E100F7FC7D /* unames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unames.cpp; sourceTree = "<group>"; }; + A90153DD19A9E8E100F7FC7D /* unifilt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unifilt.cpp; sourceTree = "<group>"; }; + A90153DE19A9E8E100F7FC7D /* unifunct.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unifunct.cpp; sourceTree = "<group>"; }; + A90153DF19A9E8E100F7FC7D /* uniset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uniset.cpp; sourceTree = "<group>"; }; + A90153E019A9E8E100F7FC7D /* uniset_closure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uniset_closure.cpp; sourceTree = "<group>"; }; + A90153E119A9E8E100F7FC7D /* uniset_props.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uniset_props.cpp; sourceTree = "<group>"; }; + A90153E219A9E8E100F7FC7D /* unisetspan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unisetspan.cpp; sourceTree = "<group>"; }; + A90153E319A9E8E100F7FC7D /* unisetspan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unisetspan.h; sourceTree = "<group>"; }; + A90153E419A9E8E100F7FC7D /* unistr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unistr.cpp; sourceTree = "<group>"; }; + A90153E519A9E8E100F7FC7D /* unistr_case.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unistr_case.cpp; sourceTree = "<group>"; }; + A90153E619A9E8E100F7FC7D /* unistr_case_locale.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unistr_case_locale.cpp; sourceTree = "<group>"; }; + A90153E719A9E8E100F7FC7D /* unistr_cnv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unistr_cnv.cpp; sourceTree = "<group>"; }; + A90153E819A9E8E100F7FC7D /* unistr_props.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unistr_props.cpp; sourceTree = "<group>"; }; + A90153E919A9E8E100F7FC7D /* unistr_titlecase_brkiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unistr_titlecase_brkiter.cpp; sourceTree = "<group>"; }; + A90153EA19A9E8E100F7FC7D /* unorm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unorm.cpp; sourceTree = "<group>"; }; + A90153EB19A9E8E100F7FC7D /* unormcmp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unormcmp.cpp; sourceTree = "<group>"; }; + A90153EC19A9E8E100F7FC7D /* unormimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unormimp.h; sourceTree = "<group>"; }; + A90153ED19A9E8E100F7FC7D /* uobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uobject.cpp; sourceTree = "<group>"; }; + A90153EE19A9E8E100F7FC7D /* uposixdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uposixdefs.h; sourceTree = "<group>"; }; + A90153EF19A9E8E100F7FC7D /* uprops.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uprops.cpp; sourceTree = "<group>"; }; + A90153F019A9E8E100F7FC7D /* uprops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uprops.h; sourceTree = "<group>"; }; + A90153F119A9E8E100F7FC7D /* ures_cnv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ures_cnv.c; sourceTree = "<group>"; }; + A90153F219A9E8E200F7FC7D /* uresbund.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uresbund.cpp; sourceTree = "<group>"; }; + A90153F319A9E8E200F7FC7D /* uresdata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uresdata.c; sourceTree = "<group>"; }; + A90153F419A9E8E200F7FC7D /* uresdata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uresdata.h; sourceTree = "<group>"; }; + A90153F519A9E8E200F7FC7D /* uresimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uresimp.h; sourceTree = "<group>"; }; + A90153F619A9E8E200F7FC7D /* ureslocs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ureslocs.h; sourceTree = "<group>"; }; + A90153F719A9E8E200F7FC7D /* usc_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = usc_impl.c; sourceTree = "<group>"; }; + A90153F819A9E8E200F7FC7D /* usc_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usc_impl.h; sourceTree = "<group>"; }; + A90153F919A9E8E200F7FC7D /* uscript.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uscript.c; sourceTree = "<group>"; }; + A90153FA19A9E8E200F7FC7D /* uscript_props.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uscript_props.cpp; sourceTree = "<group>"; }; + A90153FB19A9E8E200F7FC7D /* uset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uset.cpp; sourceTree = "<group>"; }; + A90153FC19A9E8E200F7FC7D /* uset_imp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uset_imp.h; sourceTree = "<group>"; }; + A90153FD19A9E8E200F7FC7D /* uset_props.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uset_props.cpp; sourceTree = "<group>"; }; + A90153FE19A9E8E200F7FC7D /* usetiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = usetiter.cpp; sourceTree = "<group>"; }; + A90153FF19A9E8E200F7FC7D /* ushape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ushape.cpp; sourceTree = "<group>"; }; + A901540019A9E8E200F7FC7D /* usprep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = usprep.cpp; sourceTree = "<group>"; }; + A901540119A9E8E200F7FC7D /* ustack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustack.cpp; sourceTree = "<group>"; }; + A901540219A9E8E200F7FC7D /* ustr_cnv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ustr_cnv.c; sourceTree = "<group>"; }; + A901540319A9E8E200F7FC7D /* ustr_cnv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ustr_cnv.h; sourceTree = "<group>"; }; + A901540419A9E8E200F7FC7D /* ustr_imp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ustr_imp.h; sourceTree = "<group>"; }; + A901540519A9E8E200F7FC7D /* ustr_titlecase_brkiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustr_titlecase_brkiter.cpp; sourceTree = "<group>"; }; + A901540619A9E8E200F7FC7D /* ustr_wcs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustr_wcs.cpp; sourceTree = "<group>"; }; + A901540719A9E8E200F7FC7D /* ustrcase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustrcase.cpp; sourceTree = "<group>"; }; + A901540819A9E8E200F7FC7D /* ustrcase_locale.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustrcase_locale.cpp; sourceTree = "<group>"; }; + A901540919A9E8E200F7FC7D /* ustrenum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustrenum.cpp; sourceTree = "<group>"; }; + A901540A19A9E8E200F7FC7D /* ustrenum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ustrenum.h; sourceTree = "<group>"; }; + A901540B19A9E8E200F7FC7D /* ustrfmt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ustrfmt.c; sourceTree = "<group>"; }; + A901540C19A9E8E200F7FC7D /* ustrfmt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ustrfmt.h; sourceTree = "<group>"; }; + A901540D19A9E8E200F7FC7D /* ustring.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustring.cpp; sourceTree = "<group>"; }; + A901540E19A9E8E200F7FC7D /* ustrtrns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustrtrns.cpp; sourceTree = "<group>"; }; + A901540F19A9E8E200F7FC7D /* utext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utext.cpp; sourceTree = "<group>"; }; + A901541019A9E8E200F7FC7D /* utf_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf_impl.c; sourceTree = "<group>"; }; + A901541119A9E8E200F7FC7D /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util.cpp; sourceTree = "<group>"; }; + A901541219A9E8E200F7FC7D /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; }; + A901541319A9E8E200F7FC7D /* util_props.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util_props.cpp; sourceTree = "<group>"; }; + A901541419A9E8E200F7FC7D /* utrace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utrace.c; sourceTree = "<group>"; }; + A901541519A9E8E200F7FC7D /* utracimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utracimp.h; sourceTree = "<group>"; }; + A901541619A9E8E200F7FC7D /* utrie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utrie.cpp; sourceTree = "<group>"; }; + A901541719A9E8E200F7FC7D /* utrie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utrie.h; sourceTree = "<group>"; }; + A901541819A9E8E200F7FC7D /* utrie2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utrie2.cpp; sourceTree = "<group>"; }; + A901541919A9E8E200F7FC7D /* utrie2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utrie2.h; sourceTree = "<group>"; }; + A901541A19A9E8E200F7FC7D /* utrie2_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utrie2_builder.cpp; sourceTree = "<group>"; }; + A901541B19A9E8E200F7FC7D /* utrie2_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utrie2_impl.h; sourceTree = "<group>"; }; + A901541C19A9E8E200F7FC7D /* uts46.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uts46.cpp; sourceTree = "<group>"; }; + A901541D19A9E8E200F7FC7D /* utypeinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utypeinfo.h; sourceTree = "<group>"; }; + A901541E19A9E8E200F7FC7D /* utypes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utypes.c; sourceTree = "<group>"; }; + A901541F19A9E8E200F7FC7D /* uvector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uvector.cpp; sourceTree = "<group>"; }; + A901542019A9E8E200F7FC7D /* uvector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uvector.h; sourceTree = "<group>"; }; + A901542119A9E8E200F7FC7D /* uvectr32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uvectr32.cpp; sourceTree = "<group>"; }; + A901542219A9E8E200F7FC7D /* uvectr32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uvectr32.h; sourceTree = "<group>"; }; + A901542319A9E8E200F7FC7D /* uvectr64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uvectr64.cpp; sourceTree = "<group>"; }; + A901542419A9E8E200F7FC7D /* uvectr64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uvectr64.h; sourceTree = "<group>"; }; + A901542519A9E8E200F7FC7D /* wintz.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = wintz.c; sourceTree = "<group>"; }; + A901542619A9E8E200F7FC7D /* wintz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wintz.h; sourceTree = "<group>"; }; + A9015B9419A9E8E700F7FC7D /* alphaindex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = alphaindex.cpp; sourceTree = "<group>"; }; + A9015B9519A9E8E700F7FC7D /* anytrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = anytrans.cpp; sourceTree = "<group>"; }; + A9015B9619A9E8E700F7FC7D /* anytrans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = anytrans.h; sourceTree = "<group>"; }; + A9015B9719A9E8E700F7FC7D /* astro.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = astro.cpp; sourceTree = "<group>"; }; + A9015B9819A9E8E700F7FC7D /* astro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = astro.h; sourceTree = "<group>"; }; + A9015B9919A9E8E700F7FC7D /* basictz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = basictz.cpp; sourceTree = "<group>"; }; + A9015B9A19A9E8E700F7FC7D /* bocsu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bocsu.cpp; sourceTree = "<group>"; }; + A9015B9B19A9E8E700F7FC7D /* bocsu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bocsu.h; sourceTree = "<group>"; }; + A9015B9C19A9E8E700F7FC7D /* brktrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = brktrans.cpp; sourceTree = "<group>"; }; + A9015B9D19A9E8E700F7FC7D /* brktrans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = brktrans.h; sourceTree = "<group>"; }; + A9015B9E19A9E8E700F7FC7D /* buddhcal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = buddhcal.cpp; sourceTree = "<group>"; }; + A9015B9F19A9E8E700F7FC7D /* buddhcal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buddhcal.h; sourceTree = "<group>"; }; + A9015BA019A9E8E700F7FC7D /* calendar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = calendar.cpp; sourceTree = "<group>"; }; + A9015BA119A9E8E700F7FC7D /* casetrn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = casetrn.cpp; sourceTree = "<group>"; }; + A9015BA219A9E8E700F7FC7D /* casetrn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = casetrn.h; sourceTree = "<group>"; }; + A9015BA319A9E8E700F7FC7D /* cecal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cecal.cpp; sourceTree = "<group>"; }; + A9015BA419A9E8E700F7FC7D /* cecal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cecal.h; sourceTree = "<group>"; }; + A9015BA519A9E8E700F7FC7D /* chnsecal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chnsecal.cpp; sourceTree = "<group>"; }; + A9015BA619A9E8E700F7FC7D /* chnsecal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chnsecal.h; sourceTree = "<group>"; }; + A9015BA719A9E8E700F7FC7D /* choicfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = choicfmt.cpp; sourceTree = "<group>"; }; + A9015BA819A9E8E700F7FC7D /* coleitr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coleitr.cpp; sourceTree = "<group>"; }; + A9015BA919A9E8E700F7FC7D /* coll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coll.cpp; sourceTree = "<group>"; }; + A9015BAA19A9E8E700F7FC7D /* collation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collation.cpp; sourceTree = "<group>"; }; + A9015BAB19A9E8E700F7FC7D /* collation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collation.h; sourceTree = "<group>"; }; + A9015BAC19A9E8E700F7FC7D /* collationbasedatabuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationbasedatabuilder.cpp; sourceTree = "<group>"; }; + A9015BAD19A9E8E700F7FC7D /* collationbasedatabuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationbasedatabuilder.h; sourceTree = "<group>"; }; + A9015BAE19A9E8E700F7FC7D /* collationbuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationbuilder.cpp; sourceTree = "<group>"; }; + A9015BAF19A9E8E700F7FC7D /* collationbuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationbuilder.h; sourceTree = "<group>"; }; + A9015BB019A9E8E700F7FC7D /* collationcompare.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationcompare.cpp; sourceTree = "<group>"; }; + A9015BB119A9E8E700F7FC7D /* collationcompare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationcompare.h; sourceTree = "<group>"; }; + A9015BB219A9E8E700F7FC7D /* collationdata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationdata.cpp; sourceTree = "<group>"; }; + A9015BB319A9E8E700F7FC7D /* collationdata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationdata.h; sourceTree = "<group>"; }; + A9015BB419A9E8E700F7FC7D /* collationdatabuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationdatabuilder.cpp; sourceTree = "<group>"; }; + A9015BB519A9E8E700F7FC7D /* collationdatabuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationdatabuilder.h; sourceTree = "<group>"; }; + A9015BB619A9E8E700F7FC7D /* collationdatareader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationdatareader.cpp; sourceTree = "<group>"; }; + A9015BB719A9E8E700F7FC7D /* collationdatareader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationdatareader.h; sourceTree = "<group>"; }; + A9015BB819A9E8E700F7FC7D /* collationdatawriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationdatawriter.cpp; sourceTree = "<group>"; }; + A9015BB919A9E8E700F7FC7D /* collationdatawriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationdatawriter.h; sourceTree = "<group>"; }; + A9015BBA19A9E8E700F7FC7D /* collationfastlatin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationfastlatin.cpp; sourceTree = "<group>"; }; + A9015BBB19A9E8E700F7FC7D /* collationfastlatin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationfastlatin.h; sourceTree = "<group>"; }; + A9015BBC19A9E8E700F7FC7D /* collationfastlatinbuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationfastlatinbuilder.cpp; sourceTree = "<group>"; }; + A9015BBD19A9E8E700F7FC7D /* collationfastlatinbuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationfastlatinbuilder.h; sourceTree = "<group>"; }; + A9015BBE19A9E8E700F7FC7D /* collationfcd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationfcd.cpp; sourceTree = "<group>"; }; + A9015BBF19A9E8E700F7FC7D /* collationfcd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationfcd.h; sourceTree = "<group>"; }; + A9015BC019A9E8E700F7FC7D /* collationiterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationiterator.cpp; sourceTree = "<group>"; }; + A9015BC119A9E8E700F7FC7D /* collationiterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationiterator.h; sourceTree = "<group>"; }; + A9015BC219A9E8E700F7FC7D /* collationkeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationkeys.cpp; sourceTree = "<group>"; }; + A9015BC319A9E8E700F7FC7D /* collationkeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationkeys.h; sourceTree = "<group>"; }; + A9015BC419A9E8E700F7FC7D /* collationroot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationroot.cpp; sourceTree = "<group>"; }; + A9015BC519A9E8E700F7FC7D /* collationroot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationroot.h; sourceTree = "<group>"; }; + A9015BC619A9E8E700F7FC7D /* collationrootelements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationrootelements.cpp; sourceTree = "<group>"; }; + A9015BC719A9E8E700F7FC7D /* collationrootelements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationrootelements.h; sourceTree = "<group>"; }; + A9015BC819A9E8E700F7FC7D /* collationruleparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationruleparser.cpp; sourceTree = "<group>"; }; + A9015BC919A9E8E700F7FC7D /* collationruleparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationruleparser.h; sourceTree = "<group>"; }; + A9015BCA19A9E8E700F7FC7D /* collationsets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationsets.cpp; sourceTree = "<group>"; }; + A9015BCB19A9E8E700F7FC7D /* collationsets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationsets.h; sourceTree = "<group>"; }; + A9015BCC19A9E8E700F7FC7D /* collationsettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationsettings.cpp; sourceTree = "<group>"; }; + A9015BCD19A9E8E700F7FC7D /* collationsettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationsettings.h; sourceTree = "<group>"; }; + A9015BCE19A9E8E700F7FC7D /* collationtailoring.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationtailoring.cpp; sourceTree = "<group>"; }; + A9015BCF19A9E8E700F7FC7D /* collationtailoring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationtailoring.h; sourceTree = "<group>"; }; + A9015BD019A9E8E700F7FC7D /* collationweights.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collationweights.cpp; sourceTree = "<group>"; }; + A9015BD119A9E8E700F7FC7D /* collationweights.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collationweights.h; sourceTree = "<group>"; }; + A9015BD219A9E8E700F7FC7D /* compactdecimalformat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = compactdecimalformat.cpp; sourceTree = "<group>"; }; + A9015BD319A9E8E700F7FC7D /* coptccal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coptccal.cpp; sourceTree = "<group>"; }; + A9015BD419A9E8E700F7FC7D /* coptccal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coptccal.h; sourceTree = "<group>"; }; + A9015BD519A9E8E700F7FC7D /* cpdtrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpdtrans.cpp; sourceTree = "<group>"; }; + A9015BD619A9E8E700F7FC7D /* cpdtrans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpdtrans.h; sourceTree = "<group>"; }; + A9015BD719A9E8E700F7FC7D /* csdetect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csdetect.cpp; sourceTree = "<group>"; }; + A9015BD819A9E8E700F7FC7D /* csdetect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csdetect.h; sourceTree = "<group>"; }; + A9015BD919A9E8E700F7FC7D /* csmatch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csmatch.cpp; sourceTree = "<group>"; }; + A9015BDA19A9E8E700F7FC7D /* csmatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csmatch.h; sourceTree = "<group>"; }; + A9015BDB19A9E8E700F7FC7D /* csr2022.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csr2022.cpp; sourceTree = "<group>"; }; + A9015BDC19A9E8E700F7FC7D /* csr2022.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csr2022.h; sourceTree = "<group>"; }; + A9015BDD19A9E8E700F7FC7D /* csrecog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csrecog.cpp; sourceTree = "<group>"; }; + A9015BDE19A9E8E700F7FC7D /* csrecog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csrecog.h; sourceTree = "<group>"; }; + A9015BDF19A9E8E700F7FC7D /* csrmbcs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csrmbcs.cpp; sourceTree = "<group>"; }; + A9015BE019A9E8E700F7FC7D /* csrmbcs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csrmbcs.h; sourceTree = "<group>"; }; + A9015BE119A9E8E700F7FC7D /* csrsbcs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csrsbcs.cpp; sourceTree = "<group>"; }; + A9015BE219A9E8E700F7FC7D /* csrsbcs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csrsbcs.h; sourceTree = "<group>"; }; + A9015BE319A9E8E700F7FC7D /* csrucode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csrucode.cpp; sourceTree = "<group>"; }; + A9015BE419A9E8E700F7FC7D /* csrucode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csrucode.h; sourceTree = "<group>"; }; + A9015BE519A9E8E700F7FC7D /* csrutf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csrutf8.cpp; sourceTree = "<group>"; }; + A9015BE619A9E8E700F7FC7D /* csrutf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csrutf8.h; sourceTree = "<group>"; }; + A9015BE719A9E8E700F7FC7D /* curramt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = curramt.cpp; sourceTree = "<group>"; }; + A9015BE819A9E8E700F7FC7D /* currfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = currfmt.cpp; sourceTree = "<group>"; }; + A9015BE919A9E8E700F7FC7D /* currfmt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = currfmt.h; sourceTree = "<group>"; }; + A9015BEA19A9E8E700F7FC7D /* currpinf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = currpinf.cpp; sourceTree = "<group>"; }; + A9015BEB19A9E8E700F7FC7D /* currunit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = currunit.cpp; sourceTree = "<group>"; }; + A9015BEC19A9E8E700F7FC7D /* dangical.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dangical.cpp; sourceTree = "<group>"; }; + A9015BED19A9E8E700F7FC7D /* dangical.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dangical.h; sourceTree = "<group>"; }; + A9015BEE19A9E8E700F7FC7D /* datefmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = datefmt.cpp; sourceTree = "<group>"; }; + A9015BEF19A9E8E700F7FC7D /* dcfmtimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dcfmtimp.h; sourceTree = "<group>"; }; + A9015BF019A9E8E700F7FC7D /* dcfmtsym.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dcfmtsym.cpp; sourceTree = "<group>"; }; + A9015BF119A9E8E700F7FC7D /* decContext.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decContext.c; sourceTree = "<group>"; }; + A9015BF219A9E8E700F7FC7D /* decContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decContext.h; sourceTree = "<group>"; }; + A9015BF319A9E8E700F7FC7D /* decfmtst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decfmtst.cpp; sourceTree = "<group>"; }; + A9015BF419A9E8E700F7FC7D /* decfmtst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decfmtst.h; sourceTree = "<group>"; }; + A9015BF519A9E8E700F7FC7D /* decimalformatpattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decimalformatpattern.cpp; sourceTree = "<group>"; }; + A9015BF619A9E8E700F7FC7D /* decimalformatpattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decimalformatpattern.h; sourceTree = "<group>"; }; + A9015BF719A9E8E700F7FC7D /* decimfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decimfmt.cpp; sourceTree = "<group>"; }; + A9015BF819A9E8E700F7FC7D /* decNumber.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decNumber.c; sourceTree = "<group>"; }; + A9015BF919A9E8E700F7FC7D /* decNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decNumber.h; sourceTree = "<group>"; }; + A9015BFA19A9E8E700F7FC7D /* decNumberLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decNumberLocal.h; sourceTree = "<group>"; }; + A9015BFB19A9E8E700F7FC7D /* digitlst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = digitlst.cpp; sourceTree = "<group>"; }; + A9015BFC19A9E8E700F7FC7D /* digitlst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = digitlst.h; sourceTree = "<group>"; }; + A9015BFD19A9E8E700F7FC7D /* dtfmtsym.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dtfmtsym.cpp; sourceTree = "<group>"; }; + A9015BFE19A9E8E700F7FC7D /* dtitv_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dtitv_impl.h; sourceTree = "<group>"; }; + A9015BFF19A9E8E700F7FC7D /* dtitvfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dtitvfmt.cpp; sourceTree = "<group>"; }; + A9015C0019A9E8E700F7FC7D /* dtitvinf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dtitvinf.cpp; sourceTree = "<group>"; }; + A9015C0119A9E8E700F7FC7D /* dtptngen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dtptngen.cpp; sourceTree = "<group>"; }; + A9015C0219A9E8E700F7FC7D /* dtptngen_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dtptngen_impl.h; sourceTree = "<group>"; }; + A9015C0319A9E8E700F7FC7D /* dtrule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dtrule.cpp; sourceTree = "<group>"; }; + A9015C0419A9E8E700F7FC7D /* esctrn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = esctrn.cpp; sourceTree = "<group>"; }; + A9015C0519A9E8E700F7FC7D /* esctrn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = esctrn.h; sourceTree = "<group>"; }; + A9015C0619A9E8E700F7FC7D /* ethpccal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ethpccal.cpp; sourceTree = "<group>"; }; + A9015C0719A9E8E700F7FC7D /* ethpccal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ethpccal.h; sourceTree = "<group>"; }; + A9015C0819A9E8E700F7FC7D /* filteredbrk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filteredbrk.cpp; sourceTree = "<group>"; }; + A9015C0919A9E8E700F7FC7D /* fmtable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fmtable.cpp; sourceTree = "<group>"; }; + A9015C0A19A9E8E700F7FC7D /* fmtable_cnv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fmtable_cnv.cpp; sourceTree = "<group>"; }; + A9015C0B19A9E8E700F7FC7D /* fmtableimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fmtableimp.h; sourceTree = "<group>"; }; + A9015C0C19A9E8E700F7FC7D /* format.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = format.cpp; sourceTree = "<group>"; }; + A9015C0D19A9E8E700F7FC7D /* fphdlimp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fphdlimp.cpp; sourceTree = "<group>"; }; + A9015C0E19A9E8E700F7FC7D /* fphdlimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fphdlimp.h; sourceTree = "<group>"; }; + A9015C0F19A9E8E700F7FC7D /* fpositer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fpositer.cpp; sourceTree = "<group>"; }; + A9015C1019A9E8E700F7FC7D /* funcrepl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = funcrepl.cpp; sourceTree = "<group>"; }; + A9015C1119A9E8E700F7FC7D /* funcrepl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = funcrepl.h; sourceTree = "<group>"; }; + A9015C1219A9E8E700F7FC7D /* gender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gender.cpp; sourceTree = "<group>"; }; + A9015C1319A9E8E700F7FC7D /* gregocal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gregocal.cpp; sourceTree = "<group>"; }; + A9015C1419A9E8E700F7FC7D /* gregoimp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gregoimp.cpp; sourceTree = "<group>"; }; + A9015C1519A9E8E700F7FC7D /* gregoimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gregoimp.h; sourceTree = "<group>"; }; + A9015C1619A9E8E700F7FC7D /* hebrwcal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hebrwcal.cpp; sourceTree = "<group>"; }; + A9015C1719A9E8E700F7FC7D /* hebrwcal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hebrwcal.h; sourceTree = "<group>"; }; + A9015C1B19A9E8E700F7FC7D /* identifier_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = identifier_info.cpp; sourceTree = "<group>"; }; + A9015C1C19A9E8E700F7FC7D /* identifier_info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = identifier_info.h; sourceTree = "<group>"; }; + A9015C1D19A9E8E700F7FC7D /* indiancal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = indiancal.cpp; sourceTree = "<group>"; }; + A9015C1E19A9E8E700F7FC7D /* indiancal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = indiancal.h; sourceTree = "<group>"; }; + A9015C1F19A9E8E700F7FC7D /* inputext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inputext.cpp; sourceTree = "<group>"; }; + A9015C2019A9E8E700F7FC7D /* inputext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inputext.h; sourceTree = "<group>"; }; + A9015C2119A9E8E700F7FC7D /* islamcal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = islamcal.cpp; sourceTree = "<group>"; }; + A9015C2219A9E8E700F7FC7D /* islamcal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = islamcal.h; sourceTree = "<group>"; }; + A9015C2319A9E8E700F7FC7D /* japancal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = japancal.cpp; sourceTree = "<group>"; }; + A9015C2419A9E8E700F7FC7D /* japancal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = japancal.h; sourceTree = "<group>"; }; + A9015C2519A9E8E700F7FC7D /* locdspnm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locdspnm.cpp; sourceTree = "<group>"; }; + A9015C2819A9E8E700F7FC7D /* measfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = measfmt.cpp; sourceTree = "<group>"; }; + A9015C2919A9E8E700F7FC7D /* measunit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = measunit.cpp; sourceTree = "<group>"; }; + A9015C2A19A9E8E700F7FC7D /* measure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = measure.cpp; sourceTree = "<group>"; }; + A9015C2B19A9E8E700F7FC7D /* msgfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msgfmt.cpp; sourceTree = "<group>"; }; + A9015C2C19A9E8E700F7FC7D /* msgfmt_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msgfmt_impl.h; sourceTree = "<group>"; }; + A9015C2D19A9E8E700F7FC7D /* name2uni.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = name2uni.cpp; sourceTree = "<group>"; }; + A9015C2E19A9E8E700F7FC7D /* name2uni.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = name2uni.h; sourceTree = "<group>"; }; + A9015C2F19A9E8E700F7FC7D /* nfrlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nfrlist.h; sourceTree = "<group>"; }; + A9015C3019A9E8E800F7FC7D /* nfrs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nfrs.cpp; sourceTree = "<group>"; }; + A9015C3119A9E8E800F7FC7D /* nfrs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nfrs.h; sourceTree = "<group>"; }; + A9015C3219A9E8E800F7FC7D /* nfrule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nfrule.cpp; sourceTree = "<group>"; }; + A9015C3319A9E8E800F7FC7D /* nfrule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nfrule.h; sourceTree = "<group>"; }; + A9015C3419A9E8E800F7FC7D /* nfsubs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nfsubs.cpp; sourceTree = "<group>"; }; + A9015C3519A9E8E800F7FC7D /* nfsubs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nfsubs.h; sourceTree = "<group>"; }; + A9015C3619A9E8E800F7FC7D /* nortrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nortrans.cpp; sourceTree = "<group>"; }; + A9015C3719A9E8E800F7FC7D /* nortrans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nortrans.h; sourceTree = "<group>"; }; + A9015C3819A9E8E800F7FC7D /* nultrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nultrans.cpp; sourceTree = "<group>"; }; + A9015C3919A9E8E800F7FC7D /* nultrans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nultrans.h; sourceTree = "<group>"; }; + A9015C3A19A9E8E800F7FC7D /* numfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = numfmt.cpp; sourceTree = "<group>"; }; + A9015C3B19A9E8E800F7FC7D /* numsys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = numsys.cpp; sourceTree = "<group>"; }; + A9015C3C19A9E8E800F7FC7D /* numsys_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = numsys_impl.h; sourceTree = "<group>"; }; + A9015C3D19A9E8E800F7FC7D /* olsontz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = olsontz.cpp; sourceTree = "<group>"; }; + A9015C3E19A9E8E800F7FC7D /* olsontz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = olsontz.h; sourceTree = "<group>"; }; + A9015C3F19A9E8E800F7FC7D /* persncal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = persncal.cpp; sourceTree = "<group>"; }; + A9015C4019A9E8E800F7FC7D /* persncal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = persncal.h; sourceTree = "<group>"; }; + A9015C4119A9E8E800F7FC7D /* plurfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = plurfmt.cpp; sourceTree = "<group>"; }; + A9015C4219A9E8E800F7FC7D /* plurrule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = plurrule.cpp; sourceTree = "<group>"; }; + A9015C4319A9E8E800F7FC7D /* plurrule_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plurrule_impl.h; sourceTree = "<group>"; }; + A9015C4419A9E8E800F7FC7D /* quant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = quant.cpp; sourceTree = "<group>"; }; + A9015C4519A9E8E800F7FC7D /* quant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quant.h; sourceTree = "<group>"; }; + A9015C4619A9E8E800F7FC7D /* quantityformatter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = quantityformatter.cpp; sourceTree = "<group>"; }; + A9015C4719A9E8E800F7FC7D /* quantityformatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quantityformatter.h; sourceTree = "<group>"; }; + A9015C4819A9E8E800F7FC7D /* rbnf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbnf.cpp; sourceTree = "<group>"; }; + A9015C4919A9E8E800F7FC7D /* rbt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbt.cpp; sourceTree = "<group>"; }; + A9015C4A19A9E8E800F7FC7D /* rbt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbt.h; sourceTree = "<group>"; }; + A9015C4B19A9E8E800F7FC7D /* rbt_data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbt_data.cpp; sourceTree = "<group>"; }; + A9015C4C19A9E8E800F7FC7D /* rbt_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbt_data.h; sourceTree = "<group>"; }; + A9015C4D19A9E8E800F7FC7D /* rbt_pars.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbt_pars.cpp; sourceTree = "<group>"; }; + A9015C4E19A9E8E800F7FC7D /* rbt_pars.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbt_pars.h; sourceTree = "<group>"; }; + A9015C4F19A9E8E800F7FC7D /* rbt_rule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbt_rule.cpp; sourceTree = "<group>"; }; + A9015C5019A9E8E800F7FC7D /* rbt_rule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbt_rule.h; sourceTree = "<group>"; }; + A9015C5119A9E8E800F7FC7D /* rbt_set.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbt_set.cpp; sourceTree = "<group>"; }; + A9015C5219A9E8E800F7FC7D /* rbt_set.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rbt_set.h; sourceTree = "<group>"; }; + A9015C5319A9E8E800F7FC7D /* rbtz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rbtz.cpp; sourceTree = "<group>"; }; + A9015C5419A9E8E800F7FC7D /* regexcmp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regexcmp.cpp; sourceTree = "<group>"; }; + A9015C5519A9E8E800F7FC7D /* regexcmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = regexcmp.h; sourceTree = "<group>"; }; + A9015C5619A9E8E800F7FC7D /* regexcst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = regexcst.h; sourceTree = "<group>"; }; + A9015C5919A9E8E800F7FC7D /* regeximp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regeximp.cpp; sourceTree = "<group>"; }; + A9015C5A19A9E8E800F7FC7D /* regeximp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = regeximp.h; sourceTree = "<group>"; }; + A9015C5B19A9E8E800F7FC7D /* regexst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regexst.cpp; sourceTree = "<group>"; }; + A9015C5C19A9E8E800F7FC7D /* regexst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = regexst.h; sourceTree = "<group>"; }; + A9015C5D19A9E8E800F7FC7D /* regextxt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regextxt.cpp; sourceTree = "<group>"; }; + A9015C5E19A9E8E800F7FC7D /* regextxt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = regextxt.h; sourceTree = "<group>"; }; + A9015C5F19A9E8E800F7FC7D /* region.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = region.cpp; sourceTree = "<group>"; }; + A9015C6019A9E8E800F7FC7D /* region_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = region_impl.h; sourceTree = "<group>"; }; + A9015C6119A9E8E800F7FC7D /* reldatefmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reldatefmt.cpp; sourceTree = "<group>"; }; + A9015C6219A9E8E800F7FC7D /* reldtfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reldtfmt.cpp; sourceTree = "<group>"; }; + A9015C6319A9E8E800F7FC7D /* reldtfmt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reldtfmt.h; sourceTree = "<group>"; }; + A9015C6419A9E8E800F7FC7D /* rematch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rematch.cpp; sourceTree = "<group>"; }; + A9015C6519A9E8E800F7FC7D /* remtrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = remtrans.cpp; sourceTree = "<group>"; }; + A9015C6619A9E8E800F7FC7D /* remtrans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = remtrans.h; sourceTree = "<group>"; }; + A9015C6719A9E8E800F7FC7D /* repattrn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repattrn.cpp; sourceTree = "<group>"; }; + A9015C6819A9E8E800F7FC7D /* rulebasedcollator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rulebasedcollator.cpp; sourceTree = "<group>"; }; + A9015C6919A9E8E800F7FC7D /* scriptset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scriptset.cpp; sourceTree = "<group>"; }; + A9015C6A19A9E8E800F7FC7D /* scriptset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scriptset.h; sourceTree = "<group>"; }; + A9015C6B19A9E8E800F7FC7D /* search.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search.cpp; sourceTree = "<group>"; }; + A9015C6C19A9E8E800F7FC7D /* selfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = selfmt.cpp; sourceTree = "<group>"; }; + A9015C6D19A9E8E800F7FC7D /* selfmtimpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selfmtimpl.h; sourceTree = "<group>"; }; + A9015C6E19A9E8E800F7FC7D /* sharednumberformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sharednumberformat.h; sourceTree = "<group>"; }; + A9015C6F19A9E8E800F7FC7D /* sharedpluralrules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sharedpluralrules.h; sourceTree = "<group>"; }; + A9015C7019A9E8E800F7FC7D /* simpletz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = simpletz.cpp; sourceTree = "<group>"; }; + A9015C7119A9E8E800F7FC7D /* smpdtfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smpdtfmt.cpp; sourceTree = "<group>"; }; + A9015C7219A9E8E800F7FC7D /* smpdtfst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smpdtfst.cpp; sourceTree = "<group>"; }; + A9015C7319A9E8E800F7FC7D /* smpdtfst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smpdtfst.h; sourceTree = "<group>"; }; + A9015C7419A9E8E800F7FC7D /* sortkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sortkey.cpp; sourceTree = "<group>"; }; + A9015C7519A9E8E800F7FC7D /* strmatch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strmatch.cpp; sourceTree = "<group>"; }; + A9015C7619A9E8E800F7FC7D /* strmatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strmatch.h; sourceTree = "<group>"; }; + A9015C7719A9E8E800F7FC7D /* strrepl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strrepl.cpp; sourceTree = "<group>"; }; + A9015C7819A9E8E800F7FC7D /* strrepl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strrepl.h; sourceTree = "<group>"; }; + A9015C7919A9E8E800F7FC7D /* stsearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stsearch.cpp; sourceTree = "<group>"; }; + A9015C7A19A9E8E800F7FC7D /* taiwncal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taiwncal.cpp; sourceTree = "<group>"; }; + A9015C7B19A9E8E800F7FC7D /* taiwncal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = taiwncal.h; sourceTree = "<group>"; }; + A9015C7C19A9E8E800F7FC7D /* timezone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timezone.cpp; sourceTree = "<group>"; }; + A9015C7D19A9E8E800F7FC7D /* titletrn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = titletrn.cpp; sourceTree = "<group>"; }; + A9015C7E19A9E8E800F7FC7D /* titletrn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = titletrn.h; sourceTree = "<group>"; }; + A9015C7F19A9E8E800F7FC7D /* tmunit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tmunit.cpp; sourceTree = "<group>"; }; + A9015C8019A9E8E800F7FC7D /* tmutamt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tmutamt.cpp; sourceTree = "<group>"; }; + A9015C8119A9E8E800F7FC7D /* tmutfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tmutfmt.cpp; sourceTree = "<group>"; }; + A9015C8219A9E8E800F7FC7D /* tolowtrn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tolowtrn.cpp; sourceTree = "<group>"; }; + A9015C8319A9E8E800F7FC7D /* tolowtrn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tolowtrn.h; sourceTree = "<group>"; }; + A9015C8419A9E8E800F7FC7D /* toupptrn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = toupptrn.cpp; sourceTree = "<group>"; }; + A9015C8519A9E8E800F7FC7D /* toupptrn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = toupptrn.h; sourceTree = "<group>"; }; + A9015C8619A9E8E800F7FC7D /* translit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translit.cpp; sourceTree = "<group>"; }; + A9015C8719A9E8E800F7FC7D /* transreg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transreg.cpp; sourceTree = "<group>"; }; + A9015C8819A9E8E800F7FC7D /* transreg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = transreg.h; sourceTree = "<group>"; }; + A9015C8919A9E8E800F7FC7D /* tridpars.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tridpars.cpp; sourceTree = "<group>"; }; + A9015C8A19A9E8E800F7FC7D /* tridpars.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tridpars.h; sourceTree = "<group>"; }; + A9015C8B19A9E8E800F7FC7D /* tzfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tzfmt.cpp; sourceTree = "<group>"; }; + A9015C8C19A9E8E800F7FC7D /* tzgnames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tzgnames.cpp; sourceTree = "<group>"; }; + A9015C8D19A9E8E800F7FC7D /* tzgnames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tzgnames.h; sourceTree = "<group>"; }; + A9015C8E19A9E8E800F7FC7D /* tznames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tznames.cpp; sourceTree = "<group>"; }; + A9015C8F19A9E8E800F7FC7D /* tznames_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tznames_impl.cpp; sourceTree = "<group>"; }; + A9015C9019A9E8E800F7FC7D /* tznames_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tznames_impl.h; sourceTree = "<group>"; }; + A9015C9119A9E8E800F7FC7D /* tzrule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tzrule.cpp; sourceTree = "<group>"; }; + A9015C9219A9E8E800F7FC7D /* tztrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tztrans.cpp; sourceTree = "<group>"; }; + A9015C9319A9E8E800F7FC7D /* ucal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucal.cpp; sourceTree = "<group>"; }; + A9015C9419A9E8E800F7FC7D /* ucln_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucln_in.c; sourceTree = "<group>"; }; + A9015C9519A9E8E800F7FC7D /* ucln_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucln_in.h; sourceTree = "<group>"; }; + A9015C9619A9E8E800F7FC7D /* ucol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucol.cpp; sourceTree = "<group>"; }; + A9015C9719A9E8E800F7FC7D /* ucol_imp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucol_imp.h; sourceTree = "<group>"; }; + A9015C9819A9E8E800F7FC7D /* ucol_res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucol_res.cpp; sourceTree = "<group>"; }; + A9015C9919A9E8E800F7FC7D /* ucol_sit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucol_sit.cpp; sourceTree = "<group>"; }; + A9015C9A19A9E8E800F7FC7D /* ucoleitr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucoleitr.cpp; sourceTree = "<group>"; }; + A9015C9B19A9E8E800F7FC7D /* ucsdet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucsdet.cpp; sourceTree = "<group>"; }; + A9015C9C19A9E8E800F7FC7D /* ucurr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucurr.cpp; sourceTree = "<group>"; }; + A9015C9D19A9E8E800F7FC7D /* ucurrimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucurrimp.h; sourceTree = "<group>"; }; + A9015C9E19A9E8E800F7FC7D /* udat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = udat.cpp; sourceTree = "<group>"; }; + A9015C9F19A9E8E800F7FC7D /* udateintervalformat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = udateintervalformat.cpp; sourceTree = "<group>"; }; + A9015CA019A9E8E800F7FC7D /* udatpg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = udatpg.cpp; sourceTree = "<group>"; }; + A9015CA119A9E8E800F7FC7D /* uitercollationiterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uitercollationiterator.cpp; sourceTree = "<group>"; }; + A9015CA219A9E8E800F7FC7D /* uitercollationiterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uitercollationiterator.h; sourceTree = "<group>"; }; + A9015CA319A9E8E800F7FC7D /* ulocdata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ulocdata.c; sourceTree = "<group>"; }; + A9015CA419A9E8E800F7FC7D /* umsg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = umsg.cpp; sourceTree = "<group>"; }; + A9015CA519A9E8E800F7FC7D /* umsg_imp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = umsg_imp.h; sourceTree = "<group>"; }; + A9015CA619A9E8E800F7FC7D /* unesctrn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unesctrn.cpp; sourceTree = "<group>"; }; + A9015CA719A9E8E800F7FC7D /* unesctrn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unesctrn.h; sourceTree = "<group>"; }; + A9015CA819A9E8E800F7FC7D /* uni2name.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uni2name.cpp; sourceTree = "<group>"; }; + A9015CA919A9E8E800F7FC7D /* uni2name.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uni2name.h; sourceTree = "<group>"; }; + A9015CFB19A9E8E800F7FC7D /* unum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unum.cpp; sourceTree = "<group>"; }; + A9015CFC19A9E8E800F7FC7D /* unumsys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unumsys.cpp; sourceTree = "<group>"; }; + A9015CFD19A9E8E800F7FC7D /* upluralrules.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = upluralrules.cpp; sourceTree = "<group>"; }; + A9015CFE19A9E8E800F7FC7D /* uregex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uregex.cpp; sourceTree = "<group>"; }; + A9015CFF19A9E8E800F7FC7D /* uregexc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uregexc.cpp; sourceTree = "<group>"; }; + A9015D0019A9E8E800F7FC7D /* uregion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uregion.cpp; sourceTree = "<group>"; }; + A9015D0119A9E8E800F7FC7D /* usearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = usearch.cpp; sourceTree = "<group>"; }; + A9015D0219A9E8E800F7FC7D /* uspoof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uspoof.cpp; sourceTree = "<group>"; }; + A9015D0319A9E8E800F7FC7D /* uspoof_build.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uspoof_build.cpp; sourceTree = "<group>"; }; + A9015D0419A9E8E800F7FC7D /* uspoof_conf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uspoof_conf.cpp; sourceTree = "<group>"; }; + A9015D0519A9E8E800F7FC7D /* uspoof_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uspoof_conf.h; sourceTree = "<group>"; }; + A9015D0619A9E8E800F7FC7D /* uspoof_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uspoof_impl.cpp; sourceTree = "<group>"; }; + A9015D0719A9E8E800F7FC7D /* uspoof_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uspoof_impl.h; sourceTree = "<group>"; }; + A9015D0819A9E8E800F7FC7D /* uspoof_wsconf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uspoof_wsconf.cpp; sourceTree = "<group>"; }; + A9015D0919A9E8E800F7FC7D /* uspoof_wsconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uspoof_wsconf.h; sourceTree = "<group>"; }; + A9015D0A19A9E8E800F7FC7D /* usrchimp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usrchimp.h; sourceTree = "<group>"; }; + A9015D0B19A9E8E800F7FC7D /* utf16collationiterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf16collationiterator.cpp; sourceTree = "<group>"; }; + A9015D0C19A9E8E800F7FC7D /* utf16collationiterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf16collationiterator.h; sourceTree = "<group>"; }; + A9015D0D19A9E8E800F7FC7D /* utf8collationiterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8collationiterator.cpp; sourceTree = "<group>"; }; + A9015D0E19A9E8E800F7FC7D /* utf8collationiterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8collationiterator.h; sourceTree = "<group>"; }; + A9015D0F19A9E8E800F7FC7D /* utmscale.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utmscale.c; sourceTree = "<group>"; }; + A9015D1019A9E8E800F7FC7D /* utrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utrans.cpp; sourceTree = "<group>"; }; + A9015D1119A9E8E800F7FC7D /* vtzone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vtzone.cpp; sourceTree = "<group>"; }; + A9015D1219A9E8E800F7FC7D /* vzone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vzone.cpp; sourceTree = "<group>"; }; + A9015D1319A9E8E800F7FC7D /* vzone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vzone.h; sourceTree = "<group>"; }; + A9015D1419A9E8E800F7FC7D /* windtfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = windtfmt.cpp; sourceTree = "<group>"; }; + A9015D1519A9E8E800F7FC7D /* windtfmt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = windtfmt.h; sourceTree = "<group>"; }; + A9015D1619A9E8E800F7FC7D /* winnmfmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winnmfmt.cpp; sourceTree = "<group>"; }; + A9015D1719A9E8E800F7FC7D /* winnmfmt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winnmfmt.h; sourceTree = "<group>"; }; + A9015D1819A9E8E800F7FC7D /* wintzimpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wintzimpl.cpp; sourceTree = "<group>"; }; + A9015D1919A9E8E800F7FC7D /* wintzimpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wintzimpl.h; sourceTree = "<group>"; }; + A9015D1A19A9E8E800F7FC7D /* zonemeta.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zonemeta.cpp; sourceTree = "<group>"; }; + A9015D1B19A9E8E800F7FC7D /* zonemeta.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zonemeta.h; sourceTree = "<group>"; }; + A9015D1C19A9E8E800F7FC7D /* zrule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zrule.cpp; sourceTree = "<group>"; }; + A9015D1D19A9E8E800F7FC7D /* zrule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zrule.h; sourceTree = "<group>"; }; + A9015D1E19A9E8E800F7FC7D /* ztrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ztrans.cpp; sourceTree = "<group>"; }; + A9015D1F19A9E8E800F7FC7D /* ztrans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ztrans.h; sourceTree = "<group>"; }; + A9015D2719A9E8E800F7FC7D /* locbund.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locbund.cpp; sourceTree = "<group>"; }; + A9015D2819A9E8E800F7FC7D /* locbund.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = locbund.h; sourceTree = "<group>"; }; + A9015D2B19A9E8E800F7FC7D /* sprintf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sprintf.c; sourceTree = "<group>"; }; + A9015D2C19A9E8E800F7FC7D /* sscanf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sscanf.c; sourceTree = "<group>"; }; + A9015D2D19A9E8E800F7FC7D /* ucln_io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ucln_io.c; sourceTree = "<group>"; }; + A9015D2E19A9E8E800F7FC7D /* ucln_io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucln_io.h; sourceTree = "<group>"; }; + A9015D2F19A9E8E800F7FC7D /* ufile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ufile.c; sourceTree = "<group>"; }; + A9015D3019A9E8E800F7FC7D /* ufile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ufile.h; sourceTree = "<group>"; }; + A9015D3119A9E8E800F7FC7D /* ufmt_cmn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ufmt_cmn.c; sourceTree = "<group>"; }; + A9015D3219A9E8E800F7FC7D /* ufmt_cmn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ufmt_cmn.h; sourceTree = "<group>"; }; + A9015D3619A9E8E800F7FC7D /* uprintf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uprintf.c; sourceTree = "<group>"; }; + A9015D3719A9E8E800F7FC7D /* uprintf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uprintf.h; sourceTree = "<group>"; }; + A9015D3819A9E8E800F7FC7D /* uprntf_p.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uprntf_p.c; sourceTree = "<group>"; }; + A9015D3919A9E8E800F7FC7D /* uscanf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uscanf.c; sourceTree = "<group>"; }; + A9015D3A19A9E8E800F7FC7D /* uscanf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uscanf.h; sourceTree = "<group>"; }; + A9015D3B19A9E8E800F7FC7D /* uscanf_p.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uscanf_p.c; sourceTree = "<group>"; }; + A9015D3C19A9E8E800F7FC7D /* ustdio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ustdio.c; sourceTree = "<group>"; }; + A9015D3D19A9E8E800F7FC7D /* ustream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustream.cpp; sourceTree = "<group>"; }; + A9015D3F19A9E8E800F7FC7D /* AlternateSubstSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AlternateSubstSubtables.cpp; sourceTree = "<group>"; }; + A9015D4019A9E8E800F7FC7D /* AlternateSubstSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternateSubstSubtables.h; sourceTree = "<group>"; }; + A9015D4119A9E8E800F7FC7D /* AnchorTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnchorTables.cpp; sourceTree = "<group>"; }; + A9015D4219A9E8E800F7FC7D /* AnchorTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnchorTables.h; sourceTree = "<group>"; }; + A9015D4319A9E8E800F7FC7D /* ArabicLayoutEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArabicLayoutEngine.cpp; sourceTree = "<group>"; }; + A9015D4419A9E8E800F7FC7D /* ArabicLayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArabicLayoutEngine.h; sourceTree = "<group>"; }; + A9015D4519A9E8E800F7FC7D /* ArabicShaping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArabicShaping.cpp; sourceTree = "<group>"; }; + A9015D4619A9E8E800F7FC7D /* ArabicShaping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArabicShaping.h; sourceTree = "<group>"; }; + A9015D4719A9E8E800F7FC7D /* AttachmentPosnSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttachmentPosnSubtables.h; sourceTree = "<group>"; }; + A9015D4819A9E8E800F7FC7D /* CanonData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CanonData.cpp; sourceTree = "<group>"; }; + A9015D4919A9E8E800F7FC7D /* CanonShaping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CanonShaping.cpp; sourceTree = "<group>"; }; + A9015D4A19A9E8E800F7FC7D /* CanonShaping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanonShaping.h; sourceTree = "<group>"; }; + A9015D4B19A9E8E800F7FC7D /* CharSubstitutionFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharSubstitutionFilter.h; sourceTree = "<group>"; }; + A9015D4C19A9E8E800F7FC7D /* ClassDefinitionTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClassDefinitionTables.cpp; sourceTree = "<group>"; }; + A9015D4D19A9E8E800F7FC7D /* ClassDefinitionTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClassDefinitionTables.h; sourceTree = "<group>"; }; + A9015D4E19A9E8E800F7FC7D /* ContextualGlyphInsertion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextualGlyphInsertion.h; sourceTree = "<group>"; }; + A9015D4F19A9E8E800F7FC7D /* ContextualGlyphInsertionProc2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextualGlyphInsertionProc2.cpp; sourceTree = "<group>"; }; + A9015D5019A9E8E800F7FC7D /* ContextualGlyphInsertionProc2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextualGlyphInsertionProc2.h; sourceTree = "<group>"; }; + A9015D5119A9E8E800F7FC7D /* ContextualGlyphSubstitution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextualGlyphSubstitution.h; sourceTree = "<group>"; }; + A9015D5219A9E8E800F7FC7D /* ContextualGlyphSubstProc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextualGlyphSubstProc.cpp; sourceTree = "<group>"; }; + A9015D5319A9E8E800F7FC7D /* ContextualGlyphSubstProc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextualGlyphSubstProc.h; sourceTree = "<group>"; }; + A9015D5419A9E8E800F7FC7D /* ContextualGlyphSubstProc2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextualGlyphSubstProc2.cpp; sourceTree = "<group>"; }; + A9015D5519A9E8E800F7FC7D /* ContextualGlyphSubstProc2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextualGlyphSubstProc2.h; sourceTree = "<group>"; }; + A9015D5619A9E8E800F7FC7D /* ContextualSubstSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextualSubstSubtables.cpp; sourceTree = "<group>"; }; + A9015D5719A9E8E800F7FC7D /* ContextualSubstSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextualSubstSubtables.h; sourceTree = "<group>"; }; + A9015D5819A9E8E800F7FC7D /* CoverageTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CoverageTables.cpp; sourceTree = "<group>"; }; + A9015D5919A9E8E800F7FC7D /* CoverageTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoverageTables.h; sourceTree = "<group>"; }; + A9015D5A19A9E8E800F7FC7D /* CursiveAttachmentSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CursiveAttachmentSubtables.cpp; sourceTree = "<group>"; }; + A9015D5B19A9E8E800F7FC7D /* CursiveAttachmentSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CursiveAttachmentSubtables.h; sourceTree = "<group>"; }; + A9015D5C19A9E8E800F7FC7D /* DefaultCharMapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DefaultCharMapper.h; sourceTree = "<group>"; }; + A9015D5D19A9E8E800F7FC7D /* DeviceTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeviceTables.cpp; sourceTree = "<group>"; }; + A9015D5E19A9E8E800F7FC7D /* DeviceTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceTables.h; sourceTree = "<group>"; }; + A9015D5F19A9E8E800F7FC7D /* ExtensionSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtensionSubtables.cpp; sourceTree = "<group>"; }; + A9015D6019A9E8E800F7FC7D /* ExtensionSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtensionSubtables.h; sourceTree = "<group>"; }; + A9015D6119A9E8E800F7FC7D /* Features.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Features.cpp; sourceTree = "<group>"; }; + A9015D6219A9E8E800F7FC7D /* GDEFMarkFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GDEFMarkFilter.cpp; sourceTree = "<group>"; }; + A9015D6319A9E8E800F7FC7D /* GDEFMarkFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GDEFMarkFilter.h; sourceTree = "<group>"; }; + A9015D6419A9E8E800F7FC7D /* GlyphDefinitionTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphDefinitionTables.cpp; sourceTree = "<group>"; }; + A9015D6519A9E8E800F7FC7D /* GlyphDefinitionTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlyphDefinitionTables.h; sourceTree = "<group>"; }; + A9015D6619A9E8E800F7FC7D /* GlyphIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphIterator.cpp; sourceTree = "<group>"; }; + A9015D6719A9E8E800F7FC7D /* GlyphIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlyphIterator.h; sourceTree = "<group>"; }; + A9015D6819A9E8E800F7FC7D /* GlyphLookupTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphLookupTables.cpp; sourceTree = "<group>"; }; + A9015D6919A9E8E800F7FC7D /* GlyphLookupTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlyphLookupTables.h; sourceTree = "<group>"; }; + A9015D6A19A9E8E800F7FC7D /* GlyphPositionAdjustments.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphPositionAdjustments.cpp; sourceTree = "<group>"; }; + A9015D6B19A9E8E800F7FC7D /* GlyphPositionAdjustments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlyphPositionAdjustments.h; sourceTree = "<group>"; }; + A9015D6C19A9E8E800F7FC7D /* GlyphPositioningTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphPositioningTables.cpp; sourceTree = "<group>"; }; + A9015D6D19A9E8E800F7FC7D /* GlyphPositioningTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlyphPositioningTables.h; sourceTree = "<group>"; }; + A9015D6E19A9E8E800F7FC7D /* GlyphPosnLookupProc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphPosnLookupProc.cpp; sourceTree = "<group>"; }; + A9015D6F19A9E8E800F7FC7D /* GlyphPosnLookupProc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlyphPosnLookupProc.h; sourceTree = "<group>"; }; + A9015D7019A9E8E800F7FC7D /* GlyphSubstitutionTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphSubstitutionTables.cpp; sourceTree = "<group>"; }; + A9015D7119A9E8E800F7FC7D /* GlyphSubstitutionTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlyphSubstitutionTables.h; sourceTree = "<group>"; }; + A9015D7219A9E8E800F7FC7D /* GlyphSubstLookupProc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphSubstLookupProc.cpp; sourceTree = "<group>"; }; + A9015D7319A9E8E800F7FC7D /* GlyphSubstLookupProc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlyphSubstLookupProc.h; sourceTree = "<group>"; }; + A9015D7419A9E8E800F7FC7D /* GXLayoutEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GXLayoutEngine.cpp; sourceTree = "<group>"; }; + A9015D7519A9E8E800F7FC7D /* GXLayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXLayoutEngine.h; sourceTree = "<group>"; }; + A9015D7619A9E8E800F7FC7D /* GXLayoutEngine2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GXLayoutEngine2.cpp; sourceTree = "<group>"; }; + A9015D7719A9E8E800F7FC7D /* GXLayoutEngine2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXLayoutEngine2.h; sourceTree = "<group>"; }; + A9015D7819A9E8E800F7FC7D /* HangulLayoutEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HangulLayoutEngine.cpp; sourceTree = "<group>"; }; + A9015D7919A9E8E800F7FC7D /* HangulLayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HangulLayoutEngine.h; sourceTree = "<group>"; }; + A9015D7A19A9E8E800F7FC7D /* HanLayoutEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HanLayoutEngine.cpp; sourceTree = "<group>"; }; + A9015D7B19A9E8E800F7FC7D /* HanLayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HanLayoutEngine.h; sourceTree = "<group>"; }; + A9015D7C19A9E8E800F7FC7D /* ICUFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICUFeatures.h; sourceTree = "<group>"; }; + A9015D7D19A9E8E800F7FC7D /* IndicClassTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndicClassTables.cpp; sourceTree = "<group>"; }; + A9015D7E19A9E8E800F7FC7D /* IndicLayoutEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndicLayoutEngine.cpp; sourceTree = "<group>"; }; + A9015D7F19A9E8E800F7FC7D /* IndicLayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndicLayoutEngine.h; sourceTree = "<group>"; }; + A9015D8019A9E8E800F7FC7D /* IndicRearrangement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndicRearrangement.h; sourceTree = "<group>"; }; + A9015D8119A9E8E800F7FC7D /* IndicRearrangementProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndicRearrangementProcessor.cpp; sourceTree = "<group>"; }; + A9015D8219A9E8E800F7FC7D /* IndicRearrangementProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndicRearrangementProcessor.h; sourceTree = "<group>"; }; + A9015D8319A9E8E800F7FC7D /* IndicRearrangementProcessor2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndicRearrangementProcessor2.cpp; sourceTree = "<group>"; }; + A9015D8419A9E8E800F7FC7D /* IndicRearrangementProcessor2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndicRearrangementProcessor2.h; sourceTree = "<group>"; }; + A9015D8519A9E8E800F7FC7D /* IndicReordering.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndicReordering.cpp; sourceTree = "<group>"; }; + A9015D8619A9E8E800F7FC7D /* IndicReordering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndicReordering.h; sourceTree = "<group>"; }; + A9015D8719A9E8E800F7FC7D /* KernTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KernTable.cpp; sourceTree = "<group>"; }; + A9015D8819A9E8E800F7FC7D /* KernTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KernTable.h; sourceTree = "<group>"; }; + A9015D8919A9E8E800F7FC7D /* KhmerLayoutEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KhmerLayoutEngine.cpp; sourceTree = "<group>"; }; + A9015D8A19A9E8E800F7FC7D /* KhmerLayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KhmerLayoutEngine.h; sourceTree = "<group>"; }; + A9015D8B19A9E8E800F7FC7D /* KhmerReordering.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KhmerReordering.cpp; sourceTree = "<group>"; }; + A9015D8C19A9E8E800F7FC7D /* KhmerReordering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KhmerReordering.h; sourceTree = "<group>"; }; + A9015D9019A9E8E800F7FC7D /* LayoutEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutEngine.cpp; sourceTree = "<group>"; }; + A9015D9119A9E8E800F7FC7D /* LayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutEngine.h; sourceTree = "<group>"; }; + A9015D9219A9E8E800F7FC7D /* LayoutTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutTables.h; sourceTree = "<group>"; }; + A9015D9319A9E8E800F7FC7D /* LEFontInstance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LEFontInstance.cpp; sourceTree = "<group>"; }; + A9015D9419A9E8E800F7FC7D /* LEFontInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LEFontInstance.h; sourceTree = "<group>"; }; + A9015D9519A9E8E800F7FC7D /* LEGlyphFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LEGlyphFilter.h; sourceTree = "<group>"; }; + A9015D9619A9E8E800F7FC7D /* LEGlyphStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LEGlyphStorage.cpp; sourceTree = "<group>"; }; + A9015D9719A9E8E800F7FC7D /* LEGlyphStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LEGlyphStorage.h; sourceTree = "<group>"; }; + A9015D9819A9E8E800F7FC7D /* LEInsertionList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LEInsertionList.cpp; sourceTree = "<group>"; }; + A9015D9919A9E8E800F7FC7D /* LEInsertionList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LEInsertionList.h; sourceTree = "<group>"; }; + A9015D9A19A9E8E800F7FC7D /* LELanguages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LELanguages.h; sourceTree = "<group>"; }; + A9015D9B19A9E8E800F7FC7D /* LEScripts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LEScripts.h; sourceTree = "<group>"; }; + A9015D9C19A9E8E800F7FC7D /* LESwaps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LESwaps.h; sourceTree = "<group>"; }; + A9015D9D19A9E8E800F7FC7D /* LETableReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LETableReference.h; sourceTree = "<group>"; }; + A9015D9E19A9E8E800F7FC7D /* LETypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LETypes.h; sourceTree = "<group>"; }; + A9015D9F19A9E8E800F7FC7D /* LigatureSubstitution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LigatureSubstitution.h; sourceTree = "<group>"; }; + A9015DA019A9E8E800F7FC7D /* LigatureSubstProc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LigatureSubstProc.cpp; sourceTree = "<group>"; }; + A9015DA119A9E8E800F7FC7D /* LigatureSubstProc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LigatureSubstProc.h; sourceTree = "<group>"; }; + A9015DA219A9E8E800F7FC7D /* LigatureSubstProc2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LigatureSubstProc2.cpp; sourceTree = "<group>"; }; + A9015DA319A9E8E800F7FC7D /* LigatureSubstProc2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LigatureSubstProc2.h; sourceTree = "<group>"; }; + A9015DA419A9E8E800F7FC7D /* LigatureSubstSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LigatureSubstSubtables.cpp; sourceTree = "<group>"; }; + A9015DA519A9E8E800F7FC7D /* LigatureSubstSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LigatureSubstSubtables.h; sourceTree = "<group>"; }; + A9015DA619A9E8E800F7FC7D /* loengine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = loengine.cpp; sourceTree = "<group>"; }; + A9015DA719A9E8E800F7FC7D /* loengine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = loengine.h; sourceTree = "<group>"; }; + A9015DA819A9E8E800F7FC7D /* LookupProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LookupProcessor.cpp; sourceTree = "<group>"; }; + A9015DA919A9E8E800F7FC7D /* LookupProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LookupProcessor.h; sourceTree = "<group>"; }; + A9015DAA19A9E8E800F7FC7D /* Lookups.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lookups.cpp; sourceTree = "<group>"; }; + A9015DAB19A9E8E800F7FC7D /* Lookups.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lookups.h; sourceTree = "<group>"; }; + A9015DAC19A9E8E800F7FC7D /* LookupTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LookupTables.cpp; sourceTree = "<group>"; }; + A9015DAD19A9E8E800F7FC7D /* LookupTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LookupTables.h; sourceTree = "<group>"; }; + A9015DB019A9E8E800F7FC7D /* MarkArrays.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MarkArrays.cpp; sourceTree = "<group>"; }; + A9015DB119A9E8E800F7FC7D /* MarkArrays.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkArrays.h; sourceTree = "<group>"; }; + A9015DB219A9E8E800F7FC7D /* MarkToBasePosnSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MarkToBasePosnSubtables.cpp; sourceTree = "<group>"; }; + A9015DB319A9E8E800F7FC7D /* MarkToBasePosnSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkToBasePosnSubtables.h; sourceTree = "<group>"; }; + A9015DB419A9E8E800F7FC7D /* MarkToLigaturePosnSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MarkToLigaturePosnSubtables.cpp; sourceTree = "<group>"; }; + A9015DB519A9E8E800F7FC7D /* MarkToLigaturePosnSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkToLigaturePosnSubtables.h; sourceTree = "<group>"; }; + A9015DB619A9E8E800F7FC7D /* MarkToMarkPosnSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MarkToMarkPosnSubtables.cpp; sourceTree = "<group>"; }; + A9015DB719A9E8E800F7FC7D /* MarkToMarkPosnSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkToMarkPosnSubtables.h; sourceTree = "<group>"; }; + A9015DB819A9E8E800F7FC7D /* MirroredCharData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MirroredCharData.cpp; sourceTree = "<group>"; }; + A9015DB919A9E8E800F7FC7D /* MorphStateTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MorphStateTables.h; sourceTree = "<group>"; }; + A9015DBA19A9E8E900F7FC7D /* MorphTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MorphTables.cpp; sourceTree = "<group>"; }; + A9015DBB19A9E8E900F7FC7D /* MorphTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MorphTables.h; sourceTree = "<group>"; }; + A9015DBC19A9E8E900F7FC7D /* MorphTables2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MorphTables2.cpp; sourceTree = "<group>"; }; + A9015DBD19A9E8E900F7FC7D /* MPreFixups.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MPreFixups.cpp; sourceTree = "<group>"; }; + A9015DBE19A9E8E900F7FC7D /* MPreFixups.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPreFixups.h; sourceTree = "<group>"; }; + A9015DBF19A9E8E900F7FC7D /* MultipleSubstSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultipleSubstSubtables.cpp; sourceTree = "<group>"; }; + A9015DC019A9E8E900F7FC7D /* MultipleSubstSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultipleSubstSubtables.h; sourceTree = "<group>"; }; + A9015DC119A9E8E900F7FC7D /* NonContextualGlyphSubst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonContextualGlyphSubst.h; sourceTree = "<group>"; }; + A9015DC219A9E8E900F7FC7D /* NonContextualGlyphSubstProc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NonContextualGlyphSubstProc.cpp; sourceTree = "<group>"; }; + A9015DC319A9E8E900F7FC7D /* NonContextualGlyphSubstProc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonContextualGlyphSubstProc.h; sourceTree = "<group>"; }; + A9015DC419A9E8E900F7FC7D /* NonContextualGlyphSubstProc2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NonContextualGlyphSubstProc2.cpp; sourceTree = "<group>"; }; + A9015DC519A9E8E900F7FC7D /* NonContextualGlyphSubstProc2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonContextualGlyphSubstProc2.h; sourceTree = "<group>"; }; + A9015DC619A9E8E900F7FC7D /* OpenTypeLayoutEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpenTypeLayoutEngine.cpp; sourceTree = "<group>"; }; + A9015DC719A9E8E900F7FC7D /* OpenTypeLayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenTypeLayoutEngine.h; sourceTree = "<group>"; }; + A9015DC819A9E8E900F7FC7D /* OpenTypeTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenTypeTables.h; sourceTree = "<group>"; }; + A9015DC919A9E8E900F7FC7D /* OpenTypeUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpenTypeUtilities.cpp; sourceTree = "<group>"; }; + A9015DCA19A9E8E900F7FC7D /* OpenTypeUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenTypeUtilities.h; sourceTree = "<group>"; }; + A9015DCB19A9E8E900F7FC7D /* PairPositioningSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PairPositioningSubtables.cpp; sourceTree = "<group>"; }; + A9015DCC19A9E8E900F7FC7D /* PairPositioningSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PairPositioningSubtables.h; sourceTree = "<group>"; }; + A9015DCD19A9E8E900F7FC7D /* ScriptAndLanguage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptAndLanguage.cpp; sourceTree = "<group>"; }; + A9015DCE19A9E8E900F7FC7D /* ScriptAndLanguage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptAndLanguage.h; sourceTree = "<group>"; }; + A9015DCF19A9E8E900F7FC7D /* ScriptAndLanguageTags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptAndLanguageTags.cpp; sourceTree = "<group>"; }; + A9015DD019A9E8E900F7FC7D /* ScriptAndLanguageTags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptAndLanguageTags.h; sourceTree = "<group>"; }; + A9015DD119A9E8E900F7FC7D /* SegmentArrayProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentArrayProcessor.cpp; sourceTree = "<group>"; }; + A9015DD219A9E8E900F7FC7D /* SegmentArrayProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentArrayProcessor.h; sourceTree = "<group>"; }; + A9015DD319A9E8E900F7FC7D /* SegmentArrayProcessor2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentArrayProcessor2.cpp; sourceTree = "<group>"; }; + A9015DD419A9E8E900F7FC7D /* SegmentArrayProcessor2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentArrayProcessor2.h; sourceTree = "<group>"; }; + A9015DD519A9E8E900F7FC7D /* SegmentSingleProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentSingleProcessor.cpp; sourceTree = "<group>"; }; + A9015DD619A9E8E900F7FC7D /* SegmentSingleProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentSingleProcessor.h; sourceTree = "<group>"; }; + A9015DD719A9E8E900F7FC7D /* SegmentSingleProcessor2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentSingleProcessor2.cpp; sourceTree = "<group>"; }; + A9015DD819A9E8E900F7FC7D /* SegmentSingleProcessor2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentSingleProcessor2.h; sourceTree = "<group>"; }; + A9015DD919A9E8E900F7FC7D /* ShapingTypeData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapingTypeData.cpp; sourceTree = "<group>"; }; + A9015DDA19A9E8E900F7FC7D /* SimpleArrayProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleArrayProcessor.cpp; sourceTree = "<group>"; }; + A9015DDB19A9E8E900F7FC7D /* SimpleArrayProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleArrayProcessor.h; sourceTree = "<group>"; }; + A9015DDC19A9E8E900F7FC7D /* SimpleArrayProcessor2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleArrayProcessor2.cpp; sourceTree = "<group>"; }; + A9015DDD19A9E8E900F7FC7D /* SimpleArrayProcessor2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleArrayProcessor2.h; sourceTree = "<group>"; }; + A9015DDE19A9E8E900F7FC7D /* SinglePositioningSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SinglePositioningSubtables.cpp; sourceTree = "<group>"; }; + A9015DDF19A9E8E900F7FC7D /* SinglePositioningSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SinglePositioningSubtables.h; sourceTree = "<group>"; }; + A9015DE019A9E8E900F7FC7D /* SingleSubstitutionSubtables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SingleSubstitutionSubtables.cpp; sourceTree = "<group>"; }; + A9015DE119A9E8E900F7FC7D /* SingleSubstitutionSubtables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleSubstitutionSubtables.h; sourceTree = "<group>"; }; + A9015DE219A9E8E900F7FC7D /* SingleTableProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SingleTableProcessor.cpp; sourceTree = "<group>"; }; + A9015DE319A9E8E900F7FC7D /* SingleTableProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleTableProcessor.h; sourceTree = "<group>"; }; + A9015DE419A9E8E900F7FC7D /* SingleTableProcessor2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SingleTableProcessor2.cpp; sourceTree = "<group>"; }; + A9015DE519A9E8E900F7FC7D /* SingleTableProcessor2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleTableProcessor2.h; sourceTree = "<group>"; }; + A9015DE619A9E8E900F7FC7D /* StateTableProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StateTableProcessor.cpp; sourceTree = "<group>"; }; + A9015DE719A9E8E900F7FC7D /* StateTableProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StateTableProcessor.h; sourceTree = "<group>"; }; + A9015DE819A9E8E900F7FC7D /* StateTableProcessor2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StateTableProcessor2.cpp; sourceTree = "<group>"; }; + A9015DE919A9E8E900F7FC7D /* StateTableProcessor2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StateTableProcessor2.h; sourceTree = "<group>"; }; + A9015DEA19A9E8E900F7FC7D /* StateTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StateTables.h; sourceTree = "<group>"; }; + A9015DEB19A9E8E900F7FC7D /* SubstitutionLookups.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SubstitutionLookups.cpp; sourceTree = "<group>"; }; + A9015DEC19A9E8E900F7FC7D /* SubstitutionLookups.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubstitutionLookups.h; sourceTree = "<group>"; }; + A9015DED19A9E8E900F7FC7D /* SubtableProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SubtableProcessor.cpp; sourceTree = "<group>"; }; + A9015DEE19A9E8E900F7FC7D /* SubtableProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubtableProcessor.h; sourceTree = "<group>"; }; + A9015DEF19A9E8E900F7FC7D /* SubtableProcessor2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SubtableProcessor2.cpp; sourceTree = "<group>"; }; + A9015DF019A9E8E900F7FC7D /* SubtableProcessor2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubtableProcessor2.h; sourceTree = "<group>"; }; + A9015DF119A9E8E900F7FC7D /* ThaiLayoutEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThaiLayoutEngine.cpp; sourceTree = "<group>"; }; + A9015DF219A9E8E900F7FC7D /* ThaiLayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThaiLayoutEngine.h; sourceTree = "<group>"; }; + A9015DF319A9E8E900F7FC7D /* ThaiShaping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThaiShaping.cpp; sourceTree = "<group>"; }; + A9015DF419A9E8E900F7FC7D /* ThaiShaping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThaiShaping.h; sourceTree = "<group>"; }; + A9015DF519A9E8E900F7FC7D /* ThaiStateTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThaiStateTables.cpp; sourceTree = "<group>"; }; + A9015DF619A9E8E900F7FC7D /* TibetanLayoutEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TibetanLayoutEngine.cpp; sourceTree = "<group>"; }; + A9015DF719A9E8E900F7FC7D /* TibetanLayoutEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TibetanLayoutEngine.h; sourceTree = "<group>"; }; + A9015DF819A9E8E900F7FC7D /* TibetanReordering.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TibetanReordering.cpp; sourceTree = "<group>"; }; + A9015DF919A9E8E900F7FC7D /* TibetanReordering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TibetanReordering.h; sourceTree = "<group>"; }; + A9015DFA19A9E8E900F7FC7D /* TrimmedArrayProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrimmedArrayProcessor.cpp; sourceTree = "<group>"; }; + A9015DFB19A9E8E900F7FC7D /* TrimmedArrayProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrimmedArrayProcessor.h; sourceTree = "<group>"; }; + A9015DFC19A9E8E900F7FC7D /* TrimmedArrayProcessor2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrimmedArrayProcessor2.cpp; sourceTree = "<group>"; }; + A9015DFD19A9E8E900F7FC7D /* TrimmedArrayProcessor2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrimmedArrayProcessor2.h; sourceTree = "<group>"; }; + A9015DFE19A9E8E900F7FC7D /* ValueRecords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ValueRecords.cpp; sourceTree = "<group>"; }; + A9015DFF19A9E8E900F7FC7D /* ValueRecords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValueRecords.h; sourceTree = "<group>"; }; + A90169D419AA15D500F7FC7D /* icudt53l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt53l.dat; path = dependencies/icu/source/data/in/icudt53l.dat; sourceTree = "<group>"; }; + A90169D719AA16A600F7FC7D /* stubdata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stubdata.c; path = stubdata/stubdata.c; sourceTree = "<group>"; }; A917AF2516B1BE38006367FC /* Tests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; }; A918B8E211C6697400024D84 /* SwordModuleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTest.h; path = ../test/SwordModuleTest.h; sourceTree = "<group>"; }; A918B8E311C6697400024D84 /* SwordModuleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTest.m; path = ../test/SwordModuleTest.m; sourceTree = "<group>"; }; @@ -758,8 +1876,6 @@ A954A83913EE98B30094E3FE /* rawcom4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawcom4.cpp; sourceTree = "<group>"; }; A954A83D13EE98B30094E3FE /* rawfiles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawfiles.cpp; sourceTree = "<group>"; }; A954A83E13EE98B30094E3FE /* swcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcom.cpp; sourceTree = "<group>"; }; - A954A84013EE98B30094E3FE /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; }; - A954A84113EE98B30094E3FE /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; }; A954A84213EE98B30094E3FE /* zcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zcom.cpp; sourceTree = "<group>"; }; A954A84513EE98B30094E3FE /* entriesblk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entriesblk.cpp; sourceTree = "<group>"; }; A954A84613EE98B30094E3FE /* lzsscomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lzsscomprs.cpp; sourceTree = "<group>"; }; @@ -858,7 +1974,6 @@ A954A8CE13EE98B30094E3FE /* ztext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ztext.cpp; sourceTree = "<group>"; }; A954A8D013EE98B30094E3FE /* ftplib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftplib.c; sourceTree = "<group>"; }; A954A8D113EE98B30094E3FE /* ftpparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftpparse.c; sourceTree = "<group>"; }; - A954A8D413EE98B30094E3FE /* regex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = regex.c; sourceTree = "<group>"; }; A954A8D513EE98B30094E3FE /* roman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = roman.cpp; sourceTree = "<group>"; }; A954A8D613EE98B30094E3FE /* swbuf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swbuf.cpp; sourceTree = "<group>"; }; A954A8D713EE98B30094E3FE /* swobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swobject.cpp; sourceTree = "<group>"; }; @@ -866,17 +1981,6 @@ A954A8DA13EE98B30094E3FE /* url.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url.cpp; sourceTree = "<group>"; }; A954A8DB13EE98B30094E3FE /* utilstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utilstr.cpp; sourceTree = "<group>"; }; A954A8DC13EE98B30094E3FE /* utilxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utilxml.cpp; sourceTree = "<group>"; }; - A954A8E113EE98B30094E3FE /* adler32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = "<group>"; }; - A954A8E213EE98B30094E3FE /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = "<group>"; }; - A954A8E313EE98B30094E3FE /* crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crc32.c; sourceTree = "<group>"; }; - A954A8E413EE98B30094E3FE /* deflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = deflate.c; sourceTree = "<group>"; }; - A954A8EB13EE98B30094E3FE /* inffast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inffast.c; sourceTree = "<group>"; }; - A954A8EE13EE98B30094E3FE /* inflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inflate.c; sourceTree = "<group>"; }; - A954A8EF13EE98B30094E3FE /* inftrees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inftrees.c; sourceTree = "<group>"; }; - A954A8F413EE98B30094E3FE /* trees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = trees.c; sourceTree = "<group>"; }; - A954A8F613EE98B30094E3FE /* uncompr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = "<group>"; }; - A954A8F713EE98B30094E3FE /* untgz.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = untgz.c; sourceTree = "<group>"; }; - A954A8F813EE98B30094E3FE /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = "<group>"; }; A954A9E413EE9A2B0094E3FE /* AnalysisHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnalysisHeader.cpp; sourceTree = "<group>"; }; A954A9E513EE9A2B0094E3FE /* AnalysisHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnalysisHeader.h; sourceTree = "<group>"; }; A954A9E613EE9A2B0094E3FE /* Analyzers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Analyzers.cpp; sourceTree = "<group>"; }; @@ -1110,22 +2214,16 @@ A954AAD313EE9A2B0094E3FE /* VoidList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoidList.h; sourceTree = "<group>"; }; A954AAD413EE9A2B0094E3FE /* VoidMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoidMap.h; sourceTree = "<group>"; }; A954AAD513EE9A2B0094E3FE /* CLucene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLucene.h; sourceTree = "<group>"; }; - A954ABC313EE9AB00094E3FE /* libsword.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsword.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; A954AC3213EE9F620094E3FE /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = SDKs/MacOSX10.7.sdk/usr/lib/libcurl.dylib; sourceTree = DEVELOPER_DIR; }; A954AC3413EE9FA10094E3FE /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = SDKs/MacOSX10.7.sdk/usr/lib/libicucore.dylib; sourceTree = DEVELOPER_DIR; }; A954AC3513EE9FA10094E3FE /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "SDKs/MacOSX10.7.sdk/usr/lib/libstdc++.dylib"; sourceTree = DEVELOPER_DIR; }; A954AC3613EE9FA10094E3FE /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = SDKs/MacOSX10.7.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; - A964658011C663E200640FAC /* SwordManagerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManagerTest.h; path = ../test/SwordManagerTest.h; sourceTree = "<group>"; }; - A964658111C663E200640FAC /* SwordManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordManagerTest.m; path = ../test/SwordManagerTest.m; sourceTree = "<group>"; }; - A96C233E176AF139008D714B /* gzclose.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzclose.c; sourceTree = "<group>"; }; - A96C2340176AF139008D714B /* gzlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzlib.c; sourceTree = "<group>"; }; - A96C2341176AF139008D714B /* gzread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzread.c; sourceTree = "<group>"; }; - A96C2342176AF139008D714B /* gzwrite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzwrite.c; sourceTree = "<group>"; }; - A96C2343176AF139008D714B /* infback.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = infback.c; sourceTree = "<group>"; }; + A968BE4B19DFF831002C9B78 /* Tests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Bridging-Header.h"; sourceTree = "<group>"; }; + A968BE4C19DFF832002C9B78 /* SwordBibleTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwordBibleTest.swift; sourceTree = "<group>"; }; + A969DC7A1DA1289100C8E976 /* SwordLocaleManagerTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwordLocaleManagerTest.swift; sourceTree = "<group>"; }; A96C2351176AF188008D714B /* remotetrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = remotetrans.cpp; sourceTree = "<group>"; }; A96C2353176AF19C008D714B /* osisenum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisenum.cpp; sourceTree = "<group>"; }; A96C2354176AF19C008D714B /* osisglosses.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisglosses.cpp; sourceTree = "<group>"; }; - A96C2355176AF19C008D714B /* osisxlit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisxlit.cpp; sourceTree = "<group>"; }; A96C2355176AF19C008D714B /* osisreferencelinks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisreferencelinks.cpp; sourceTree = "<group>"; }; A975EAC411C77862007C1532 /* ObjCSword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword.h; sourceTree = "<group>"; }; A975ED9811C7925C007C1532 /* imp2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2gbs.cpp; sourceTree = "<group>"; }; @@ -1145,24 +2243,240 @@ A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vs2osisreftxt.cpp; sourceTree = "<group>"; }; A975EDDB11C7925C007C1532 /* xml2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml2gbs.cpp; sourceTree = "<group>"; }; A975EED911C792B9007C1532 /* mod2osis */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2osis; sourceTree = BUILT_PRODUCTS_DIR; }; + A982037319A09AE500DD808C /* zcom4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zcom4.cpp; sourceTree = "<group>"; }; + A982037719A09B5C00DD808C /* zverse4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zverse4.cpp; sourceTree = "<group>"; }; + A982037919A09B7800DD808C /* gbflatex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbflatex.cpp; sourceTree = "<group>"; }; + A982037A19A09B7800DD808C /* osislatex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osislatex.cpp; sourceTree = "<group>"; }; + A982037B19A09B7800DD808C /* osisxlit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisxlit.cpp; sourceTree = "<group>"; }; + A982037C19A09B7800DD808C /* teilatex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teilatex.cpp; sourceTree = "<group>"; }; + A982037D19A09B7800DD808C /* thmllatex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmllatex.cpp; sourceTree = "<group>"; }; + A982038819A09BC000DD808C /* ztext4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ztext4.cpp; sourceTree = "<group>"; }; + A982039319A09FFD00DD808C /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; }; + A982039519A0A01200DD808C /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; + A982039719A0A02300DD808C /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; }; + A982039919A0A02C00DD808C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + A982039D19A0A5FA00DD808C /* scsuutf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scsuutf8.cpp; sourceTree = "<group>"; }; + A982039E19A0A5FA00DD808C /* utf8scsu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8scsu.cpp; sourceTree = "<group>"; }; A9921A1911FD9CA8002DAA72 /* libSword.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSword.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + A995E6091C8763B800843E13 /* SwordManagerTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwordManagerTest.swift; sourceTree = "<group>"; }; + A995E60B1C87678B00843E13 /* TestGlobals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestGlobals.h; sourceTree = "<group>"; }; + A995E6231C876E8900843E13 /* TestModules */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TestModules; path = TestResources/TestModules; sourceTree = "<group>"; }; + A995E6261C877DD000843E13 /* SwordManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SwordManagerTest.m; sourceTree = "<group>"; }; A999FF3917951C8900E65919 /* bz2comprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bz2comprs.cpp; sourceTree = "<group>"; }; - A999FF3A17951C8900E65919 /* xzcomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xzcomprs.cpp; sourceTree = "<group>"; }; - A999FF3D17951CA000E65919 /* scsuutf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scsuutf8.cpp; sourceTree = "<group>"; }; + A9A1291C19DF144D005BCBC1 /* bz2comprs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bz2comprs.h; sourceTree = "<group>"; }; + A9A1291D19DF144D005BCBC1 /* canon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon.h; sourceTree = "<group>"; }; + A9A1291E19DF144D005BCBC1 /* canon_abbrevs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_abbrevs.h; sourceTree = "<group>"; }; + A9A1291F19DF144D005BCBC1 /* canon_catholic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_catholic.h; sourceTree = "<group>"; }; + A9A1292019DF144D005BCBC1 /* canon_catholic2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_catholic2.h; sourceTree = "<group>"; }; + A9A1292119DF144D005BCBC1 /* canon_german.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_german.h; sourceTree = "<group>"; }; + A9A1292219DF144D005BCBC1 /* canon_kjva.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_kjva.h; sourceTree = "<group>"; }; + A9A1292319DF144D005BCBC1 /* canon_leningrad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_leningrad.h; sourceTree = "<group>"; }; + A9A1292419DF144D005BCBC1 /* canon_luther.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_luther.h; sourceTree = "<group>"; }; + A9A1292519DF144D005BCBC1 /* canon_lxx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_lxx.h; sourceTree = "<group>"; }; + A9A1292619DF144D005BCBC1 /* canon_mt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_mt.h; sourceTree = "<group>"; }; + A9A1292719DF144D005BCBC1 /* canon_nrsv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_nrsv.h; sourceTree = "<group>"; }; + A9A1292819DF144D005BCBC1 /* canon_nrsva.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_nrsva.h; sourceTree = "<group>"; }; + A9A1292919DF144D005BCBC1 /* canon_null.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_null.h; sourceTree = "<group>"; }; + A9A1292A19DF144D005BCBC1 /* canon_orthodox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_orthodox.h; sourceTree = "<group>"; }; + A9A1292B19DF144D005BCBC1 /* canon_synodal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_synodal.h; sourceTree = "<group>"; }; + A9A1292C19DF144D005BCBC1 /* canon_synodalprot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_synodalprot.h; sourceTree = "<group>"; }; + A9A1292D19DF144D005BCBC1 /* canon_vulg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_vulg.h; sourceTree = "<group>"; }; + A9A1292E19DF144D005BCBC1 /* cipherfil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cipherfil.h; sourceTree = "<group>"; }; + A9A1293019DF144D005BCBC1 /* curlftpt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curlftpt.h; sourceTree = "<group>"; }; + A9A1293119DF144D005BCBC1 /* curlhttpt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curlhttpt.h; sourceTree = "<group>"; }; + A9A1293219DF144D005BCBC1 /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = "<group>"; }; + A9A1293319DF144D005BCBC1 /* echomod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = echomod.h; sourceTree = "<group>"; }; + A9A1293419DF144D005BCBC1 /* encfiltmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = encfiltmgr.h; sourceTree = "<group>"; }; + A9A1293519DF144D005BCBC1 /* entriesblk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entriesblk.h; sourceTree = "<group>"; }; + A9A1293619DF144D005BCBC1 /* femain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = femain.h; sourceTree = "<group>"; }; + A9A1293719DF144D005BCBC1 /* filemgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filemgr.h; sourceTree = "<group>"; }; + A9A1293819DF144D005BCBC1 /* flatapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flatapi.h; sourceTree = "<group>"; }; + A9A1293919DF144D005BCBC1 /* ftplib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ftplib.h; sourceTree = "<group>"; }; + A9A1293A19DF144D005BCBC1 /* ftplibftpt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ftplibftpt.h; sourceTree = "<group>"; }; + A9A1293B19DF144D005BCBC1 /* ftpparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ftpparse.h; sourceTree = "<group>"; }; + A9A1293C19DF144D005BCBC1 /* gbffootnotes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbffootnotes.h; sourceTree = "<group>"; }; + A9A1293D19DF144D005BCBC1 /* gbfheadings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfheadings.h; sourceTree = "<group>"; }; + A9A1293E19DF144D005BCBC1 /* gbfhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfhtml.h; sourceTree = "<group>"; }; + A9A1293F19DF144D005BCBC1 /* gbfhtmlhref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfhtmlhref.h; sourceTree = "<group>"; }; + A9A1294019DF144D005BCBC1 /* gbflatex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbflatex.h; sourceTree = "<group>"; }; + A9A1294119DF144D005BCBC1 /* gbfmorph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfmorph.h; sourceTree = "<group>"; }; + A9A1294219DF144D005BCBC1 /* gbfosis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfosis.h; sourceTree = "<group>"; }; + A9A1294319DF144D005BCBC1 /* gbfplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfplain.h; sourceTree = "<group>"; }; + A9A1294419DF144D005BCBC1 /* gbfredletterwords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfredletterwords.h; sourceTree = "<group>"; }; + A9A1294519DF144D005BCBC1 /* gbfrtf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfrtf.h; sourceTree = "<group>"; }; + A9A1294619DF144D005BCBC1 /* gbfstrongs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfstrongs.h; sourceTree = "<group>"; }; + A9A1294719DF144D005BCBC1 /* gbfthml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfthml.h; sourceTree = "<group>"; }; + A9A1294819DF144D005BCBC1 /* gbfwebif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfwebif.h; sourceTree = "<group>"; }; + A9A1294919DF144D005BCBC1 /* gbfwordjs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfwordjs.h; sourceTree = "<group>"; }; + A9A1294A19DF144D005BCBC1 /* gbfxhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfxhtml.h; sourceTree = "<group>"; }; + A9A1294B19DF144D005BCBC1 /* greeklexattribs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = greeklexattribs.h; sourceTree = "<group>"; }; + A9A1294C19DF144D005BCBC1 /* hebrewmcim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hebrewmcim.h; sourceTree = "<group>"; }; + A9A1294D19DF144D005BCBC1 /* hrefcom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hrefcom.h; sourceTree = "<group>"; }; + A9A1294E19DF144D005BCBC1 /* installmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = installmgr.h; sourceTree = "<group>"; }; + A9A1295119DF144D005BCBC1 /* regex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = regex.h; sourceTree = "<group>"; }; + A9A1295219DF144D005BCBC1 /* latin1utf16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = latin1utf16.h; sourceTree = "<group>"; }; + A9A1295319DF144D005BCBC1 /* latin1utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = latin1utf8.h; sourceTree = "<group>"; }; + A9A1295419DF144D005BCBC1 /* listkey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = listkey.h; sourceTree = "<group>"; }; + A9A1295519DF144D005BCBC1 /* localemgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = localemgr.h; sourceTree = "<group>"; }; + A9A1295619DF144D005BCBC1 /* lzsscomprs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzsscomprs.h; sourceTree = "<group>"; }; + A9A1295919DF144D005BCBC1 /* markupfiltmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = markupfiltmgr.h; sourceTree = "<group>"; }; + A9A1295A19DF144D005BCBC1 /* multimapwdef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = multimapwdef.h; sourceTree = "<group>"; }; + A9A1295B19DF144D005BCBC1 /* nullim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nullim.h; sourceTree = "<group>"; }; + A9A1295C19DF144D005BCBC1 /* osisenum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisenum.h; sourceTree = "<group>"; }; + A9A1295D19DF144D005BCBC1 /* osisfootnotes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisfootnotes.h; sourceTree = "<group>"; }; + A9A1295E19DF144D005BCBC1 /* osisglosses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisglosses.h; sourceTree = "<group>"; }; + A9A1295F19DF144D005BCBC1 /* osisheadings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisheadings.h; sourceTree = "<group>"; }; + A9A1296019DF144D005BCBC1 /* osishtmlhref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osishtmlhref.h; sourceTree = "<group>"; }; + A9A1296119DF144D005BCBC1 /* osislatex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osislatex.h; sourceTree = "<group>"; }; + A9A1296219DF144D005BCBC1 /* osislemma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osislemma.h; sourceTree = "<group>"; }; + A9A1296319DF144D005BCBC1 /* osismorph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osismorph.h; sourceTree = "<group>"; }; + A9A1296419DF144D005BCBC1 /* osismorphsegmentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osismorphsegmentation.h; sourceTree = "<group>"; }; + A9A1296519DF144D005BCBC1 /* osisosis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisosis.h; sourceTree = "<group>"; }; + A9A1296619DF144D005BCBC1 /* osisplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisplain.h; sourceTree = "<group>"; }; + A9A1296719DF144D005BCBC1 /* osisredletterwords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisredletterwords.h; sourceTree = "<group>"; }; + A9A1296819DF144D005BCBC1 /* osisreferencelinks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisreferencelinks.h; sourceTree = "<group>"; }; + A9A1296919DF144D005BCBC1 /* osisrtf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisrtf.h; sourceTree = "<group>"; }; + A9A1296A19DF144D005BCBC1 /* osisscripref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisscripref.h; sourceTree = "<group>"; }; + A9A1296B19DF144D005BCBC1 /* osisstrongs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisstrongs.h; sourceTree = "<group>"; }; + A9A1296C19DF144D005BCBC1 /* osisvariants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisvariants.h; sourceTree = "<group>"; }; + A9A1296D19DF144D005BCBC1 /* osiswebif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osiswebif.h; sourceTree = "<group>"; }; + A9A1296E19DF144D005BCBC1 /* osiswordjs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osiswordjs.h; sourceTree = "<group>"; }; + A9A1296F19DF144D005BCBC1 /* osisxhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisxhtml.h; sourceTree = "<group>"; }; + A9A1297019DF144D005BCBC1 /* osisxlit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisxlit.h; sourceTree = "<group>"; }; + A9A1297119DF144D005BCBC1 /* papyriplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = papyriplain.h; sourceTree = "<group>"; }; + A9A1297219DF144D005BCBC1 /* rawcom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawcom.h; sourceTree = "<group>"; }; + A9A1297319DF144D005BCBC1 /* rawcom4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawcom4.h; sourceTree = "<group>"; }; + A9A1297419DF144D005BCBC1 /* rawfiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawfiles.h; sourceTree = "<group>"; }; + A9A1297519DF144D005BCBC1 /* rawgenbook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawgenbook.h; sourceTree = "<group>"; }; + A9A1297619DF144D005BCBC1 /* rawld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawld.h; sourceTree = "<group>"; }; + A9A1297719DF144D005BCBC1 /* rawld4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawld4.h; sourceTree = "<group>"; }; + A9A1297819DF144D005BCBC1 /* rawstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawstr.h; sourceTree = "<group>"; }; + A9A1297919DF144D005BCBC1 /* rawstr4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawstr4.h; sourceTree = "<group>"; }; + A9A1297A19DF144D005BCBC1 /* rawtext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawtext.h; sourceTree = "<group>"; }; + A9A1297B19DF144D005BCBC1 /* rawtext4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawtext4.h; sourceTree = "<group>"; }; + A9A1297C19DF144D005BCBC1 /* rawverse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawverse.h; sourceTree = "<group>"; }; + A9A1297D19DF144D005BCBC1 /* rawverse4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawverse4.h; sourceTree = "<group>"; }; + A9A1297E19DF144D005BCBC1 /* remotetrans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = remotetrans.h; sourceTree = "<group>"; }; + A9A1297F19DF144D005BCBC1 /* roman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = roman.h; sourceTree = "<group>"; }; + A9A1298019DF144D005BCBC1 /* rtfhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rtfhtml.h; sourceTree = "<group>"; }; + A9A1298119DF144D005BCBC1 /* sapphire.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sapphire.h; sourceTree = "<group>"; }; + A9A1298219DF144D005BCBC1 /* scsuutf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scsuutf8.h; sourceTree = "<group>"; }; + A9A1298419DF144D005BCBC1 /* stringmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringmgr.h; sourceTree = "<group>"; }; + A9A1298519DF144D005BCBC1 /* strkey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strkey.h; sourceTree = "<group>"; }; + A9A1298619DF144D005BCBC1 /* swbasicfilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swbasicfilter.h; sourceTree = "<group>"; }; + A9A1298719DF144D005BCBC1 /* swbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swbuf.h; sourceTree = "<group>"; }; + A9A1298819DF144D005BCBC1 /* swcacher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swcacher.h; sourceTree = "<group>"; }; + A9A1298919DF144D005BCBC1 /* swcipher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swcipher.h; sourceTree = "<group>"; }; + A9A1298A19DF144D005BCBC1 /* swcom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swcom.h; sourceTree = "<group>"; }; + A9A1298B19DF144D005BCBC1 /* swcomprs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swcomprs.h; sourceTree = "<group>"; }; + A9A1298C19DF144D005BCBC1 /* swconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swconfig.h; sourceTree = "<group>"; }; + A9A1298D19DF144D005BCBC1 /* swdisp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swdisp.h; sourceTree = "<group>"; }; + A9A1298E19DF144D005BCBC1 /* swfilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swfilter.h; sourceTree = "<group>"; }; + A9A1298F19DF144D005BCBC1 /* swfiltermgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swfiltermgr.h; sourceTree = "<group>"; }; + A9A1299019DF144D005BCBC1 /* swgenbook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swgenbook.h; sourceTree = "<group>"; }; + A9A1299119DF144D005BCBC1 /* swinputmeth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swinputmeth.h; sourceTree = "<group>"; }; + A9A1299219DF144D005BCBC1 /* swkey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swkey.h; sourceTree = "<group>"; }; + A9A1299319DF144D005BCBC1 /* swld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swld.h; sourceTree = "<group>"; }; + A9A1299419DF144D005BCBC1 /* swlocale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swlocale.h; sourceTree = "<group>"; }; + A9A1299519DF144D005BCBC1 /* swlog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swlog.h; sourceTree = "<group>"; }; + A9A1299619DF144D005BCBC1 /* swmacs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swmacs.h; sourceTree = "<group>"; }; + A9A1299719DF144D005BCBC1 /* swmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swmgr.h; sourceTree = "<group>"; }; + A9A1299819DF144D005BCBC1 /* swmodule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swmodule.h; sourceTree = "<group>"; }; + A9A1299919DF144D005BCBC1 /* swobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swobject.h; sourceTree = "<group>"; }; + A9A1299A19DF144D005BCBC1 /* swoptfilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swoptfilter.h; sourceTree = "<group>"; }; + A9A1299C19DF144D005BCBC1 /* swsearchable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swsearchable.h; sourceTree = "<group>"; }; + A9A1299D19DF144D005BCBC1 /* swtext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swtext.h; sourceTree = "<group>"; }; + A9A1299E19DF144D005BCBC1 /* swversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swversion.h; sourceTree = "<group>"; }; + A9A129A019DF144D005BCBC1 /* sysdata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysdata.h; sourceTree = "<group>"; }; + A9A129A119DF144D005BCBC1 /* teihtmlhref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = teihtmlhref.h; sourceTree = "<group>"; }; + A9A129A219DF144D005BCBC1 /* teilatex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = teilatex.h; sourceTree = "<group>"; }; + A9A129A319DF144D005BCBC1 /* teiplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = teiplain.h; sourceTree = "<group>"; }; + A9A129A419DF144D005BCBC1 /* teirtf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = teirtf.h; sourceTree = "<group>"; }; + A9A129A519DF144D005BCBC1 /* teixhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = teixhtml.h; sourceTree = "<group>"; }; + A9A129A619DF144D005BCBC1 /* thmlfootnotes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlfootnotes.h; sourceTree = "<group>"; }; + A9A129A719DF144D005BCBC1 /* thmlgbf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlgbf.h; sourceTree = "<group>"; }; + A9A129A819DF144D005BCBC1 /* thmlheadings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlheadings.h; sourceTree = "<group>"; }; + A9A129A919DF144D005BCBC1 /* thmlhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlhtml.h; sourceTree = "<group>"; }; + A9A129AA19DF144D005BCBC1 /* thmlhtmlhref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlhtmlhref.h; sourceTree = "<group>"; }; + A9A129AB19DF144D005BCBC1 /* thmllatex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmllatex.h; sourceTree = "<group>"; }; + A9A129AC19DF144D005BCBC1 /* thmllemma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmllemma.h; sourceTree = "<group>"; }; + A9A129AD19DF144D005BCBC1 /* thmlmorph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlmorph.h; sourceTree = "<group>"; }; + A9A129AE19DF144D005BCBC1 /* thmlosis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlosis.h; sourceTree = "<group>"; }; + A9A129AF19DF144D005BCBC1 /* thmlplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlplain.h; sourceTree = "<group>"; }; + A9A129B019DF144D005BCBC1 /* thmlrtf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlrtf.h; sourceTree = "<group>"; }; + A9A129B119DF144D005BCBC1 /* thmlscripref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlscripref.h; sourceTree = "<group>"; }; + A9A129B219DF144D005BCBC1 /* thmlstrongs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlstrongs.h; sourceTree = "<group>"; }; + A9A129B319DF144D005BCBC1 /* thmlvariants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlvariants.h; sourceTree = "<group>"; }; + A9A129B419DF144D005BCBC1 /* thmlwebif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlwebif.h; sourceTree = "<group>"; }; + A9A129B519DF144D005BCBC1 /* thmlwordjs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlwordjs.h; sourceTree = "<group>"; }; + A9A129B619DF144D005BCBC1 /* thmlxhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlxhtml.h; sourceTree = "<group>"; }; + A9A129B719DF144D005BCBC1 /* treekey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = treekey.h; sourceTree = "<group>"; }; + A9A129B819DF144D005BCBC1 /* treekeyidx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = treekeyidx.h; sourceTree = "<group>"; }; + A9A129B919DF144D005BCBC1 /* unicodertf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unicodertf.h; sourceTree = "<group>"; }; + A9A129BA19DF144D005BCBC1 /* untgz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = untgz.h; sourceTree = "<group>"; }; + A9A129BB19DF144D005BCBC1 /* url.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url.h; sourceTree = "<group>"; }; + A9A129BC19DF144D005BCBC1 /* utf16utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf16utf8.h; sourceTree = "<group>"; }; + A9A129BD19DF144D005BCBC1 /* utf8arabicpoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8arabicpoints.h; sourceTree = "<group>"; }; + A9A129BE19DF144D005BCBC1 /* utf8arshaping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8arshaping.h; sourceTree = "<group>"; }; + A9A129BF19DF144D005BCBC1 /* utf8bidireorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8bidireorder.h; sourceTree = "<group>"; }; + A9A129C019DF144D005BCBC1 /* utf8cantillation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8cantillation.h; sourceTree = "<group>"; }; + A9A129C119DF144D005BCBC1 /* utf8greekaccents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8greekaccents.h; sourceTree = "<group>"; }; + A9A129C219DF144D005BCBC1 /* utf8hebrewpoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8hebrewpoints.h; sourceTree = "<group>"; }; + A9A129C319DF144D005BCBC1 /* utf8html.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8html.h; sourceTree = "<group>"; }; + A9A129C419DF144D005BCBC1 /* utf8latin1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8latin1.h; sourceTree = "<group>"; }; + A9A129C519DF144D005BCBC1 /* utf8nfc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8nfc.h; sourceTree = "<group>"; }; + A9A129C619DF144D005BCBC1 /* utf8nfkd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8nfkd.h; sourceTree = "<group>"; }; + A9A129C719DF144D005BCBC1 /* utf8scsu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8scsu.h; sourceTree = "<group>"; }; + A9A129C819DF144D005BCBC1 /* utf8transliterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8transliterator.h; sourceTree = "<group>"; }; + A9A129C919DF144D005BCBC1 /* utf8utf16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8utf16.h; sourceTree = "<group>"; }; + A9A129CA19DF144D005BCBC1 /* utilstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utilstr.h; sourceTree = "<group>"; }; + A9A129CB19DF144D005BCBC1 /* utilxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utilxml.h; sourceTree = "<group>"; }; + A9A129CC19DF144D005BCBC1 /* versekey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = versekey.h; sourceTree = "<group>"; }; + A9A129CD19DF144D005BCBC1 /* versetreekey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = versetreekey.h; sourceTree = "<group>"; }; + A9A129CE19DF144D005BCBC1 /* versificationmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = versificationmgr.h; sourceTree = "<group>"; }; + A9A129CF19DF144D005BCBC1 /* xzcomprs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xzcomprs.h; sourceTree = "<group>"; }; + A9A129D019DF144D005BCBC1 /* zcom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zcom.h; sourceTree = "<group>"; }; + A9A129D119DF144D005BCBC1 /* zcom4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zcom4.h; sourceTree = "<group>"; }; + A9A129D219DF144D005BCBC1 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; }; + A9A129D319DF144D005BCBC1 /* zipcomprs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zipcomprs.h; sourceTree = "<group>"; }; + A9A129D419DF144D005BCBC1 /* zld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zld.h; sourceTree = "<group>"; }; + A9A129D519DF144D005BCBC1 /* zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zlib.h; sourceTree = "<group>"; }; + A9A129D619DF144D005BCBC1 /* zstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zstr.h; sourceTree = "<group>"; }; + A9A129D719DF144D005BCBC1 /* ztext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ztext.h; sourceTree = "<group>"; }; + A9A129D819DF144D005BCBC1 /* ztext4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ztext4.h; sourceTree = "<group>"; }; + A9A129D919DF144D005BCBC1 /* zverse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zverse.h; sourceTree = "<group>"; }; + A9A129DA19DF144D005BCBC1 /* zverse4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zverse4.h; sourceTree = "<group>"; }; A9A2C17C118D9D3D0002873D /* Notifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Notifications.h; path = src/Notifications.h; sourceTree = "<group>"; }; A9A7EEB414D5D61700B76B6A /* osis2mod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = osis2mod; sourceTree = BUILT_PRODUCTS_DIR; }; - A9BDFA6B1207F9870067ED5B /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; + A9A94A351DCB21AB00F69260 /* canon_calvin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_calvin.h; sourceTree = "<group>"; }; + A9A94A361DCB21AB00F69260 /* canon_darbyfr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_darbyfr.h; sourceTree = "<group>"; }; + A9A94A371DCB21AB00F69260 /* canon_segond.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_segond.h; sourceTree = "<group>"; }; + A9B77D4319A3BB3B00F34557 /* liblzma.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblzma.dylib; path = usr/lib/liblzma.dylib; sourceTree = SDKROOT; }; + A9BB67401C6BCD9600EB1A49 /* adler32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = "<group>"; }; + A9BB67411C6BCD9600EB1A49 /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = "<group>"; }; + A9BB67421C6BCD9600EB1A49 /* crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crc32.c; sourceTree = "<group>"; }; + A9BB67441C6BCD9600EB1A49 /* deflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = deflate.c; sourceTree = "<group>"; }; + A9BB67461C6BCD9600EB1A49 /* gzclose.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzclose.c; sourceTree = "<group>"; }; + A9BB67481C6BCD9600EB1A49 /* gzlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzlib.c; sourceTree = "<group>"; }; + A9BB67491C6BCD9600EB1A49 /* gzread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzread.c; sourceTree = "<group>"; }; + A9BB674A1C6BCD9600EB1A49 /* gzwrite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzwrite.c; sourceTree = "<group>"; }; + A9BB674B1C6BCD9600EB1A49 /* infback.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = infback.c; sourceTree = "<group>"; }; + A9BB674C1C6BCD9600EB1A49 /* inffast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inffast.c; sourceTree = "<group>"; }; + A9BB674F1C6BCD9600EB1A49 /* inflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inflate.c; sourceTree = "<group>"; }; + A9BB67511C6BCD9600EB1A49 /* inftrees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inftrees.c; sourceTree = "<group>"; }; + A9BB67531C6BCD9600EB1A49 /* trees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = trees.c; sourceTree = "<group>"; }; + A9BB67551C6BCD9600EB1A49 /* uncompr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = "<group>"; }; + A9BB67561C6BCD9600EB1A49 /* untgz.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = untgz.c; sourceTree = "<group>"; }; + A9BB67591C6BCD9600EB1A49 /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = "<group>"; }; A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKeyTest.h; path = ../test/SwordListKeyTest.h; sourceTree = "<group>"; }; A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordListKeyTest.m; path = ../test/SwordListKeyTest.m; sourceTree = "<group>"; }; A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleLongRunTest.h; path = ../test/SwordModuleLongRunTest.h; sourceTree = "<group>"; }; A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModuleLongRunTest.mm; path = ../test/SwordModuleLongRunTest.mm; sourceTree = "<group>"; }; - A9BFB0A213EDF51000032679 /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; - A9BFB0A413EDF51000032679 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; + A9BFB0A213EDF51000032679 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A9BFB0A613EDF51100032679 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; A9BFB0A913EDF51100032679 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; A9BFB0AA13EDF51100032679 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; A9BFB0AB13EDF51100032679 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; A9C2856D11C446B700803CB5 /* Configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Configuration.h; path = src/services/Configuration.h; sourceTree = "<group>"; }; A9C2857111C4471400803CB5 /* OSXConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OSXConfiguration.h; path = src/services/OSXConfiguration.h; sourceTree = "<group>"; }; A9C2857211C4471400803CB5 /* OSXConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OSXConfiguration.m; path = src/services/OSXConfiguration.m; sourceTree = "<group>"; }; @@ -1184,55 +2498,58 @@ A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SwordModule+Index.h"; path = "src/SwordModule+Index.h"; sourceTree = "<group>"; }; A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "SwordModule+Index.mm"; path = "src/SwordModule+Index.mm"; sourceTree = "<group>"; }; A9D437CE11C52947007AFE83 /* locales.d */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locales.d; path = ../../locales.d; sourceTree = SOURCE_ROOT; }; + A9D8FD2C19E2EC0E0055700C /* introtest.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = introtest.cpp; path = ../../tests/introtest.cpp; sourceTree = "<group>"; }; + A9D8FD3719E2EC5B0055700C /* introtest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = introtest; sourceTree = BUILT_PRODUCTS_DIR; }; A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teixhtml.cpp; sourceTree = "<group>"; }; + A9EE8A8B19E286E500CFFE6A /* LongRunningTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LongRunningTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + A9EE8A8E19E286E500CFFE6A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; A9EF1414120595650078A27C /* SwordLocaleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordLocaleManager.h; path = src/SwordLocaleManager.h; sourceTree = "<group>"; }; A9EF1415120595650078A27C /* SwordLocaleManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordLocaleManager.mm; path = src/SwordLocaleManager.mm; sourceTree = "<group>"; }; D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 8DC2EF560486A6940098B216 /* Frameworks */ = { + 0A011D9A1FB4142500778C2B /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A954ACDD13EEA6780094E3FE /* libsword.dylib in Frameworks */, - 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - A954ABC013EE9AB00094E3FE /* Frameworks */ = { + 0A011DA31FB4142500778C2B /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A954AC3713EE9FA10094E3FE /* libicucore.dylib in Frameworks */, - A954AC3813EE9FA10094E3FE /* libstdc++.dylib in Frameworks */, - A954AC3913EE9FA10094E3FE /* libz.dylib in Frameworks */, - A954AC3313EE9F620094E3FE /* libcurl.dylib in Frameworks */, + 0A011DA71FB4142500778C2B /* sword.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - A975EED711C792B9007C1532 /* Frameworks */ = { + 0A1F169D1FBB755B00E0AEFA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9A7EEAF14D5D4C300B76B6A /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - A9A7EEB114D5D61700B76B6A /* Frameworks */ = { + 8DC2EF560486A6940098B216 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A975EED711C792B9007C1532 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9A7EEBF14D5D65900B76B6A /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - A9BDFA611207F9870067ED5B /* Frameworks */ = { + A9A7EEB114D5D61700B76B6A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */, - A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1240,8 +2557,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9BFB0BF13EDF5D500032679 /* ObjCSword.framework in Frameworks */, - A9BFB0A513EDF51100032679 /* SenTestingKit.framework in Frameworks */, + A9BFB0BF13EDF5D500032679 /* SWORD.framework in Frameworks */, A9BFB0A713EDF51100032679 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1250,7 +2566,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D2714A14D717D800DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1258,7 +2573,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D2715714D717FD00DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1266,7 +2580,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D2716414D7181200DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1274,7 +2587,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D2717114D7182300DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1282,7 +2594,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D2717E14D7183B00DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1290,7 +2601,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D2718B14D7185800DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1298,7 +2608,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D2719814D7186A00DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1306,7 +2615,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D271A514D7187E00DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1314,7 +2622,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D271B214D7189300DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1322,7 +2629,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D271BF14D718A400DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1330,7 +2636,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D271CC14D718B800DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1338,7 +2643,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D271D914D718C800DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1346,7 +2650,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D271E614D718DF00DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1354,7 +2657,21 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9D271F314D718F500DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D8FD3219E2EC5B0055700C /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9EE8A8819E286E500CFFE6A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9EE8A9119E286E500CFFE6A /* SWORD.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1364,12 +2681,10 @@ 034768DFFF38A50411DB9C8B /* Products */ = { isa = PBXGroup; children = ( - 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */, + 8DC2EF5B0486A6940098B216 /* SWORD.framework */, A975EED911C792B9007C1532 /* mod2osis */, A9921A1911FD9CA8002DAA72 /* libSword.dylib */, - A9BDFA6B1207F9870067ED5B /* Tests.octest */, - A9BFB0A213EDF51000032679 /* Tests.octest */, - A954ABC313EE9AB00094E3FE /* libsword.dylib */, + A9BFB0A213EDF51000032679 /* Tests.xctest */, A9A7EEB414D5D61700B76B6A /* osis2mod */, A9D2714E14D717D800DA8926 /* imp2gbs */, A9D2715B14D717FD00DA8926 /* imp2ld */, @@ -1385,6 +2700,11 @@ A9D271DD14D718C800DA8926 /* vs2osisref */, A9D271EA14D718DF00DA8926 /* vs2osisreftxt */, A9D271F714D718F500DA8926 /* xml2gbs */, + A9EE8A8B19E286E500CFFE6A /* LongRunningTests.xctest */, + A9D8FD3719E2EC5B0055700C /* introtest */, + 0A011D9E1FB4142500778C2B /* sword.framework */, + 0A011DA61FB4142500778C2B /* SWORDTests.xctest */, + 0A1F16A01FBB755B00E0AEFA /* libSWORD.a */, ); name = Products; sourceTree = "<group>"; @@ -1394,12 +2714,18 @@ children = ( A954A7EB13EE96FC0094E3FE /* Sword */, A975ECD211C7925B007C1532 /* Utilities */, + A9D8FD2B19E2EBD80055700C /* Samples */, A94EAE72117B32AF0018B06F /* Services */, 08FB77AEFE84172EC02AAC07 /* SwordWrapper */, 32C88DFF0371C24200C91783 /* Other Sources */, 089C1665FE841158C02AAC07 /* Resources */, 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, + A995E6251C876E9700843E13 /* TestResources */, A9BFB0AC13EDF51100032679 /* Tests */, + A9EE8A8C19E286E500CFFE6A /* LongRunningTests */, + 0A011D9F1FB4142500778C2B /* sword */, + 0A011DAA1FB4142500778C2B /* SWORDTests */, + 0A1F16A11FBB755B00E0AEFA /* SWORD */, A9BFB0A313EDF51000032679 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, ); @@ -1428,12 +2754,12 @@ 08FB77AEFE84172EC02AAC07 /* SwordWrapper */ = { isa = PBXGroup; children = ( - A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */, A929619716B1BA240094E5BE /* SwordKey.h */, A929619816B1BA240094E5BE /* SwordKey.mm */, A929619916B1BA240094E5BE /* SwordListKey.h */, A929619A16B1BA240094E5BE /* SwordListKey.mm */, A929619B16B1BA240094E5BE /* SwordVerseKey.h */, + A94EAC06117B28920018B06F /* SwordVerseKey.mm */, A9EF1414120595650078A27C /* SwordLocaleManager.h */, A9EF1415120595650078A27C /* SwordLocaleManager.mm */, A94EABF9117B28920018B06F /* SwordManager.h */, @@ -1452,17 +2778,14 @@ A94EABF0117B28920018B06F /* SwordDictionary.mm */, A94EABE5117B28920018B06F /* SwordBibleBook.h */, A94EABE6117B28920018B06F /* SwordBibleBook.mm */, - A94EABE7117B28920018B06F /* SwordBibleChapter.h */, - A94EABE8117B28920018B06F /* SwordBibleChapter.m */, A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */, A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */, A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */, A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */, - A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */, A94EABE7117B28920018B06F /* SwordBibleChapter.h */, A94EABE8117B28920018B06F /* SwordBibleChapter.m */, A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */, - A94EAC06117B28920018B06F /* SwordVerseKey.mm */, + A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */, A94EAC09117B28920018B06F /* VerseEnumerator.h */, A94EAC0A117B28920018B06F /* VerseEnumerator.mm */, A94EABF1117B28920018B06F /* SwordInstallSource.h */, @@ -1471,18 +2794,46 @@ A94EABF4117B28920018B06F /* SwordInstallSourceManager.mm */, A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */, A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */, - 8C92C291C40A77060C12A21B /* SwordUtil.m */, 8C92C7B2EB245D47FEB5E3B0 /* SwordUtil.h */, - 8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */, + 8C92C291C40A77060C12A21B /* SwordUtil.m */, 8C92C72ADACB017A434CD268 /* FilterProviderFactory.h */, - 8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */, + 8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */, 8C92C980D4DE32C7AB93159D /* DefaultFilterProvider.h */, - 8C92CC111DC521DE0C054C60 /* SwordFilter.mm */, + 8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */, 8C92C02A5C86E1C75ED1CEF4 /* SwordFilter.h */, + 8C92CC111DC521DE0C054C60 /* SwordFilter.mm */, ); name = SwordWrapper; sourceTree = "<group>"; }; + 0A011D9F1FB4142500778C2B /* sword */ = { + isa = PBXGroup; + children = ( + 0AA1DD351FB46FD00082E131 /* sword.h */, + 0AA1DD341FB46FD00082E131 /* sword.m */, + 0A011DA11FB4142500778C2B /* Info.plist */, + ); + path = sword; + sourceTree = "<group>"; + }; + 0A011DAA1FB4142500778C2B /* SWORDTests */ = { + isa = PBXGroup; + children = ( + 0A011DAB1FB4142500778C2B /* SWORDTests.m */, + 0A011DAD1FB4142500778C2B /* Info.plist */, + ); + path = SWORDTests; + sourceTree = "<group>"; + }; + 0A1F16A11FBB755B00E0AEFA /* SWORD */ = { + isa = PBXGroup; + children = ( + 0A1F16A21FBB755B00E0AEFA /* SWORD.h */, + 0A1F16A31FBB755B00E0AEFA /* SWORD.m */, + ); + path = SWORD; + sourceTree = "<group>"; + }; 1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( @@ -1501,7 +2852,6 @@ 0867D6A5FE840307C02AAC07 /* AppKit.framework */, D2F7E79907B2D74100F64583 /* CoreData.framework */, 0867D69BFE84028FC02AAC07 /* Foundation.framework */, - A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */, ); name = "Other Frameworks"; sourceTree = "<group>"; @@ -1516,6 +2866,846 @@ name = "Other Sources"; sourceTree = "<group>"; }; + A90152A219A9E8E100F7FC7D /* icu */ = { + isa = PBXGroup; + children = ( + A90152B719A9E8E100F7FC7D /* source */, + ); + name = icu; + path = dependencies/icu; + sourceTree = "<group>"; + }; + A90152B719A9E8E100F7FC7D /* source */ = { + isa = PBXGroup; + children = ( + A90152BD19A9E8E100F7FC7D /* common */, + A9015B9319A9E8E700F7FC7D /* i18n */, + A9015D2319A9E8E800F7FC7D /* io */, + A9015D3E19A9E8E800F7FC7D /* layout */, + A90169D619AA169300F7FC7D /* stubdata */, + ); + path = source; + sourceTree = "<group>"; + }; + A90152BD19A9E8E100F7FC7D /* common */ = { + isa = PBXGroup; + children = ( + A90152BE19A9E8E100F7FC7D /* appendable.cpp */, + A90152BF19A9E8E100F7FC7D /* bmpset.cpp */, + A90152C019A9E8E100F7FC7D /* bmpset.h */, + A90152C119A9E8E100F7FC7D /* brkeng.cpp */, + A90152C219A9E8E100F7FC7D /* brkeng.h */, + A90152C319A9E8E100F7FC7D /* brkiter.cpp */, + A90152C419A9E8E100F7FC7D /* bytestream.cpp */, + A90152C519A9E8E100F7FC7D /* bytestrie.cpp */, + A90152C619A9E8E100F7FC7D /* bytestriebuilder.cpp */, + A90152C719A9E8E100F7FC7D /* bytestrieiterator.cpp */, + A90152C819A9E8E100F7FC7D /* caniter.cpp */, + A90152C919A9E8E100F7FC7D /* chariter.cpp */, + A90152CA19A9E8E100F7FC7D /* charstr.cpp */, + A90152CB19A9E8E100F7FC7D /* charstr.h */, + A90152CC19A9E8E100F7FC7D /* cmemory.c */, + A90152CD19A9E8E100F7FC7D /* cmemory.h */, + A90152CE19A9E8E100F7FC7D /* cmutex.h */, + A90152D219A9E8E100F7FC7D /* cpputils.h */, + A90152D319A9E8E100F7FC7D /* cstring.c */, + A90152D419A9E8E100F7FC7D /* cstring.h */, + A90152D519A9E8E100F7FC7D /* cwchar.c */, + A90152D619A9E8E100F7FC7D /* cwchar.h */, + A90152D719A9E8E100F7FC7D /* dictbe.cpp */, + A90152D819A9E8E100F7FC7D /* dictbe.h */, + A90152D919A9E8E100F7FC7D /* dictionarydata.cpp */, + A90152DA19A9E8E100F7FC7D /* dictionarydata.h */, + A90152DB19A9E8E100F7FC7D /* dtintrv.cpp */, + A90152DC19A9E8E100F7FC7D /* errorcode.cpp */, + A90152DD19A9E8E100F7FC7D /* filterednormalizer2.cpp */, + A90152DE19A9E8E100F7FC7D /* hash.h */, + A90152DF19A9E8E100F7FC7D /* icudataver.c */, + A90152E019A9E8E100F7FC7D /* icuplug.c */, + A90152E119A9E8E100F7FC7D /* icuplugimp.h */, + A90152E219A9E8E100F7FC7D /* listformatter.cpp */, + A90152E319A9E8E100F7FC7D /* localsvc.h */, + A90152E419A9E8E100F7FC7D /* locavailable.cpp */, + A90152E519A9E8E100F7FC7D /* locbased.cpp */, + A90152E619A9E8E100F7FC7D /* locbased.h */, + A90152E719A9E8E100F7FC7D /* locdispnames.cpp */, + A90152E819A9E8E100F7FC7D /* locid.cpp */, + A90152E919A9E8E100F7FC7D /* loclikely.cpp */, + A90152EA19A9E8E100F7FC7D /* locmap.c */, + A90152EB19A9E8E100F7FC7D /* locmap.h */, + A90152EC19A9E8E100F7FC7D /* locresdata.cpp */, + A90152ED19A9E8E100F7FC7D /* locutil.cpp */, + A90152EE19A9E8E100F7FC7D /* locutil.h */, + A90152EF19A9E8E100F7FC7D /* lrucache.cpp */, + A90152F019A9E8E100F7FC7D /* lrucache.h */, + A90152F319A9E8E100F7FC7D /* messageimpl.h */, + A90152F419A9E8E100F7FC7D /* messagepattern.cpp */, + A90152F519A9E8E100F7FC7D /* msvcres.h */, + A90152F619A9E8E100F7FC7D /* mutex.h */, + A90152F719A9E8E100F7FC7D /* normalizer2.cpp */, + A90152F819A9E8E100F7FC7D /* normalizer2impl.cpp */, + A90152F919A9E8E100F7FC7D /* normalizer2impl.h */, + A90152FA19A9E8E100F7FC7D /* normlzr.cpp */, + A90152FB19A9E8E100F7FC7D /* parsepos.cpp */, + A90152FC19A9E8E100F7FC7D /* patternprops.cpp */, + A90152FD19A9E8E100F7FC7D /* patternprops.h */, + A90152FE19A9E8E100F7FC7D /* propname.cpp */, + A90152FF19A9E8E100F7FC7D /* propname.h */, + A901530019A9E8E100F7FC7D /* propname_data.h */, + A901530119A9E8E100F7FC7D /* propsvec.c */, + A901530219A9E8E100F7FC7D /* propsvec.h */, + A901530319A9E8E100F7FC7D /* punycode.cpp */, + A901530419A9E8E100F7FC7D /* punycode.h */, + A901530519A9E8E100F7FC7D /* putil.cpp */, + A901530619A9E8E100F7FC7D /* putilimp.h */, + A901530719A9E8E100F7FC7D /* rbbi.cpp */, + A901530919A9E8E100F7FC7D /* rbbidata.cpp */, + A901530A19A9E8E100F7FC7D /* rbbidata.h */, + A901530B19A9E8E100F7FC7D /* rbbinode.cpp */, + A901530C19A9E8E100F7FC7D /* rbbinode.h */, + A901530D19A9E8E100F7FC7D /* rbbirb.cpp */, + A901530E19A9E8E100F7FC7D /* rbbirb.h */, + A901530F19A9E8E100F7FC7D /* rbbirpt.h */, + A901531119A9E8E100F7FC7D /* rbbiscan.cpp */, + A901531219A9E8E100F7FC7D /* rbbiscan.h */, + A901531319A9E8E100F7FC7D /* rbbisetb.cpp */, + A901531419A9E8E100F7FC7D /* rbbisetb.h */, + A901531519A9E8E100F7FC7D /* rbbistbl.cpp */, + A901531619A9E8E100F7FC7D /* rbbitblb.cpp */, + A901531719A9E8E100F7FC7D /* rbbitblb.h */, + A901531819A9E8E100F7FC7D /* resbund.cpp */, + A901531919A9E8E100F7FC7D /* resbund_cnv.cpp */, + A901531A19A9E8E100F7FC7D /* ruleiter.cpp */, + A901531B19A9E8E100F7FC7D /* ruleiter.h */, + A901531C19A9E8E100F7FC7D /* schriter.cpp */, + A901531D19A9E8E100F7FC7D /* serv.cpp */, + A901531E19A9E8E100F7FC7D /* serv.h */, + A901531F19A9E8E100F7FC7D /* servlk.cpp */, + A901532019A9E8E100F7FC7D /* servlkf.cpp */, + A901532119A9E8E100F7FC7D /* servloc.h */, + A901532219A9E8E100F7FC7D /* servls.cpp */, + A901532319A9E8E100F7FC7D /* servnotf.cpp */, + A901532419A9E8E100F7FC7D /* servnotf.h */, + A901532519A9E8E100F7FC7D /* servrbf.cpp */, + A901532619A9E8E100F7FC7D /* servslkf.cpp */, + A901532719A9E8E100F7FC7D /* sharedobject.cpp */, + A901532819A9E8E100F7FC7D /* sharedobject.h */, + A901532919A9E8E100F7FC7D /* sharedptr.h */, + A901532A19A9E8E100F7FC7D /* simplepatternformatter.cpp */, + A901532B19A9E8E100F7FC7D /* simplepatternformatter.h */, + A901532C19A9E8E100F7FC7D /* sprpimpl.h */, + A901532D19A9E8E100F7FC7D /* stringpiece.cpp */, + A901532E19A9E8E100F7FC7D /* stringtriebuilder.cpp */, + A901532F19A9E8E100F7FC7D /* uarrsort.c */, + A901533019A9E8E100F7FC7D /* uarrsort.h */, + A901533119A9E8E100F7FC7D /* uassert.h */, + A901533219A9E8E100F7FC7D /* ubidi.c */, + A901533319A9E8E100F7FC7D /* ubidi_props.c */, + A901533419A9E8E100F7FC7D /* ubidi_props.h */, + A901533519A9E8E100F7FC7D /* ubidi_props_data.h */, + A901533619A9E8E100F7FC7D /* ubidiimp.h */, + A901533719A9E8E100F7FC7D /* ubidiln.c */, + A901533819A9E8E100F7FC7D /* ubidiwrt.c */, + A901533919A9E8E100F7FC7D /* ubrk.cpp */, + A901533A19A9E8E100F7FC7D /* ubrkimpl.h */, + A901533B19A9E8E100F7FC7D /* ucase.cpp */, + A901533C19A9E8E100F7FC7D /* ucase.h */, + A901533D19A9E8E100F7FC7D /* ucase_props_data.h */, + A901533E19A9E8E100F7FC7D /* ucasemap.cpp */, + A901533F19A9E8E100F7FC7D /* ucasemap_titlecase_brkiter.cpp */, + A901534019A9E8E100F7FC7D /* ucat.c */, + A901534119A9E8E100F7FC7D /* uchar.c */, + A901534219A9E8E100F7FC7D /* uchar_props_data.h */, + A901534319A9E8E100F7FC7D /* ucharstrie.cpp */, + A901534419A9E8E100F7FC7D /* ucharstriebuilder.cpp */, + A901534519A9E8E100F7FC7D /* ucharstrieiterator.cpp */, + A901534619A9E8E100F7FC7D /* uchriter.cpp */, + A901534719A9E8E100F7FC7D /* ucln.h */, + A901534819A9E8E100F7FC7D /* ucln_cmn.c */, + A901534919A9E8E100F7FC7D /* ucln_cmn.h */, + A901534A19A9E8E100F7FC7D /* ucln_imp.h */, + A901534B19A9E8E100F7FC7D /* ucmndata.c */, + A901534C19A9E8E100F7FC7D /* ucmndata.h */, + A901534D19A9E8E100F7FC7D /* ucnv.c */, + A901534E19A9E8E100F7FC7D /* ucnv2022.cpp */, + A901534F19A9E8E100F7FC7D /* ucnv_bld.cpp */, + A901535019A9E8E100F7FC7D /* ucnv_bld.h */, + A901535119A9E8E100F7FC7D /* ucnv_cb.c */, + A901535219A9E8E100F7FC7D /* ucnv_cnv.c */, + A901535319A9E8E100F7FC7D /* ucnv_cnv.h */, + A901535419A9E8E100F7FC7D /* ucnv_ct.c */, + A901535519A9E8E100F7FC7D /* ucnv_err.c */, + A901535619A9E8E100F7FC7D /* ucnv_ext.cpp */, + A901535719A9E8E100F7FC7D /* ucnv_ext.h */, + A901535819A9E8E100F7FC7D /* ucnv_imp.h */, + A901535919A9E8E100F7FC7D /* ucnv_io.cpp */, + A901535A19A9E8E100F7FC7D /* ucnv_io.h */, + A901535B19A9E8E100F7FC7D /* ucnv_lmb.c */, + A901535C19A9E8E100F7FC7D /* ucnv_set.c */, + A901535D19A9E8E100F7FC7D /* ucnv_u16.c */, + A901535E19A9E8E100F7FC7D /* ucnv_u32.c */, + A901535F19A9E8E100F7FC7D /* ucnv_u7.c */, + A901536019A9E8E100F7FC7D /* ucnv_u8.c */, + A901536119A9E8E100F7FC7D /* ucnvbocu.cpp */, + A901536219A9E8E100F7FC7D /* ucnvdisp.c */, + A901536319A9E8E100F7FC7D /* ucnvhz.c */, + A901536419A9E8E100F7FC7D /* ucnvisci.c */, + A901536519A9E8E100F7FC7D /* ucnvlat1.c */, + A901536619A9E8E100F7FC7D /* ucnvmbcs.c */, + A901536719A9E8E100F7FC7D /* ucnvmbcs.h */, + A901536819A9E8E100F7FC7D /* ucnvscsu.c */, + A901536919A9E8E100F7FC7D /* ucnvsel.cpp */, + A901536A19A9E8E100F7FC7D /* ucol_data.h */, + A901536B19A9E8E100F7FC7D /* ucol_swp.cpp */, + A901536C19A9E8E100F7FC7D /* ucol_swp.h */, + A901536D19A9E8E100F7FC7D /* udata.cpp */, + A901536E19A9E8E100F7FC7D /* udatamem.c */, + A901536F19A9E8E100F7FC7D /* udatamem.h */, + A901537019A9E8E100F7FC7D /* udataswp.c */, + A901537119A9E8E100F7FC7D /* udataswp.h */, + A901537219A9E8E100F7FC7D /* uelement.h */, + A901537319A9E8E100F7FC7D /* uenum.c */, + A901537419A9E8E100F7FC7D /* uenumimp.h */, + A901537519A9E8E100F7FC7D /* uhash.c */, + A901537619A9E8E100F7FC7D /* uhash.h */, + A901537719A9E8E100F7FC7D /* uhash_us.cpp */, + A901537819A9E8E100F7FC7D /* uidna.cpp */, + A901537919A9E8E100F7FC7D /* uinit.cpp */, + A901537A19A9E8E100F7FC7D /* uinvchar.c */, + A901537B19A9E8E100F7FC7D /* uinvchar.h */, + A901537C19A9E8E100F7FC7D /* uiter.cpp */, + A901537D19A9E8E100F7FC7D /* ulist.c */, + A901537E19A9E8E100F7FC7D /* ulist.h */, + A901537F19A9E8E100F7FC7D /* uloc.cpp */, + A901538019A9E8E100F7FC7D /* uloc_tag.c */, + A901538119A9E8E100F7FC7D /* ulocimp.h */, + A901538219A9E8E100F7FC7D /* umapfile.c */, + A901538319A9E8E100F7FC7D /* umapfile.h */, + A901538419A9E8E100F7FC7D /* umath.c */, + A901538519A9E8E100F7FC7D /* umutex.cpp */, + A901538619A9E8E100F7FC7D /* umutex.h */, + A901538719A9E8E100F7FC7D /* unames.cpp */, + A90153DD19A9E8E100F7FC7D /* unifilt.cpp */, + A90153DE19A9E8E100F7FC7D /* unifunct.cpp */, + A90153DF19A9E8E100F7FC7D /* uniset.cpp */, + A90153E019A9E8E100F7FC7D /* uniset_closure.cpp */, + A90153E119A9E8E100F7FC7D /* uniset_props.cpp */, + A90153E219A9E8E100F7FC7D /* unisetspan.cpp */, + A90153E319A9E8E100F7FC7D /* unisetspan.h */, + A90153E419A9E8E100F7FC7D /* unistr.cpp */, + A90153E519A9E8E100F7FC7D /* unistr_case.cpp */, + A90153E619A9E8E100F7FC7D /* unistr_case_locale.cpp */, + A90153E719A9E8E100F7FC7D /* unistr_cnv.cpp */, + A90153E819A9E8E100F7FC7D /* unistr_props.cpp */, + A90153E919A9E8E100F7FC7D /* unistr_titlecase_brkiter.cpp */, + A90153EA19A9E8E100F7FC7D /* unorm.cpp */, + A90153EB19A9E8E100F7FC7D /* unormcmp.cpp */, + A90153EC19A9E8E100F7FC7D /* unormimp.h */, + A90153ED19A9E8E100F7FC7D /* uobject.cpp */, + A90153EE19A9E8E100F7FC7D /* uposixdefs.h */, + A90153EF19A9E8E100F7FC7D /* uprops.cpp */, + A90153F019A9E8E100F7FC7D /* uprops.h */, + A90153F119A9E8E100F7FC7D /* ures_cnv.c */, + A90153F219A9E8E200F7FC7D /* uresbund.cpp */, + A90153F319A9E8E200F7FC7D /* uresdata.c */, + A90153F419A9E8E200F7FC7D /* uresdata.h */, + A90153F519A9E8E200F7FC7D /* uresimp.h */, + A90153F619A9E8E200F7FC7D /* ureslocs.h */, + A90153F719A9E8E200F7FC7D /* usc_impl.c */, + A90153F819A9E8E200F7FC7D /* usc_impl.h */, + A90153F919A9E8E200F7FC7D /* uscript.c */, + A90153FA19A9E8E200F7FC7D /* uscript_props.cpp */, + A90153FB19A9E8E200F7FC7D /* uset.cpp */, + A90153FC19A9E8E200F7FC7D /* uset_imp.h */, + A90153FD19A9E8E200F7FC7D /* uset_props.cpp */, + A90153FE19A9E8E200F7FC7D /* usetiter.cpp */, + A90153FF19A9E8E200F7FC7D /* ushape.cpp */, + A901540019A9E8E200F7FC7D /* usprep.cpp */, + A901540119A9E8E200F7FC7D /* ustack.cpp */, + A901540219A9E8E200F7FC7D /* ustr_cnv.c */, + A901540319A9E8E200F7FC7D /* ustr_cnv.h */, + A901540419A9E8E200F7FC7D /* ustr_imp.h */, + A901540519A9E8E200F7FC7D /* ustr_titlecase_brkiter.cpp */, + A901540619A9E8E200F7FC7D /* ustr_wcs.cpp */, + A901540719A9E8E200F7FC7D /* ustrcase.cpp */, + A901540819A9E8E200F7FC7D /* ustrcase_locale.cpp */, + A901540919A9E8E200F7FC7D /* ustrenum.cpp */, + A901540A19A9E8E200F7FC7D /* ustrenum.h */, + A901540B19A9E8E200F7FC7D /* ustrfmt.c */, + A901540C19A9E8E200F7FC7D /* ustrfmt.h */, + A901540D19A9E8E200F7FC7D /* ustring.cpp */, + A901540E19A9E8E200F7FC7D /* ustrtrns.cpp */, + A901540F19A9E8E200F7FC7D /* utext.cpp */, + A901541019A9E8E200F7FC7D /* utf_impl.c */, + A901541119A9E8E200F7FC7D /* util.cpp */, + A901541219A9E8E200F7FC7D /* util.h */, + A901541319A9E8E200F7FC7D /* util_props.cpp */, + A901541419A9E8E200F7FC7D /* utrace.c */, + A901541519A9E8E200F7FC7D /* utracimp.h */, + A901541619A9E8E200F7FC7D /* utrie.cpp */, + A901541719A9E8E200F7FC7D /* utrie.h */, + A901541819A9E8E200F7FC7D /* utrie2.cpp */, + A901541919A9E8E200F7FC7D /* utrie2.h */, + A901541A19A9E8E200F7FC7D /* utrie2_builder.cpp */, + A901541B19A9E8E200F7FC7D /* utrie2_impl.h */, + A901541C19A9E8E200F7FC7D /* uts46.cpp */, + A901541D19A9E8E200F7FC7D /* utypeinfo.h */, + A901541E19A9E8E200F7FC7D /* utypes.c */, + A901541F19A9E8E200F7FC7D /* uvector.cpp */, + A901542019A9E8E200F7FC7D /* uvector.h */, + A901542119A9E8E200F7FC7D /* uvectr32.cpp */, + A901542219A9E8E200F7FC7D /* uvectr32.h */, + A901542319A9E8E200F7FC7D /* uvectr64.cpp */, + A901542419A9E8E200F7FC7D /* uvectr64.h */, + A901542519A9E8E200F7FC7D /* wintz.c */, + A901542619A9E8E200F7FC7D /* wintz.h */, + ); + path = common; + sourceTree = "<group>"; + }; + A9015B9319A9E8E700F7FC7D /* i18n */ = { + isa = PBXGroup; + children = ( + A9015B9419A9E8E700F7FC7D /* alphaindex.cpp */, + A9015B9519A9E8E700F7FC7D /* anytrans.cpp */, + A9015B9619A9E8E700F7FC7D /* anytrans.h */, + A9015B9719A9E8E700F7FC7D /* astro.cpp */, + A9015B9819A9E8E700F7FC7D /* astro.h */, + A9015B9919A9E8E700F7FC7D /* basictz.cpp */, + A9015B9A19A9E8E700F7FC7D /* bocsu.cpp */, + A9015B9B19A9E8E700F7FC7D /* bocsu.h */, + A9015B9C19A9E8E700F7FC7D /* brktrans.cpp */, + A9015B9D19A9E8E700F7FC7D /* brktrans.h */, + A9015B9E19A9E8E700F7FC7D /* buddhcal.cpp */, + A9015B9F19A9E8E700F7FC7D /* buddhcal.h */, + A9015BA019A9E8E700F7FC7D /* calendar.cpp */, + A9015BA119A9E8E700F7FC7D /* casetrn.cpp */, + A9015BA219A9E8E700F7FC7D /* casetrn.h */, + A9015BA319A9E8E700F7FC7D /* cecal.cpp */, + A9015BA419A9E8E700F7FC7D /* cecal.h */, + A9015BA519A9E8E700F7FC7D /* chnsecal.cpp */, + A9015BA619A9E8E700F7FC7D /* chnsecal.h */, + A9015BA719A9E8E700F7FC7D /* choicfmt.cpp */, + A9015BA819A9E8E700F7FC7D /* coleitr.cpp */, + A9015BA919A9E8E700F7FC7D /* coll.cpp */, + A9015BAA19A9E8E700F7FC7D /* collation.cpp */, + A9015BAB19A9E8E700F7FC7D /* collation.h */, + A9015BAC19A9E8E700F7FC7D /* collationbasedatabuilder.cpp */, + A9015BAD19A9E8E700F7FC7D /* collationbasedatabuilder.h */, + A9015BAE19A9E8E700F7FC7D /* collationbuilder.cpp */, + A9015BAF19A9E8E700F7FC7D /* collationbuilder.h */, + A9015BB019A9E8E700F7FC7D /* collationcompare.cpp */, + A9015BB119A9E8E700F7FC7D /* collationcompare.h */, + A9015BB219A9E8E700F7FC7D /* collationdata.cpp */, + A9015BB319A9E8E700F7FC7D /* collationdata.h */, + A9015BB419A9E8E700F7FC7D /* collationdatabuilder.cpp */, + A9015BB519A9E8E700F7FC7D /* collationdatabuilder.h */, + A9015BB619A9E8E700F7FC7D /* collationdatareader.cpp */, + A9015BB719A9E8E700F7FC7D /* collationdatareader.h */, + A9015BB819A9E8E700F7FC7D /* collationdatawriter.cpp */, + A9015BB919A9E8E700F7FC7D /* collationdatawriter.h */, + A9015BBA19A9E8E700F7FC7D /* collationfastlatin.cpp */, + A9015BBB19A9E8E700F7FC7D /* collationfastlatin.h */, + A9015BBC19A9E8E700F7FC7D /* collationfastlatinbuilder.cpp */, + A9015BBD19A9E8E700F7FC7D /* collationfastlatinbuilder.h */, + A9015BBE19A9E8E700F7FC7D /* collationfcd.cpp */, + A9015BBF19A9E8E700F7FC7D /* collationfcd.h */, + A9015BC019A9E8E700F7FC7D /* collationiterator.cpp */, + A9015BC119A9E8E700F7FC7D /* collationiterator.h */, + A9015BC219A9E8E700F7FC7D /* collationkeys.cpp */, + A9015BC319A9E8E700F7FC7D /* collationkeys.h */, + A9015BC419A9E8E700F7FC7D /* collationroot.cpp */, + A9015BC519A9E8E700F7FC7D /* collationroot.h */, + A9015BC619A9E8E700F7FC7D /* collationrootelements.cpp */, + A9015BC719A9E8E700F7FC7D /* collationrootelements.h */, + A9015BC819A9E8E700F7FC7D /* collationruleparser.cpp */, + A9015BC919A9E8E700F7FC7D /* collationruleparser.h */, + A9015BCA19A9E8E700F7FC7D /* collationsets.cpp */, + A9015BCB19A9E8E700F7FC7D /* collationsets.h */, + A9015BCC19A9E8E700F7FC7D /* collationsettings.cpp */, + A9015BCD19A9E8E700F7FC7D /* collationsettings.h */, + A9015BCE19A9E8E700F7FC7D /* collationtailoring.cpp */, + A9015BCF19A9E8E700F7FC7D /* collationtailoring.h */, + A9015BD019A9E8E700F7FC7D /* collationweights.cpp */, + A9015BD119A9E8E700F7FC7D /* collationweights.h */, + A9015BD219A9E8E700F7FC7D /* compactdecimalformat.cpp */, + A9015BD319A9E8E700F7FC7D /* coptccal.cpp */, + A9015BD419A9E8E700F7FC7D /* coptccal.h */, + A9015BD519A9E8E700F7FC7D /* cpdtrans.cpp */, + A9015BD619A9E8E700F7FC7D /* cpdtrans.h */, + A9015BD719A9E8E700F7FC7D /* csdetect.cpp */, + A9015BD819A9E8E700F7FC7D /* csdetect.h */, + A9015BD919A9E8E700F7FC7D /* csmatch.cpp */, + A9015BDA19A9E8E700F7FC7D /* csmatch.h */, + A9015BDB19A9E8E700F7FC7D /* csr2022.cpp */, + A9015BDC19A9E8E700F7FC7D /* csr2022.h */, + A9015BDD19A9E8E700F7FC7D /* csrecog.cpp */, + A9015BDE19A9E8E700F7FC7D /* csrecog.h */, + A9015BDF19A9E8E700F7FC7D /* csrmbcs.cpp */, + A9015BE019A9E8E700F7FC7D /* csrmbcs.h */, + A9015BE119A9E8E700F7FC7D /* csrsbcs.cpp */, + A9015BE219A9E8E700F7FC7D /* csrsbcs.h */, + A9015BE319A9E8E700F7FC7D /* csrucode.cpp */, + A9015BE419A9E8E700F7FC7D /* csrucode.h */, + A9015BE519A9E8E700F7FC7D /* csrutf8.cpp */, + A9015BE619A9E8E700F7FC7D /* csrutf8.h */, + A9015BE719A9E8E700F7FC7D /* curramt.cpp */, + A9015BE819A9E8E700F7FC7D /* currfmt.cpp */, + A9015BE919A9E8E700F7FC7D /* currfmt.h */, + A9015BEA19A9E8E700F7FC7D /* currpinf.cpp */, + A9015BEB19A9E8E700F7FC7D /* currunit.cpp */, + A9015BEC19A9E8E700F7FC7D /* dangical.cpp */, + A9015BED19A9E8E700F7FC7D /* dangical.h */, + A9015BEE19A9E8E700F7FC7D /* datefmt.cpp */, + A9015BEF19A9E8E700F7FC7D /* dcfmtimp.h */, + A9015BF019A9E8E700F7FC7D /* dcfmtsym.cpp */, + A9015BF119A9E8E700F7FC7D /* decContext.c */, + A9015BF219A9E8E700F7FC7D /* decContext.h */, + A9015BF319A9E8E700F7FC7D /* decfmtst.cpp */, + A9015BF419A9E8E700F7FC7D /* decfmtst.h */, + A9015BF519A9E8E700F7FC7D /* decimalformatpattern.cpp */, + A9015BF619A9E8E700F7FC7D /* decimalformatpattern.h */, + A9015BF719A9E8E700F7FC7D /* decimfmt.cpp */, + A9015BF819A9E8E700F7FC7D /* decNumber.c */, + A9015BF919A9E8E700F7FC7D /* decNumber.h */, + A9015BFA19A9E8E700F7FC7D /* decNumberLocal.h */, + A9015BFB19A9E8E700F7FC7D /* digitlst.cpp */, + A9015BFC19A9E8E700F7FC7D /* digitlst.h */, + A9015BFD19A9E8E700F7FC7D /* dtfmtsym.cpp */, + A9015BFE19A9E8E700F7FC7D /* dtitv_impl.h */, + A9015BFF19A9E8E700F7FC7D /* dtitvfmt.cpp */, + A9015C0019A9E8E700F7FC7D /* dtitvinf.cpp */, + A9015C0119A9E8E700F7FC7D /* dtptngen.cpp */, + A9015C0219A9E8E700F7FC7D /* dtptngen_impl.h */, + A9015C0319A9E8E700F7FC7D /* dtrule.cpp */, + A9015C0419A9E8E700F7FC7D /* esctrn.cpp */, + A9015C0519A9E8E700F7FC7D /* esctrn.h */, + A9015C0619A9E8E700F7FC7D /* ethpccal.cpp */, + A9015C0719A9E8E700F7FC7D /* ethpccal.h */, + A9015C0819A9E8E700F7FC7D /* filteredbrk.cpp */, + A9015C0919A9E8E700F7FC7D /* fmtable.cpp */, + A9015C0A19A9E8E700F7FC7D /* fmtable_cnv.cpp */, + A9015C0B19A9E8E700F7FC7D /* fmtableimp.h */, + A9015C0C19A9E8E700F7FC7D /* format.cpp */, + A9015C0D19A9E8E700F7FC7D /* fphdlimp.cpp */, + A9015C0E19A9E8E700F7FC7D /* fphdlimp.h */, + A9015C0F19A9E8E700F7FC7D /* fpositer.cpp */, + A9015C1019A9E8E700F7FC7D /* funcrepl.cpp */, + A9015C1119A9E8E700F7FC7D /* funcrepl.h */, + A9015C1219A9E8E700F7FC7D /* gender.cpp */, + A9015C1319A9E8E700F7FC7D /* gregocal.cpp */, + A9015C1419A9E8E700F7FC7D /* gregoimp.cpp */, + A9015C1519A9E8E700F7FC7D /* gregoimp.h */, + A9015C1619A9E8E700F7FC7D /* hebrwcal.cpp */, + A9015C1719A9E8E700F7FC7D /* hebrwcal.h */, + A9015C1B19A9E8E700F7FC7D /* identifier_info.cpp */, + A9015C1C19A9E8E700F7FC7D /* identifier_info.h */, + A9015C1D19A9E8E700F7FC7D /* indiancal.cpp */, + A9015C1E19A9E8E700F7FC7D /* indiancal.h */, + A9015C1F19A9E8E700F7FC7D /* inputext.cpp */, + A9015C2019A9E8E700F7FC7D /* inputext.h */, + A9015C2119A9E8E700F7FC7D /* islamcal.cpp */, + A9015C2219A9E8E700F7FC7D /* islamcal.h */, + A9015C2319A9E8E700F7FC7D /* japancal.cpp */, + A9015C2419A9E8E700F7FC7D /* japancal.h */, + A9015C2519A9E8E700F7FC7D /* locdspnm.cpp */, + A9015C2819A9E8E700F7FC7D /* measfmt.cpp */, + A9015C2919A9E8E700F7FC7D /* measunit.cpp */, + A9015C2A19A9E8E700F7FC7D /* measure.cpp */, + A9015C2B19A9E8E700F7FC7D /* msgfmt.cpp */, + A9015C2C19A9E8E700F7FC7D /* msgfmt_impl.h */, + A9015C2D19A9E8E700F7FC7D /* name2uni.cpp */, + A9015C2E19A9E8E700F7FC7D /* name2uni.h */, + A9015C2F19A9E8E700F7FC7D /* nfrlist.h */, + A9015C3019A9E8E800F7FC7D /* nfrs.cpp */, + A9015C3119A9E8E800F7FC7D /* nfrs.h */, + A9015C3219A9E8E800F7FC7D /* nfrule.cpp */, + A9015C3319A9E8E800F7FC7D /* nfrule.h */, + A9015C3419A9E8E800F7FC7D /* nfsubs.cpp */, + A9015C3519A9E8E800F7FC7D /* nfsubs.h */, + A9015C3619A9E8E800F7FC7D /* nortrans.cpp */, + A9015C3719A9E8E800F7FC7D /* nortrans.h */, + A9015C3819A9E8E800F7FC7D /* nultrans.cpp */, + A9015C3919A9E8E800F7FC7D /* nultrans.h */, + A9015C3A19A9E8E800F7FC7D /* numfmt.cpp */, + A9015C3B19A9E8E800F7FC7D /* numsys.cpp */, + A9015C3C19A9E8E800F7FC7D /* numsys_impl.h */, + A9015C3D19A9E8E800F7FC7D /* olsontz.cpp */, + A9015C3E19A9E8E800F7FC7D /* olsontz.h */, + A9015C3F19A9E8E800F7FC7D /* persncal.cpp */, + A9015C4019A9E8E800F7FC7D /* persncal.h */, + A9015C4119A9E8E800F7FC7D /* plurfmt.cpp */, + A9015C4219A9E8E800F7FC7D /* plurrule.cpp */, + A9015C4319A9E8E800F7FC7D /* plurrule_impl.h */, + A9015C4419A9E8E800F7FC7D /* quant.cpp */, + A9015C4519A9E8E800F7FC7D /* quant.h */, + A9015C4619A9E8E800F7FC7D /* quantityformatter.cpp */, + A9015C4719A9E8E800F7FC7D /* quantityformatter.h */, + A9015C4819A9E8E800F7FC7D /* rbnf.cpp */, + A9015C4919A9E8E800F7FC7D /* rbt.cpp */, + A9015C4A19A9E8E800F7FC7D /* rbt.h */, + A9015C4B19A9E8E800F7FC7D /* rbt_data.cpp */, + A9015C4C19A9E8E800F7FC7D /* rbt_data.h */, + A9015C4D19A9E8E800F7FC7D /* rbt_pars.cpp */, + A9015C4E19A9E8E800F7FC7D /* rbt_pars.h */, + A9015C4F19A9E8E800F7FC7D /* rbt_rule.cpp */, + A9015C5019A9E8E800F7FC7D /* rbt_rule.h */, + A9015C5119A9E8E800F7FC7D /* rbt_set.cpp */, + A9015C5219A9E8E800F7FC7D /* rbt_set.h */, + A9015C5319A9E8E800F7FC7D /* rbtz.cpp */, + A9015C5419A9E8E800F7FC7D /* regexcmp.cpp */, + A9015C5519A9E8E800F7FC7D /* regexcmp.h */, + A9015C5619A9E8E800F7FC7D /* regexcst.h */, + A9015C5919A9E8E800F7FC7D /* regeximp.cpp */, + A9015C5A19A9E8E800F7FC7D /* regeximp.h */, + A9015C5B19A9E8E800F7FC7D /* regexst.cpp */, + A9015C5C19A9E8E800F7FC7D /* regexst.h */, + A9015C5D19A9E8E800F7FC7D /* regextxt.cpp */, + A9015C5E19A9E8E800F7FC7D /* regextxt.h */, + A9015C5F19A9E8E800F7FC7D /* region.cpp */, + A9015C6019A9E8E800F7FC7D /* region_impl.h */, + A9015C6119A9E8E800F7FC7D /* reldatefmt.cpp */, + A9015C6219A9E8E800F7FC7D /* reldtfmt.cpp */, + A9015C6319A9E8E800F7FC7D /* reldtfmt.h */, + A9015C6419A9E8E800F7FC7D /* rematch.cpp */, + A9015C6519A9E8E800F7FC7D /* remtrans.cpp */, + A9015C6619A9E8E800F7FC7D /* remtrans.h */, + A9015C6719A9E8E800F7FC7D /* repattrn.cpp */, + A9015C6819A9E8E800F7FC7D /* rulebasedcollator.cpp */, + A9015C6919A9E8E800F7FC7D /* scriptset.cpp */, + A9015C6A19A9E8E800F7FC7D /* scriptset.h */, + A9015C6B19A9E8E800F7FC7D /* search.cpp */, + A9015C6C19A9E8E800F7FC7D /* selfmt.cpp */, + A9015C6D19A9E8E800F7FC7D /* selfmtimpl.h */, + A9015C6E19A9E8E800F7FC7D /* sharednumberformat.h */, + A9015C6F19A9E8E800F7FC7D /* sharedpluralrules.h */, + A9015C7019A9E8E800F7FC7D /* simpletz.cpp */, + A9015C7119A9E8E800F7FC7D /* smpdtfmt.cpp */, + A9015C7219A9E8E800F7FC7D /* smpdtfst.cpp */, + A9015C7319A9E8E800F7FC7D /* smpdtfst.h */, + A9015C7419A9E8E800F7FC7D /* sortkey.cpp */, + A9015C7519A9E8E800F7FC7D /* strmatch.cpp */, + A9015C7619A9E8E800F7FC7D /* strmatch.h */, + A9015C7719A9E8E800F7FC7D /* strrepl.cpp */, + A9015C7819A9E8E800F7FC7D /* strrepl.h */, + A9015C7919A9E8E800F7FC7D /* stsearch.cpp */, + A9015C7A19A9E8E800F7FC7D /* taiwncal.cpp */, + A9015C7B19A9E8E800F7FC7D /* taiwncal.h */, + A9015C7C19A9E8E800F7FC7D /* timezone.cpp */, + A9015C7D19A9E8E800F7FC7D /* titletrn.cpp */, + A9015C7E19A9E8E800F7FC7D /* titletrn.h */, + A9015C7F19A9E8E800F7FC7D /* tmunit.cpp */, + A9015C8019A9E8E800F7FC7D /* tmutamt.cpp */, + A9015C8119A9E8E800F7FC7D /* tmutfmt.cpp */, + A9015C8219A9E8E800F7FC7D /* tolowtrn.cpp */, + A9015C8319A9E8E800F7FC7D /* tolowtrn.h */, + A9015C8419A9E8E800F7FC7D /* toupptrn.cpp */, + A9015C8519A9E8E800F7FC7D /* toupptrn.h */, + A9015C8619A9E8E800F7FC7D /* translit.cpp */, + A9015C8719A9E8E800F7FC7D /* transreg.cpp */, + A9015C8819A9E8E800F7FC7D /* transreg.h */, + A9015C8919A9E8E800F7FC7D /* tridpars.cpp */, + A9015C8A19A9E8E800F7FC7D /* tridpars.h */, + A9015C8B19A9E8E800F7FC7D /* tzfmt.cpp */, + A9015C8C19A9E8E800F7FC7D /* tzgnames.cpp */, + A9015C8D19A9E8E800F7FC7D /* tzgnames.h */, + A9015C8E19A9E8E800F7FC7D /* tznames.cpp */, + A9015C8F19A9E8E800F7FC7D /* tznames_impl.cpp */, + A9015C9019A9E8E800F7FC7D /* tznames_impl.h */, + A9015C9119A9E8E800F7FC7D /* tzrule.cpp */, + A9015C9219A9E8E800F7FC7D /* tztrans.cpp */, + A9015C9319A9E8E800F7FC7D /* ucal.cpp */, + A9015C9419A9E8E800F7FC7D /* ucln_in.c */, + A9015C9519A9E8E800F7FC7D /* ucln_in.h */, + A9015C9619A9E8E800F7FC7D /* ucol.cpp */, + A9015C9719A9E8E800F7FC7D /* ucol_imp.h */, + A9015C9819A9E8E800F7FC7D /* ucol_res.cpp */, + A9015C9919A9E8E800F7FC7D /* ucol_sit.cpp */, + A9015C9A19A9E8E800F7FC7D /* ucoleitr.cpp */, + A9015C9B19A9E8E800F7FC7D /* ucsdet.cpp */, + A9015C9C19A9E8E800F7FC7D /* ucurr.cpp */, + A9015C9D19A9E8E800F7FC7D /* ucurrimp.h */, + A9015C9E19A9E8E800F7FC7D /* udat.cpp */, + A9015C9F19A9E8E800F7FC7D /* udateintervalformat.cpp */, + A9015CA019A9E8E800F7FC7D /* udatpg.cpp */, + A9015CA119A9E8E800F7FC7D /* uitercollationiterator.cpp */, + A9015CA219A9E8E800F7FC7D /* uitercollationiterator.h */, + A9015CA319A9E8E800F7FC7D /* ulocdata.c */, + A9015CA419A9E8E800F7FC7D /* umsg.cpp */, + A9015CA519A9E8E800F7FC7D /* umsg_imp.h */, + A9015CA619A9E8E800F7FC7D /* unesctrn.cpp */, + A9015CA719A9E8E800F7FC7D /* unesctrn.h */, + A9015CA819A9E8E800F7FC7D /* uni2name.cpp */, + A9015CA919A9E8E800F7FC7D /* uni2name.h */, + A9015CFB19A9E8E800F7FC7D /* unum.cpp */, + A9015CFC19A9E8E800F7FC7D /* unumsys.cpp */, + A9015CFD19A9E8E800F7FC7D /* upluralrules.cpp */, + A9015CFE19A9E8E800F7FC7D /* uregex.cpp */, + A9015CFF19A9E8E800F7FC7D /* uregexc.cpp */, + A9015D0019A9E8E800F7FC7D /* uregion.cpp */, + A9015D0119A9E8E800F7FC7D /* usearch.cpp */, + A9015D0219A9E8E800F7FC7D /* uspoof.cpp */, + A9015D0319A9E8E800F7FC7D /* uspoof_build.cpp */, + A9015D0419A9E8E800F7FC7D /* uspoof_conf.cpp */, + A9015D0519A9E8E800F7FC7D /* uspoof_conf.h */, + A9015D0619A9E8E800F7FC7D /* uspoof_impl.cpp */, + A9015D0719A9E8E800F7FC7D /* uspoof_impl.h */, + A9015D0819A9E8E800F7FC7D /* uspoof_wsconf.cpp */, + A9015D0919A9E8E800F7FC7D /* uspoof_wsconf.h */, + A9015D0A19A9E8E800F7FC7D /* usrchimp.h */, + A9015D0B19A9E8E800F7FC7D /* utf16collationiterator.cpp */, + A9015D0C19A9E8E800F7FC7D /* utf16collationiterator.h */, + A9015D0D19A9E8E800F7FC7D /* utf8collationiterator.cpp */, + A9015D0E19A9E8E800F7FC7D /* utf8collationiterator.h */, + A9015D0F19A9E8E800F7FC7D /* utmscale.c */, + A9015D1019A9E8E800F7FC7D /* utrans.cpp */, + A9015D1119A9E8E800F7FC7D /* vtzone.cpp */, + A9015D1219A9E8E800F7FC7D /* vzone.cpp */, + A9015D1319A9E8E800F7FC7D /* vzone.h */, + A9015D1419A9E8E800F7FC7D /* windtfmt.cpp */, + A9015D1519A9E8E800F7FC7D /* windtfmt.h */, + A9015D1619A9E8E800F7FC7D /* winnmfmt.cpp */, + A9015D1719A9E8E800F7FC7D /* winnmfmt.h */, + A9015D1819A9E8E800F7FC7D /* wintzimpl.cpp */, + A9015D1919A9E8E800F7FC7D /* wintzimpl.h */, + A9015D1A19A9E8E800F7FC7D /* zonemeta.cpp */, + A9015D1B19A9E8E800F7FC7D /* zonemeta.h */, + A9015D1C19A9E8E800F7FC7D /* zrule.cpp */, + A9015D1D19A9E8E800F7FC7D /* zrule.h */, + A9015D1E19A9E8E800F7FC7D /* ztrans.cpp */, + A9015D1F19A9E8E800F7FC7D /* ztrans.h */, + ); + path = i18n; + sourceTree = "<group>"; + }; + A9015D2319A9E8E800F7FC7D /* io */ = { + isa = PBXGroup; + children = ( + A9015D2719A9E8E800F7FC7D /* locbund.cpp */, + A9015D2819A9E8E800F7FC7D /* locbund.h */, + A9015D2B19A9E8E800F7FC7D /* sprintf.c */, + A9015D2C19A9E8E800F7FC7D /* sscanf.c */, + A9015D2D19A9E8E800F7FC7D /* ucln_io.c */, + A9015D2E19A9E8E800F7FC7D /* ucln_io.h */, + A9015D2F19A9E8E800F7FC7D /* ufile.c */, + A9015D3019A9E8E800F7FC7D /* ufile.h */, + A9015D3119A9E8E800F7FC7D /* ufmt_cmn.c */, + A9015D3219A9E8E800F7FC7D /* ufmt_cmn.h */, + A9015D3619A9E8E800F7FC7D /* uprintf.c */, + A9015D3719A9E8E800F7FC7D /* uprintf.h */, + A9015D3819A9E8E800F7FC7D /* uprntf_p.c */, + A9015D3919A9E8E800F7FC7D /* uscanf.c */, + A9015D3A19A9E8E800F7FC7D /* uscanf.h */, + A9015D3B19A9E8E800F7FC7D /* uscanf_p.c */, + A9015D3C19A9E8E800F7FC7D /* ustdio.c */, + A9015D3D19A9E8E800F7FC7D /* ustream.cpp */, + ); + path = io; + sourceTree = "<group>"; + }; + A9015D3E19A9E8E800F7FC7D /* layout */ = { + isa = PBXGroup; + children = ( + A9015D3F19A9E8E800F7FC7D /* AlternateSubstSubtables.cpp */, + A9015D4019A9E8E800F7FC7D /* AlternateSubstSubtables.h */, + A9015D4119A9E8E800F7FC7D /* AnchorTables.cpp */, + A9015D4219A9E8E800F7FC7D /* AnchorTables.h */, + A9015D4319A9E8E800F7FC7D /* ArabicLayoutEngine.cpp */, + A9015D4419A9E8E800F7FC7D /* ArabicLayoutEngine.h */, + A9015D4519A9E8E800F7FC7D /* ArabicShaping.cpp */, + A9015D4619A9E8E800F7FC7D /* ArabicShaping.h */, + A9015D4719A9E8E800F7FC7D /* AttachmentPosnSubtables.h */, + A9015D4819A9E8E800F7FC7D /* CanonData.cpp */, + A9015D4919A9E8E800F7FC7D /* CanonShaping.cpp */, + A9015D4A19A9E8E800F7FC7D /* CanonShaping.h */, + A9015D4B19A9E8E800F7FC7D /* CharSubstitutionFilter.h */, + A9015D4C19A9E8E800F7FC7D /* ClassDefinitionTables.cpp */, + A9015D4D19A9E8E800F7FC7D /* ClassDefinitionTables.h */, + A9015D4E19A9E8E800F7FC7D /* ContextualGlyphInsertion.h */, + A9015D4F19A9E8E800F7FC7D /* ContextualGlyphInsertionProc2.cpp */, + A9015D5019A9E8E800F7FC7D /* ContextualGlyphInsertionProc2.h */, + A9015D5119A9E8E800F7FC7D /* ContextualGlyphSubstitution.h */, + A9015D5219A9E8E800F7FC7D /* ContextualGlyphSubstProc.cpp */, + A9015D5319A9E8E800F7FC7D /* ContextualGlyphSubstProc.h */, + A9015D5419A9E8E800F7FC7D /* ContextualGlyphSubstProc2.cpp */, + A9015D5519A9E8E800F7FC7D /* ContextualGlyphSubstProc2.h */, + A9015D5619A9E8E800F7FC7D /* ContextualSubstSubtables.cpp */, + A9015D5719A9E8E800F7FC7D /* ContextualSubstSubtables.h */, + A9015D5819A9E8E800F7FC7D /* CoverageTables.cpp */, + A9015D5919A9E8E800F7FC7D /* CoverageTables.h */, + A9015D5A19A9E8E800F7FC7D /* CursiveAttachmentSubtables.cpp */, + A9015D5B19A9E8E800F7FC7D /* CursiveAttachmentSubtables.h */, + A9015D5C19A9E8E800F7FC7D /* DefaultCharMapper.h */, + A9015D5D19A9E8E800F7FC7D /* DeviceTables.cpp */, + A9015D5E19A9E8E800F7FC7D /* DeviceTables.h */, + A9015D5F19A9E8E800F7FC7D /* ExtensionSubtables.cpp */, + A9015D6019A9E8E800F7FC7D /* ExtensionSubtables.h */, + A9015D6119A9E8E800F7FC7D /* Features.cpp */, + A9015D6219A9E8E800F7FC7D /* GDEFMarkFilter.cpp */, + A9015D6319A9E8E800F7FC7D /* GDEFMarkFilter.h */, + A9015D6419A9E8E800F7FC7D /* GlyphDefinitionTables.cpp */, + A9015D6519A9E8E800F7FC7D /* GlyphDefinitionTables.h */, + A9015D6619A9E8E800F7FC7D /* GlyphIterator.cpp */, + A9015D6719A9E8E800F7FC7D /* GlyphIterator.h */, + A9015D6819A9E8E800F7FC7D /* GlyphLookupTables.cpp */, + A9015D6919A9E8E800F7FC7D /* GlyphLookupTables.h */, + A9015D6A19A9E8E800F7FC7D /* GlyphPositionAdjustments.cpp */, + A9015D6B19A9E8E800F7FC7D /* GlyphPositionAdjustments.h */, + A9015D6C19A9E8E800F7FC7D /* GlyphPositioningTables.cpp */, + A9015D6D19A9E8E800F7FC7D /* GlyphPositioningTables.h */, + A9015D6E19A9E8E800F7FC7D /* GlyphPosnLookupProc.cpp */, + A9015D6F19A9E8E800F7FC7D /* GlyphPosnLookupProc.h */, + A9015D7019A9E8E800F7FC7D /* GlyphSubstitutionTables.cpp */, + A9015D7119A9E8E800F7FC7D /* GlyphSubstitutionTables.h */, + A9015D7219A9E8E800F7FC7D /* GlyphSubstLookupProc.cpp */, + A9015D7319A9E8E800F7FC7D /* GlyphSubstLookupProc.h */, + A9015D7419A9E8E800F7FC7D /* GXLayoutEngine.cpp */, + A9015D7519A9E8E800F7FC7D /* GXLayoutEngine.h */, + A9015D7619A9E8E800F7FC7D /* GXLayoutEngine2.cpp */, + A9015D7719A9E8E800F7FC7D /* GXLayoutEngine2.h */, + A9015D7819A9E8E800F7FC7D /* HangulLayoutEngine.cpp */, + A9015D7919A9E8E800F7FC7D /* HangulLayoutEngine.h */, + A9015D7A19A9E8E800F7FC7D /* HanLayoutEngine.cpp */, + A9015D7B19A9E8E800F7FC7D /* HanLayoutEngine.h */, + A9015D7C19A9E8E800F7FC7D /* ICUFeatures.h */, + A9015D7D19A9E8E800F7FC7D /* IndicClassTables.cpp */, + A9015D7E19A9E8E800F7FC7D /* IndicLayoutEngine.cpp */, + A9015D7F19A9E8E800F7FC7D /* IndicLayoutEngine.h */, + A9015D8019A9E8E800F7FC7D /* IndicRearrangement.h */, + A9015D8119A9E8E800F7FC7D /* IndicRearrangementProcessor.cpp */, + A9015D8219A9E8E800F7FC7D /* IndicRearrangementProcessor.h */, + A9015D8319A9E8E800F7FC7D /* IndicRearrangementProcessor2.cpp */, + A9015D8419A9E8E800F7FC7D /* IndicRearrangementProcessor2.h */, + A9015D8519A9E8E800F7FC7D /* IndicReordering.cpp */, + A9015D8619A9E8E800F7FC7D /* IndicReordering.h */, + A9015D8719A9E8E800F7FC7D /* KernTable.cpp */, + A9015D8819A9E8E800F7FC7D /* KernTable.h */, + A9015D8919A9E8E800F7FC7D /* KhmerLayoutEngine.cpp */, + A9015D8A19A9E8E800F7FC7D /* KhmerLayoutEngine.h */, + A9015D8B19A9E8E800F7FC7D /* KhmerReordering.cpp */, + A9015D8C19A9E8E800F7FC7D /* KhmerReordering.h */, + A9015D9019A9E8E800F7FC7D /* LayoutEngine.cpp */, + A9015D9119A9E8E800F7FC7D /* LayoutEngine.h */, + A9015D9219A9E8E800F7FC7D /* LayoutTables.h */, + A9015D9319A9E8E800F7FC7D /* LEFontInstance.cpp */, + A9015D9419A9E8E800F7FC7D /* LEFontInstance.h */, + A9015D9519A9E8E800F7FC7D /* LEGlyphFilter.h */, + A9015D9619A9E8E800F7FC7D /* LEGlyphStorage.cpp */, + A9015D9719A9E8E800F7FC7D /* LEGlyphStorage.h */, + A9015D9819A9E8E800F7FC7D /* LEInsertionList.cpp */, + A9015D9919A9E8E800F7FC7D /* LEInsertionList.h */, + A9015D9A19A9E8E800F7FC7D /* LELanguages.h */, + A9015D9B19A9E8E800F7FC7D /* LEScripts.h */, + A9015D9C19A9E8E800F7FC7D /* LESwaps.h */, + A9015D9D19A9E8E800F7FC7D /* LETableReference.h */, + A9015D9E19A9E8E800F7FC7D /* LETypes.h */, + A9015D9F19A9E8E800F7FC7D /* LigatureSubstitution.h */, + A9015DA019A9E8E800F7FC7D /* LigatureSubstProc.cpp */, + A9015DA119A9E8E800F7FC7D /* LigatureSubstProc.h */, + A9015DA219A9E8E800F7FC7D /* LigatureSubstProc2.cpp */, + A9015DA319A9E8E800F7FC7D /* LigatureSubstProc2.h */, + A9015DA419A9E8E800F7FC7D /* LigatureSubstSubtables.cpp */, + A9015DA519A9E8E800F7FC7D /* LigatureSubstSubtables.h */, + A9015DA619A9E8E800F7FC7D /* loengine.cpp */, + A9015DA719A9E8E800F7FC7D /* loengine.h */, + A9015DA819A9E8E800F7FC7D /* LookupProcessor.cpp */, + A9015DA919A9E8E800F7FC7D /* LookupProcessor.h */, + A9015DAA19A9E8E800F7FC7D /* Lookups.cpp */, + A9015DAB19A9E8E800F7FC7D /* Lookups.h */, + A9015DAC19A9E8E800F7FC7D /* LookupTables.cpp */, + A9015DAD19A9E8E800F7FC7D /* LookupTables.h */, + A9015DB019A9E8E800F7FC7D /* MarkArrays.cpp */, + A9015DB119A9E8E800F7FC7D /* MarkArrays.h */, + A9015DB219A9E8E800F7FC7D /* MarkToBasePosnSubtables.cpp */, + A9015DB319A9E8E800F7FC7D /* MarkToBasePosnSubtables.h */, + A9015DB419A9E8E800F7FC7D /* MarkToLigaturePosnSubtables.cpp */, + A9015DB519A9E8E800F7FC7D /* MarkToLigaturePosnSubtables.h */, + A9015DB619A9E8E800F7FC7D /* MarkToMarkPosnSubtables.cpp */, + A9015DB719A9E8E800F7FC7D /* MarkToMarkPosnSubtables.h */, + A9015DB819A9E8E800F7FC7D /* MirroredCharData.cpp */, + A9015DB919A9E8E800F7FC7D /* MorphStateTables.h */, + A9015DBA19A9E8E900F7FC7D /* MorphTables.cpp */, + A9015DBB19A9E8E900F7FC7D /* MorphTables.h */, + A9015DBC19A9E8E900F7FC7D /* MorphTables2.cpp */, + A9015DBD19A9E8E900F7FC7D /* MPreFixups.cpp */, + A9015DBE19A9E8E900F7FC7D /* MPreFixups.h */, + A9015DBF19A9E8E900F7FC7D /* MultipleSubstSubtables.cpp */, + A9015DC019A9E8E900F7FC7D /* MultipleSubstSubtables.h */, + A9015DC119A9E8E900F7FC7D /* NonContextualGlyphSubst.h */, + A9015DC219A9E8E900F7FC7D /* NonContextualGlyphSubstProc.cpp */, + A9015DC319A9E8E900F7FC7D /* NonContextualGlyphSubstProc.h */, + A9015DC419A9E8E900F7FC7D /* NonContextualGlyphSubstProc2.cpp */, + A9015DC519A9E8E900F7FC7D /* NonContextualGlyphSubstProc2.h */, + A9015DC619A9E8E900F7FC7D /* OpenTypeLayoutEngine.cpp */, + A9015DC719A9E8E900F7FC7D /* OpenTypeLayoutEngine.h */, + A9015DC819A9E8E900F7FC7D /* OpenTypeTables.h */, + A9015DC919A9E8E900F7FC7D /* OpenTypeUtilities.cpp */, + A9015DCA19A9E8E900F7FC7D /* OpenTypeUtilities.h */, + A9015DCB19A9E8E900F7FC7D /* PairPositioningSubtables.cpp */, + A9015DCC19A9E8E900F7FC7D /* PairPositioningSubtables.h */, + A9015DCD19A9E8E900F7FC7D /* ScriptAndLanguage.cpp */, + A9015DCE19A9E8E900F7FC7D /* ScriptAndLanguage.h */, + A9015DCF19A9E8E900F7FC7D /* ScriptAndLanguageTags.cpp */, + A9015DD019A9E8E900F7FC7D /* ScriptAndLanguageTags.h */, + A9015DD119A9E8E900F7FC7D /* SegmentArrayProcessor.cpp */, + A9015DD219A9E8E900F7FC7D /* SegmentArrayProcessor.h */, + A9015DD319A9E8E900F7FC7D /* SegmentArrayProcessor2.cpp */, + A9015DD419A9E8E900F7FC7D /* SegmentArrayProcessor2.h */, + A9015DD519A9E8E900F7FC7D /* SegmentSingleProcessor.cpp */, + A9015DD619A9E8E900F7FC7D /* SegmentSingleProcessor.h */, + A9015DD719A9E8E900F7FC7D /* SegmentSingleProcessor2.cpp */, + A9015DD819A9E8E900F7FC7D /* SegmentSingleProcessor2.h */, + A9015DD919A9E8E900F7FC7D /* ShapingTypeData.cpp */, + A9015DDA19A9E8E900F7FC7D /* SimpleArrayProcessor.cpp */, + A9015DDB19A9E8E900F7FC7D /* SimpleArrayProcessor.h */, + A9015DDC19A9E8E900F7FC7D /* SimpleArrayProcessor2.cpp */, + A9015DDD19A9E8E900F7FC7D /* SimpleArrayProcessor2.h */, + A9015DDE19A9E8E900F7FC7D /* SinglePositioningSubtables.cpp */, + A9015DDF19A9E8E900F7FC7D /* SinglePositioningSubtables.h */, + A9015DE019A9E8E900F7FC7D /* SingleSubstitutionSubtables.cpp */, + A9015DE119A9E8E900F7FC7D /* SingleSubstitutionSubtables.h */, + A9015DE219A9E8E900F7FC7D /* SingleTableProcessor.cpp */, + A9015DE319A9E8E900F7FC7D /* SingleTableProcessor.h */, + A9015DE419A9E8E900F7FC7D /* SingleTableProcessor2.cpp */, + A9015DE519A9E8E900F7FC7D /* SingleTableProcessor2.h */, + A9015DE619A9E8E900F7FC7D /* StateTableProcessor.cpp */, + A9015DE719A9E8E900F7FC7D /* StateTableProcessor.h */, + A9015DE819A9E8E900F7FC7D /* StateTableProcessor2.cpp */, + A9015DE919A9E8E900F7FC7D /* StateTableProcessor2.h */, + A9015DEA19A9E8E900F7FC7D /* StateTables.h */, + A9015DEB19A9E8E900F7FC7D /* SubstitutionLookups.cpp */, + A9015DEC19A9E8E900F7FC7D /* SubstitutionLookups.h */, + A9015DED19A9E8E900F7FC7D /* SubtableProcessor.cpp */, + A9015DEE19A9E8E900F7FC7D /* SubtableProcessor.h */, + A9015DEF19A9E8E900F7FC7D /* SubtableProcessor2.cpp */, + A9015DF019A9E8E900F7FC7D /* SubtableProcessor2.h */, + A9015DF119A9E8E900F7FC7D /* ThaiLayoutEngine.cpp */, + A9015DF219A9E8E900F7FC7D /* ThaiLayoutEngine.h */, + A9015DF319A9E8E900F7FC7D /* ThaiShaping.cpp */, + A9015DF419A9E8E900F7FC7D /* ThaiShaping.h */, + A9015DF519A9E8E900F7FC7D /* ThaiStateTables.cpp */, + A9015DF619A9E8E900F7FC7D /* TibetanLayoutEngine.cpp */, + A9015DF719A9E8E900F7FC7D /* TibetanLayoutEngine.h */, + A9015DF819A9E8E900F7FC7D /* TibetanReordering.cpp */, + A9015DF919A9E8E900F7FC7D /* TibetanReordering.h */, + A9015DFA19A9E8E900F7FC7D /* TrimmedArrayProcessor.cpp */, + A9015DFB19A9E8E900F7FC7D /* TrimmedArrayProcessor.h */, + A9015DFC19A9E8E900F7FC7D /* TrimmedArrayProcessor2.cpp */, + A9015DFD19A9E8E900F7FC7D /* TrimmedArrayProcessor2.h */, + A9015DFE19A9E8E900F7FC7D /* ValueRecords.cpp */, + A9015DFF19A9E8E900F7FC7D /* ValueRecords.h */, + ); + path = layout; + sourceTree = "<group>"; + }; + A90169D619AA169300F7FC7D /* stubdata */ = { + isa = PBXGroup; + children = ( + A90169D719AA16A600F7FC7D /* stubdata.c */, + ); + name = stubdata; + sourceTree = "<group>"; + }; A94EAE72117B32AF0018B06F /* Services */ = { isa = PBXGroup; children = ( @@ -1530,6 +3720,8 @@ A954A7EB13EE96FC0094E3FE /* Sword */ = { isa = PBXGroup; children = ( + 0A1F16991FBB70E200E0AEFA /* flatapi.cpp */, + A9A1291B19DF144D005BCBC1 /* include */, A954A7F313EE98570094E3FE /* Deps */, A954A7F513EE98B30094E3FE /* src */, ); @@ -1539,6 +3731,7 @@ A954A7F313EE98570094E3FE /* Deps */ = { isa = PBXGroup; children = ( + A90152A219A9E8E100F7FC7D /* icu */, A954A9E013EE9A2B0094E3FE /* clucene */, ); name = Deps; @@ -1628,6 +3821,7 @@ A954A83A13EE98B30094E3FE /* rawfiles */, A954A83E13EE98B30094E3FE /* swcom.cpp */, A954A83F13EE98B30094E3FE /* zcom */, + A982037019A09AE500DD808C /* zcom4 */, ); path = comments; sourceTree = "<group>"; @@ -1667,8 +3861,6 @@ A954A83F13EE98B30094E3FE /* zcom */ = { isa = PBXGroup; children = ( - A954A84013EE98B30094E3FE /* Makefile */, - A954A84113EE98B30094E3FE /* Makefile.am */, A954A84213EE98B30094E3FE /* zcom.cpp */, ); path = zcom; @@ -1678,7 +3870,6 @@ isa = PBXGroup; children = ( A999FF3917951C8900E65919 /* bz2comprs.cpp */, - A999FF3A17951C8900E65919 /* xzcomprs.cpp */, A954A84513EE98B30094E3FE /* entriesblk.cpp */, A954A84613EE98B30094E3FE /* lzsscomprs.cpp */, A954A84913EE98B30094E3FE /* rawstr.cpp */, @@ -1691,6 +3882,7 @@ A954A85113EE98B30094E3FE /* zipcomprs.cpp */, A954A85213EE98B30094E3FE /* zstr.cpp */, A954A85313EE98B30094E3FE /* zverse.cpp */, + A982037719A09B5C00DD808C /* zverse4.cpp */, ); path = common; sourceTree = "<group>"; @@ -1698,10 +3890,15 @@ A954A85413EE98B30094E3FE /* filters */ = { isa = PBXGroup; children = ( - A999FF3D17951CA000E65919 /* scsuutf8.cpp */, + A982039D19A0A5FA00DD808C /* scsuutf8.cpp */, + A982039E19A0A5FA00DD808C /* utf8scsu.cpp */, + A982037919A09B7800DD808C /* gbflatex.cpp */, + A982037A19A09B7800DD808C /* osislatex.cpp */, + A982037B19A09B7800DD808C /* osisxlit.cpp */, + A982037C19A09B7800DD808C /* teilatex.cpp */, + A982037D19A09B7800DD808C /* thmllatex.cpp */, A96C2353176AF19C008D714B /* osisenum.cpp */, A96C2354176AF19C008D714B /* osisglosses.cpp */, - A96C2355176AF19C008D714B /* osisxlit.cpp */, A96C2355176AF19C008D714B /* osisreferencelinks.cpp */, A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */, A954A85513EE98B30094E3FE /* cipherfil.cpp */, @@ -1846,6 +4043,7 @@ A954A8C713EE98B30094E3FE /* rawtext4 */, A954A8CA13EE98B30094E3FE /* swtext.cpp */, A954A8CB13EE98B30094E3FE /* ztext */, + A982038519A09BC000DD808C /* ztext4 */, ); path = texts; sourceTree = "<group>"; @@ -1877,9 +4075,9 @@ A954A8CF13EE98B30094E3FE /* utilfuns */ = { isa = PBXGroup; children = ( + A9BB673F1C6BCD9600EB1A49 /* zlib */, A954A8D013EE98B30094E3FE /* ftplib.c */, A954A8D113EE98B30094E3FE /* ftpparse.c */, - A954A8D413EE98B30094E3FE /* regex.c */, A954A8D513EE98B30094E3FE /* roman.cpp */, A954A8D613EE98B30094E3FE /* swbuf.cpp */, A954A8D713EE98B30094E3FE /* swobject.cpp */, @@ -1887,34 +4085,10 @@ A954A8DA13EE98B30094E3FE /* url.cpp */, A954A8DB13EE98B30094E3FE /* utilstr.cpp */, A954A8DC13EE98B30094E3FE /* utilxml.cpp */, - A954A8E013EE98B30094E3FE /* zlib */, ); path = utilfuns; sourceTree = "<group>"; }; - A954A8E013EE98B30094E3FE /* zlib */ = { - isa = PBXGroup; - children = ( - A96C233E176AF139008D714B /* gzclose.c */, - A96C2340176AF139008D714B /* gzlib.c */, - A96C2341176AF139008D714B /* gzread.c */, - A96C2342176AF139008D714B /* gzwrite.c */, - A96C2343176AF139008D714B /* infback.c */, - A954A8E113EE98B30094E3FE /* adler32.c */, - A954A8E213EE98B30094E3FE /* compress.c */, - A954A8E313EE98B30094E3FE /* crc32.c */, - A954A8E413EE98B30094E3FE /* deflate.c */, - A954A8EB13EE98B30094E3FE /* inffast.c */, - A954A8EE13EE98B30094E3FE /* inflate.c */, - A954A8EF13EE98B30094E3FE /* inftrees.c */, - A954A8F413EE98B30094E3FE /* trees.c */, - A954A8F613EE98B30094E3FE /* uncompr.c */, - A954A8F713EE98B30094E3FE /* untgz.c */, - A954A8F813EE98B30094E3FE /* zutil.c */, - ); - path = zlib; - sourceTree = "<group>"; - }; A954A9E013EE9A2B0094E3FE /* clucene */ = { isa = PBXGroup; children = ( @@ -2268,10 +4442,272 @@ path = ../../utilities; sourceTree = SOURCE_ROOT; }; + A982037019A09AE500DD808C /* zcom4 */ = { + isa = PBXGroup; + children = ( + A982037319A09AE500DD808C /* zcom4.cpp */, + ); + path = zcom4; + sourceTree = "<group>"; + }; + A982038519A09BC000DD808C /* ztext4 */ = { + isa = PBXGroup; + children = ( + A982038819A09BC000DD808C /* ztext4.cpp */, + ); + path = ztext4; + sourceTree = "<group>"; + }; + A995E6251C876E9700843E13 /* TestResources */ = { + isa = PBXGroup; + children = ( + A995E6231C876E8900843E13 /* TestModules */, + ); + name = TestResources; + sourceTree = "<group>"; + }; + A9A1291B19DF144D005BCBC1 /* include */ = { + isa = PBXGroup; + children = ( + A9A94A351DCB21AB00F69260 /* canon_calvin.h */, + A9A94A361DCB21AB00F69260 /* canon_darbyfr.h */, + A9A94A371DCB21AB00F69260 /* canon_segond.h */, + A9A1291C19DF144D005BCBC1 /* bz2comprs.h */, + A9A1291D19DF144D005BCBC1 /* canon.h */, + A9A1291E19DF144D005BCBC1 /* canon_abbrevs.h */, + A9A1291F19DF144D005BCBC1 /* canon_catholic.h */, + A9A1292019DF144D005BCBC1 /* canon_catholic2.h */, + A9A1292119DF144D005BCBC1 /* canon_german.h */, + A9A1292219DF144D005BCBC1 /* canon_kjva.h */, + A9A1292319DF144D005BCBC1 /* canon_leningrad.h */, + A9A1292419DF144D005BCBC1 /* canon_luther.h */, + A9A1292519DF144D005BCBC1 /* canon_lxx.h */, + A9A1292619DF144D005BCBC1 /* canon_mt.h */, + A9A1292719DF144D005BCBC1 /* canon_nrsv.h */, + A9A1292819DF144D005BCBC1 /* canon_nrsva.h */, + A9A1292919DF144D005BCBC1 /* canon_null.h */, + A9A1292A19DF144D005BCBC1 /* canon_orthodox.h */, + A9A1292B19DF144D005BCBC1 /* canon_synodal.h */, + A9A1292C19DF144D005BCBC1 /* canon_synodalprot.h */, + A9A1292D19DF144D005BCBC1 /* canon_vulg.h */, + A9A1292E19DF144D005BCBC1 /* cipherfil.h */, + A9A1293019DF144D005BCBC1 /* curlftpt.h */, + A9A1293119DF144D005BCBC1 /* curlhttpt.h */, + A9A1293219DF144D005BCBC1 /* defs.h */, + A9A1293319DF144D005BCBC1 /* echomod.h */, + A9A1293419DF144D005BCBC1 /* encfiltmgr.h */, + A9A1293519DF144D005BCBC1 /* entriesblk.h */, + A9A1293619DF144D005BCBC1 /* femain.h */, + A9A1293719DF144D005BCBC1 /* filemgr.h */, + A9A1293819DF144D005BCBC1 /* flatapi.h */, + A9A1293919DF144D005BCBC1 /* ftplib.h */, + A9A1293A19DF144D005BCBC1 /* ftplibftpt.h */, + A9A1293B19DF144D005BCBC1 /* ftpparse.h */, + A9A1293C19DF144D005BCBC1 /* gbffootnotes.h */, + A9A1293D19DF144D005BCBC1 /* gbfheadings.h */, + A9A1293E19DF144D005BCBC1 /* gbfhtml.h */, + A9A1293F19DF144D005BCBC1 /* gbfhtmlhref.h */, + A9A1294019DF144D005BCBC1 /* gbflatex.h */, + A9A1294119DF144D005BCBC1 /* gbfmorph.h */, + A9A1294219DF144D005BCBC1 /* gbfosis.h */, + A9A1294319DF144D005BCBC1 /* gbfplain.h */, + A9A1294419DF144D005BCBC1 /* gbfredletterwords.h */, + A9A1294519DF144D005BCBC1 /* gbfrtf.h */, + A9A1294619DF144D005BCBC1 /* gbfstrongs.h */, + A9A1294719DF144D005BCBC1 /* gbfthml.h */, + A9A1294819DF144D005BCBC1 /* gbfwebif.h */, + A9A1294919DF144D005BCBC1 /* gbfwordjs.h */, + A9A1294A19DF144D005BCBC1 /* gbfxhtml.h */, + A9A1294B19DF144D005BCBC1 /* greeklexattribs.h */, + A9A1294C19DF144D005BCBC1 /* hebrewmcim.h */, + A9A1294D19DF144D005BCBC1 /* hrefcom.h */, + A9A1294E19DF144D005BCBC1 /* installmgr.h */, + A9A1294F19DF144D005BCBC1 /* internal */, + A9A1295219DF144D005BCBC1 /* latin1utf16.h */, + A9A1295319DF144D005BCBC1 /* latin1utf8.h */, + A9A1295419DF144D005BCBC1 /* listkey.h */, + A9A1295519DF144D005BCBC1 /* localemgr.h */, + A9A1295619DF144D005BCBC1 /* lzsscomprs.h */, + A9A1295919DF144D005BCBC1 /* markupfiltmgr.h */, + A9A1295A19DF144D005BCBC1 /* multimapwdef.h */, + A9A1295B19DF144D005BCBC1 /* nullim.h */, + A9A1295C19DF144D005BCBC1 /* osisenum.h */, + A9A1295D19DF144D005BCBC1 /* osisfootnotes.h */, + A9A1295E19DF144D005BCBC1 /* osisglosses.h */, + A9A1295F19DF144D005BCBC1 /* osisheadings.h */, + A9A1296019DF144D005BCBC1 /* osishtmlhref.h */, + A9A1296119DF144D005BCBC1 /* osislatex.h */, + A9A1296219DF144D005BCBC1 /* osislemma.h */, + A9A1296319DF144D005BCBC1 /* osismorph.h */, + A9A1296419DF144D005BCBC1 /* osismorphsegmentation.h */, + A9A1296519DF144D005BCBC1 /* osisosis.h */, + A9A1296619DF144D005BCBC1 /* osisplain.h */, + A9A1296719DF144D005BCBC1 /* osisredletterwords.h */, + A9A1296819DF144D005BCBC1 /* osisreferencelinks.h */, + A9A1296919DF144D005BCBC1 /* osisrtf.h */, + A9A1296A19DF144D005BCBC1 /* osisscripref.h */, + A9A1296B19DF144D005BCBC1 /* osisstrongs.h */, + A9A1296C19DF144D005BCBC1 /* osisvariants.h */, + A9A1296D19DF144D005BCBC1 /* osiswebif.h */, + A9A1296E19DF144D005BCBC1 /* osiswordjs.h */, + A9A1296F19DF144D005BCBC1 /* osisxhtml.h */, + A9A1297019DF144D005BCBC1 /* osisxlit.h */, + A9A1297119DF144D005BCBC1 /* papyriplain.h */, + A9A1297219DF144D005BCBC1 /* rawcom.h */, + A9A1297319DF144D005BCBC1 /* rawcom4.h */, + A9A1297419DF144D005BCBC1 /* rawfiles.h */, + A9A1297519DF144D005BCBC1 /* rawgenbook.h */, + A9A1297619DF144D005BCBC1 /* rawld.h */, + A9A1297719DF144D005BCBC1 /* rawld4.h */, + A9A1297819DF144D005BCBC1 /* rawstr.h */, + A9A1297919DF144D005BCBC1 /* rawstr4.h */, + A9A1297A19DF144D005BCBC1 /* rawtext.h */, + A9A1297B19DF144D005BCBC1 /* rawtext4.h */, + A9A1297C19DF144D005BCBC1 /* rawverse.h */, + A9A1297D19DF144D005BCBC1 /* rawverse4.h */, + A9A1297E19DF144D005BCBC1 /* remotetrans.h */, + A9A1297F19DF144D005BCBC1 /* roman.h */, + A9A1298019DF144D005BCBC1 /* rtfhtml.h */, + A9A1298119DF144D005BCBC1 /* sapphire.h */, + A9A1298219DF144D005BCBC1 /* scsuutf8.h */, + A9A1298419DF144D005BCBC1 /* stringmgr.h */, + A9A1298519DF144D005BCBC1 /* strkey.h */, + A9A1298619DF144D005BCBC1 /* swbasicfilter.h */, + A9A1298719DF144D005BCBC1 /* swbuf.h */, + A9A1298819DF144D005BCBC1 /* swcacher.h */, + A9A1298919DF144D005BCBC1 /* swcipher.h */, + A9A1298A19DF144D005BCBC1 /* swcom.h */, + A9A1298B19DF144D005BCBC1 /* swcomprs.h */, + A9A1298C19DF144D005BCBC1 /* swconfig.h */, + A9A1298D19DF144D005BCBC1 /* swdisp.h */, + A9A1298E19DF144D005BCBC1 /* swfilter.h */, + A9A1298F19DF144D005BCBC1 /* swfiltermgr.h */, + A9A1299019DF144D005BCBC1 /* swgenbook.h */, + A9A1299119DF144D005BCBC1 /* swinputmeth.h */, + A9A1299219DF144D005BCBC1 /* swkey.h */, + A9A1299319DF144D005BCBC1 /* swld.h */, + A9A1299419DF144D005BCBC1 /* swlocale.h */, + A9A1299519DF144D005BCBC1 /* swlog.h */, + A9A1299619DF144D005BCBC1 /* swmacs.h */, + A9A1299719DF144D005BCBC1 /* swmgr.h */, + A9A1299819DF144D005BCBC1 /* swmodule.h */, + A9A1299919DF144D005BCBC1 /* swobject.h */, + A9A1299A19DF144D005BCBC1 /* swoptfilter.h */, + A9A1299C19DF144D005BCBC1 /* swsearchable.h */, + A9A1299D19DF144D005BCBC1 /* swtext.h */, + A9A1299E19DF144D005BCBC1 /* swversion.h */, + A9A129A019DF144D005BCBC1 /* sysdata.h */, + A9A129A119DF144D005BCBC1 /* teihtmlhref.h */, + A9A129A219DF144D005BCBC1 /* teilatex.h */, + A9A129A319DF144D005BCBC1 /* teiplain.h */, + A9A129A419DF144D005BCBC1 /* teirtf.h */, + A9A129A519DF144D005BCBC1 /* teixhtml.h */, + A9A129A619DF144D005BCBC1 /* thmlfootnotes.h */, + A9A129A719DF144D005BCBC1 /* thmlgbf.h */, + A9A129A819DF144D005BCBC1 /* thmlheadings.h */, + A9A129A919DF144D005BCBC1 /* thmlhtml.h */, + A9A129AA19DF144D005BCBC1 /* thmlhtmlhref.h */, + A9A129AB19DF144D005BCBC1 /* thmllatex.h */, + A9A129AC19DF144D005BCBC1 /* thmllemma.h */, + A9A129AD19DF144D005BCBC1 /* thmlmorph.h */, + A9A129AE19DF144D005BCBC1 /* thmlosis.h */, + A9A129AF19DF144D005BCBC1 /* thmlplain.h */, + A9A129B019DF144D005BCBC1 /* thmlrtf.h */, + A9A129B119DF144D005BCBC1 /* thmlscripref.h */, + A9A129B219DF144D005BCBC1 /* thmlstrongs.h */, + A9A129B319DF144D005BCBC1 /* thmlvariants.h */, + A9A129B419DF144D005BCBC1 /* thmlwebif.h */, + A9A129B519DF144D005BCBC1 /* thmlwordjs.h */, + A9A129B619DF144D005BCBC1 /* thmlxhtml.h */, + A9A129B719DF144D005BCBC1 /* treekey.h */, + A9A129B819DF144D005BCBC1 /* treekeyidx.h */, + A9A129B919DF144D005BCBC1 /* unicodertf.h */, + A9A129BA19DF144D005BCBC1 /* untgz.h */, + A9A129BB19DF144D005BCBC1 /* url.h */, + A9A129BC19DF144D005BCBC1 /* utf16utf8.h */, + A9A129BD19DF144D005BCBC1 /* utf8arabicpoints.h */, + A9A129BE19DF144D005BCBC1 /* utf8arshaping.h */, + A9A129BF19DF144D005BCBC1 /* utf8bidireorder.h */, + A9A129C019DF144D005BCBC1 /* utf8cantillation.h */, + A9A129C119DF144D005BCBC1 /* utf8greekaccents.h */, + A9A129C219DF144D005BCBC1 /* utf8hebrewpoints.h */, + A9A129C319DF144D005BCBC1 /* utf8html.h */, + A9A129C419DF144D005BCBC1 /* utf8latin1.h */, + A9A129C519DF144D005BCBC1 /* utf8nfc.h */, + A9A129C619DF144D005BCBC1 /* utf8nfkd.h */, + A9A129C719DF144D005BCBC1 /* utf8scsu.h */, + A9A129C819DF144D005BCBC1 /* utf8transliterator.h */, + A9A129C919DF144D005BCBC1 /* utf8utf16.h */, + A9A129CA19DF144D005BCBC1 /* utilstr.h */, + A9A129CB19DF144D005BCBC1 /* utilxml.h */, + A9A129CC19DF144D005BCBC1 /* versekey.h */, + A9A129CD19DF144D005BCBC1 /* versetreekey.h */, + A9A129CE19DF144D005BCBC1 /* versificationmgr.h */, + A9A129CF19DF144D005BCBC1 /* xzcomprs.h */, + A9A129D019DF144D005BCBC1 /* zcom.h */, + A9A129D119DF144D005BCBC1 /* zcom4.h */, + A9A129D219DF144D005BCBC1 /* zconf.h */, + A9A129D319DF144D005BCBC1 /* zipcomprs.h */, + A9A129D419DF144D005BCBC1 /* zld.h */, + A9A129D519DF144D005BCBC1 /* zlib.h */, + A9A129D619DF144D005BCBC1 /* zstr.h */, + A9A129D719DF144D005BCBC1 /* ztext.h */, + A9A129D819DF144D005BCBC1 /* ztext4.h */, + A9A129D919DF144D005BCBC1 /* zverse.h */, + A9A129DA19DF144D005BCBC1 /* zverse4.h */, + ); + name = include; + path = ../../include; + sourceTree = "<group>"; + }; + A9A1294F19DF144D005BCBC1 /* internal */ = { + isa = PBXGroup; + children = ( + A9A1295019DF144D005BCBC1 /* regex */, + ); + path = internal; + sourceTree = "<group>"; + }; + A9A1295019DF144D005BCBC1 /* regex */ = { + isa = PBXGroup; + children = ( + A9A1295119DF144D005BCBC1 /* regex.h */, + ); + path = regex; + sourceTree = "<group>"; + }; + A9BB673F1C6BCD9600EB1A49 /* zlib */ = { + isa = PBXGroup; + children = ( + A9BB67401C6BCD9600EB1A49 /* adler32.c */, + A9BB67411C6BCD9600EB1A49 /* compress.c */, + A9BB67421C6BCD9600EB1A49 /* crc32.c */, + A9BB67441C6BCD9600EB1A49 /* deflate.c */, + A9BB67461C6BCD9600EB1A49 /* gzclose.c */, + A9BB67481C6BCD9600EB1A49 /* gzlib.c */, + A9BB67491C6BCD9600EB1A49 /* gzread.c */, + A9BB674A1C6BCD9600EB1A49 /* gzwrite.c */, + A9BB674B1C6BCD9600EB1A49 /* infback.c */, + A9BB674C1C6BCD9600EB1A49 /* inffast.c */, + A9BB674F1C6BCD9600EB1A49 /* inflate.c */, + A9BB67511C6BCD9600EB1A49 /* inftrees.c */, + A9BB67531C6BCD9600EB1A49 /* trees.c */, + A9BB67551C6BCD9600EB1A49 /* uncompr.c */, + A9BB67561C6BCD9600EB1A49 /* untgz.c */, + A9BB67591C6BCD9600EB1A49 /* zutil.c */, + ); + path = zlib; + sourceTree = "<group>"; + }; A9BFB0A313EDF51000032679 /* Frameworks */ = { isa = PBXGroup; children = ( - A9BFB0A413EDF51000032679 /* SenTestingKit.framework */, + A90169D419AA15D500F7FC7D /* icudt53l.dat */, + A9B77D4319A3BB3B00F34557 /* liblzma.dylib */, + A982039919A0A02C00DD808C /* libz.dylib */, + A982039719A0A02300DD808C /* libstdc++.dylib */, + A982039519A0A01200DD808C /* libicucore.dylib */, + A982039319A09FFD00DD808C /* libbz2.dylib */, A9BFB0A613EDF51100032679 /* Cocoa.framework */, A9BFB0A813EDF51100032679 /* Other Frameworks */, ); @@ -2292,22 +4728,245 @@ isa = PBXGroup; children = ( A917AF2516B1BE38006367FC /* Tests-Info.plist */, - A964658011C663E200640FAC /* SwordManagerTest.h */, - A964658111C663E200640FAC /* SwordManagerTest.m */, + A968BE4B19DFF831002C9B78 /* Tests-Bridging-Header.h */, + A995E60B1C87678B00843E13 /* TestGlobals.h */, + A995E6261C877DD000843E13 /* SwordManagerTest.m */, + A995E6091C8763B800843E13 /* SwordManagerTest.swift */, A918B8E211C6697400024D84 /* SwordModuleTest.h */, A918B8E311C6697400024D84 /* SwordModuleTest.m */, - A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */, - A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */, A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */, A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */, + A968BE4C19DFF832002C9B78 /* SwordBibleTest.swift */, + 8C92C0CA467F3114A1DC89DD /* SwordInstallSourceManagerTest.m */, + A969DC7A1DA1289100C8E976 /* SwordLocaleManagerTest.swift */, ); name = Tests; path = test; sourceTree = "<group>"; }; + A9D8FD2B19E2EBD80055700C /* Samples */ = { + isa = PBXGroup; + children = ( + A9D8FD2C19E2EC0E0055700C /* introtest.cpp */, + ); + name = Samples; + sourceTree = "<group>"; + }; + A9EE8A8C19E286E500CFFE6A /* LongRunningTests */ = { + isa = PBXGroup; + children = ( + A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */, + A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */, + A9EE8A8D19E286E500CFFE6A /* Supporting Files */, + ); + path = LongRunningTests; + sourceTree = "<group>"; + }; + A9EE8A8D19E286E500CFFE6A /* Supporting Files */ = { + isa = PBXGroup; + children = ( + A9EE8A8E19E286E500CFFE6A /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 0A011D9B1FB4142500778C2B /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 0A5888951FB44ABF00F7DAA3 /* thmlstrongs.h in Headers */, + 0A58887A1FB44ABE00F7DAA3 /* swlog.h in Headers */, + 0A5888981FB44ABF00F7DAA3 /* thmlwordjs.h in Headers */, + 0A5888481FB44ABE00F7DAA3 /* osislemma.h in Headers */, + 0A5888231FB44ABE00F7DAA3 /* flatapi.h in Headers */, + 0A5888341FB44ABE00F7DAA3 /* gbfwordjs.h in Headers */, + 0A58881D1FB44ABE00F7DAA3 /* defs.h in Headers */, + 0A5888671FB44ABE00F7DAA3 /* sapphire.h in Headers */, + 0A5888631FB44ABE00F7DAA3 /* rawverse4.h in Headers */, + 0A5888301FB44ABE00F7DAA3 /* gbfrtf.h in Headers */, + 0A5888491FB44ABE00F7DAA3 /* osismorph.h in Headers */, + 0A58885D1FB44ABE00F7DAA3 /* rawld4.h in Headers */, + 0A58889A1FB44ABF00F7DAA3 /* treekey.h in Headers */, + 0A5888B61FB44ABF00F7DAA3 /* zipcomprs.h in Headers */, + 0A5888971FB44ABF00F7DAA3 /* thmlwebif.h in Headers */, + 0A5888431FB44ABE00F7DAA3 /* osisfootnotes.h in Headers */, + 0A5888911FB44ABF00F7DAA3 /* thmlosis.h in Headers */, + 0A58882F1FB44ABE00F7DAA3 /* gbfredletterwords.h in Headers */, + 0A5888621FB44ABE00F7DAA3 /* rawverse.h in Headers */, + 0A5888AF1FB44ABF00F7DAA3 /* versekey.h in Headers */, + 0A5888681FB44ABE00F7DAA3 /* scsuutf8.h in Headers */, + 0A5888091FB44ABE00F7DAA3 /* canon.h in Headers */, + 0A5888111FB44ABE00F7DAA3 /* canon_lxx.h in Headers */, + 0A5888721FB44ABE00F7DAA3 /* swdisp.h in Headers */, + 0A5888401FB44ABE00F7DAA3 /* multimapwdef.h in Headers */, + 0A58882D1FB44ABE00F7DAA3 /* gbfosis.h in Headers */, + 0A58884B1FB44ABE00F7DAA3 /* osisosis.h in Headers */, + 0A5888221FB44ABE00F7DAA3 /* filemgr.h in Headers */, + 0A5888761FB44ABE00F7DAA3 /* swinputmeth.h in Headers */, + 0A5888251FB44ABE00F7DAA3 /* ftplibftpt.h in Headers */, + 0A5888891FB44ABF00F7DAA3 /* thmlfootnotes.h in Headers */, + 0A5888281FB44ABE00F7DAA3 /* gbfheadings.h in Headers */, + 0A5888851FB44ABF00F7DAA3 /* teilatex.h in Headers */, + 0A5888831FB44ABF00F7DAA3 /* sysdata.h in Headers */, + 0A5888101FB44ABE00F7DAA3 /* canon_luther.h in Headers */, + 0A5888151FB44ABE00F7DAA3 /* canon_null.h in Headers */, + 0A5888941FB44ABF00F7DAA3 /* thmlscripref.h in Headers */, + 0A5888241FB44ABE00F7DAA3 /* ftplib.h in Headers */, + 0A5888791FB44ABE00F7DAA3 /* swlocale.h in Headers */, + 0A58888E1FB44ABF00F7DAA3 /* thmllatex.h in Headers */, + 0A5888651FB44ABE00F7DAA3 /* roman.h in Headers */, + 0A58881E1FB44ABE00F7DAA3 /* echomod.h in Headers */, + 0A58880F1FB44ABE00F7DAA3 /* canon_leningrad.h in Headers */, + 0A5888501FB44ABE00F7DAA3 /* osisscripref.h in Headers */, + 0A5888551FB44ABE00F7DAA3 /* osisxhtml.h in Headers */, + 0A58889D1FB44ABF00F7DAA3 /* untgz.h in Headers */, + 0A5888601FB44ABE00F7DAA3 /* rawtext.h in Headers */, + 0A58886A1FB44ABE00F7DAA3 /* strkey.h in Headers */, + 0A58880D1FB44ABE00F7DAA3 /* canon_german.h in Headers */, + 0A58880A1FB44ABE00F7DAA3 /* canon_abbrevs.h in Headers */, + 0A5888211FB44ABE00F7DAA3 /* femain.h in Headers */, + 0A58880B1FB44ABE00F7DAA3 /* canon_catholic.h in Headers */, + 0A5888A21FB44ABF00F7DAA3 /* utf8bidireorder.h in Headers */, + 0A5888961FB44ABF00F7DAA3 /* thmlvariants.h in Headers */, + 0A58882A1FB44ABE00F7DAA3 /* gbfhtmlhref.h in Headers */, + 0A58886E1FB44ABE00F7DAA3 /* swcipher.h in Headers */, + 0A5888BA1FB44ABF00F7DAA3 /* ztext.h in Headers */, + 0A5888BC1FB44ABF00F7DAA3 /* zverse.h in Headers */, + 0A5888351FB44ABE00F7DAA3 /* gbfxhtml.h in Headers */, + 0A5888A91FB44ABF00F7DAA3 /* utf8nfkd.h in Headers */, + 0A5888451FB44ABE00F7DAA3 /* osisheadings.h in Headers */, + 0A5888881FB44ABF00F7DAA3 /* teixhtml.h in Headers */, + 0A58887B1FB44ABE00F7DAA3 /* swmacs.h in Headers */, + 0A58884C1FB44ABE00F7DAA3 /* osisplain.h in Headers */, + 0A58883C1FB44ABE00F7DAA3 /* listkey.h in Headers */, + 0A5888291FB44ABE00F7DAA3 /* gbfhtml.h in Headers */, + 0A5888181FB44ABE00F7DAA3 /* canon_synodalprot.h in Headers */, + 0A5888811FB44ABF00F7DAA3 /* swtext.h in Headers */, + 0A58880C1FB44ABE00F7DAA3 /* canon_catholic2.h in Headers */, + 0A5888131FB44ABE00F7DAA3 /* canon_nrsv.h in Headers */, + 0A5888771FB44ABE00F7DAA3 /* swkey.h in Headers */, + 0A5888321FB44ABE00F7DAA3 /* gbfthml.h in Headers */, + 0A58887E1FB44ABE00F7DAA3 /* swobject.h in Headers */, + 0A5888201FB44ABE00F7DAA3 /* entriesblk.h in Headers */, + 0A5888B81FB44ABF00F7DAA3 /* zlib.h in Headers */, + 0A5888B41FB44ABF00F7DAA3 /* zcom4.h in Headers */, + 0A5888B51FB44ABF00F7DAA3 /* zconf.h in Headers */, + 0A58886B1FB44ABE00F7DAA3 /* swbasicfilter.h in Headers */, + 0A58880E1FB44ABE00F7DAA3 /* canon_kjva.h in Headers */, + 0A58888A1FB44ABF00F7DAA3 /* thmlgbf.h in Headers */, + 0A58883D1FB44ABE00F7DAA3 /* localemgr.h in Headers */, + 0A5888701FB44ABE00F7DAA3 /* swcomprs.h in Headers */, + 0A58889F1FB44ABF00F7DAA3 /* utf16utf8.h in Headers */, + 0A58887C1FB44ABE00F7DAA3 /* swmgr.h in Headers */, + 0A5888AA1FB44ABF00F7DAA3 /* utf8scsu.h in Headers */, + 0A5888081FB44ABE00F7DAA3 /* bz2comprs.h in Headers */, + 0A5888421FB44ABE00F7DAA3 /* osisenum.h in Headers */, + 0A5888A61FB44ABF00F7DAA3 /* utf8html.h in Headers */, + 0A58888B1FB44ABF00F7DAA3 /* thmlheadings.h in Headers */, + 0A5888191FB44ABE00F7DAA3 /* canon_vulg.h in Headers */, + 0A5888171FB44ABE00F7DAA3 /* canon_synodal.h in Headers */, + 0A5888741FB44ABE00F7DAA3 /* swfiltermgr.h in Headers */, + 0A5888531FB44ABE00F7DAA3 /* osiswebif.h in Headers */, + 0A5888BD1FB44ABF00F7DAA3 /* zverse4.h in Headers */, + 0A5888051FB44ABE00F7DAA3 /* canon_calvin.h in Headers */, + 0A58882E1FB44ABE00F7DAA3 /* gbfplain.h in Headers */, + 0A58885E1FB44ABE00F7DAA3 /* rawstr.h in Headers */, + 0A58888C1FB44ABF00F7DAA3 /* thmlhtml.h in Headers */, + 0A5888471FB44ABE00F7DAA3 /* osislatex.h in Headers */, + 0A5888A71FB44ABF00F7DAA3 /* utf8latin1.h in Headers */, + 0A5888931FB44ABF00F7DAA3 /* thmlrtf.h in Headers */, + 0A5888391FB44ABE00F7DAA3 /* installmgr.h in Headers */, + 0A5888071FB44ABE00F7DAA3 /* canon_segond.h in Headers */, + 0A5888661FB44ABE00F7DAA3 /* rtfhtml.h in Headers */, + 0A58884D1FB44ABE00F7DAA3 /* osisredletterwords.h in Headers */, + 0A5888141FB44ABE00F7DAA3 /* canon_nrsva.h in Headers */, + 0A5888261FB44ABE00F7DAA3 /* ftpparse.h in Headers */, + 0AA1DD371FB46FD00082E131 /* sword.h in Headers */, + 0A58886F1FB44ABE00F7DAA3 /* swcom.h in Headers */, + 0A5888BE1FB44ACC00F7DAA3 /* regex.h in Headers */, + 0A5888821FB44ABF00F7DAA3 /* swversion.h in Headers */, + 0A5888311FB44ABE00F7DAA3 /* gbfstrongs.h in Headers */, + 0A5888461FB44ABE00F7DAA3 /* osishtmlhref.h in Headers */, + 0A5888411FB44ABE00F7DAA3 /* nullim.h in Headers */, + 0A5888271FB44ABE00F7DAA3 /* gbffootnotes.h in Headers */, + 0A5888591FB44ABE00F7DAA3 /* rawcom4.h in Headers */, + 0A5888A81FB44ABF00F7DAA3 /* utf8nfc.h in Headers */, + 0A5888991FB44ABF00F7DAA3 /* thmlxhtml.h in Headers */, + 0A5888541FB44ABE00F7DAA3 /* osiswordjs.h in Headers */, + 0A5888781FB44ABE00F7DAA3 /* swld.h in Headers */, + 0A58888F1FB44ABF00F7DAA3 /* thmllemma.h in Headers */, + 0A5888A41FB44ABF00F7DAA3 /* utf8greekaccents.h in Headers */, + 0A58881F1FB44ABE00F7DAA3 /* encfiltmgr.h in Headers */, + 0A5888AE1FB44ABF00F7DAA3 /* utilxml.h in Headers */, + 0A5888571FB44ABE00F7DAA3 /* papyriplain.h in Headers */, + 0A58885A1FB44ABE00F7DAA3 /* rawfiles.h in Headers */, + 0A5888561FB44ABE00F7DAA3 /* osisxlit.h in Headers */, + 0A5888871FB44ABF00F7DAA3 /* teirtf.h in Headers */, + 0A5888AC1FB44ABF00F7DAA3 /* utf8utf16.h in Headers */, + 0A5888511FB44ABE00F7DAA3 /* osisstrongs.h in Headers */, + 0A5888A31FB44ABF00F7DAA3 /* utf8cantillation.h in Headers */, + 0A5888731FB44ABE00F7DAA3 /* swfilter.h in Headers */, + 0A58885B1FB44ABE00F7DAA3 /* rawgenbook.h in Headers */, + 0A58884E1FB44ABE00F7DAA3 /* osisreferencelinks.h in Headers */, + 0A5888B01FB44ABF00F7DAA3 /* versetreekey.h in Headers */, + 0A5888861FB44ABF00F7DAA3 /* teiplain.h in Headers */, + 0A58888D1FB44ABF00F7DAA3 /* thmlhtmlhref.h in Headers */, + 0A5888371FB44ABE00F7DAA3 /* hebrewmcim.h in Headers */, + 0A58882C1FB44ABE00F7DAA3 /* gbfmorph.h in Headers */, + 0A5888121FB44ABE00F7DAA3 /* canon_mt.h in Headers */, + 0A58883A1FB44ABE00F7DAA3 /* latin1utf16.h in Headers */, + 0A5888B31FB44ABF00F7DAA3 /* zcom.h in Headers */, + 0A58884A1FB44ABE00F7DAA3 /* osismorphsegmentation.h in Headers */, + 0A5888B11FB44ABF00F7DAA3 /* versificationmgr.h in Headers */, + 0A58889E1FB44ABF00F7DAA3 /* url.h in Headers */, + 0A5888A11FB44ABF00F7DAA3 /* utf8arshaping.h in Headers */, + 0A5888B71FB44ABF00F7DAA3 /* zld.h in Headers */, + 0A58881B1FB44ABE00F7DAA3 /* curlftpt.h in Headers */, + 0A5888441FB44ABE00F7DAA3 /* osisglosses.h in Headers */, + 0A5888061FB44ABE00F7DAA3 /* canon_darbyfr.h in Headers */, + 0A5888641FB44ABE00F7DAA3 /* remotetrans.h in Headers */, + 0A58887D1FB44ABE00F7DAA3 /* swmodule.h in Headers */, + 0A58883F1FB44ABE00F7DAA3 /* markupfiltmgr.h in Headers */, + 0A5888841FB44ABF00F7DAA3 /* teihtmlhref.h in Headers */, + 0A5888B21FB44ABF00F7DAA3 /* xzcomprs.h in Headers */, + 0A5888691FB44ABE00F7DAA3 /* stringmgr.h in Headers */, + 0A5888BB1FB44ABF00F7DAA3 /* ztext4.h in Headers */, + 0A5888581FB44ABE00F7DAA3 /* rawcom.h in Headers */, + 0A58886D1FB44ABE00F7DAA3 /* swcacher.h in Headers */, + 0A5888381FB44ABE00F7DAA3 /* hrefcom.h in Headers */, + 0A5888161FB44ABE00F7DAA3 /* canon_orthodox.h in Headers */, + 0A5888A51FB44ABF00F7DAA3 /* utf8hebrewpoints.h in Headers */, + 0A58885C1FB44ABE00F7DAA3 /* rawld.h in Headers */, + 0A58885F1FB44ABE00F7DAA3 /* rawstr4.h in Headers */, + 0A5888801FB44ABF00F7DAA3 /* swsearchable.h in Headers */, + 0A58889C1FB44ABF00F7DAA3 /* unicodertf.h in Headers */, + 0A5888901FB44ABF00F7DAA3 /* thmlmorph.h in Headers */, + 0A58889B1FB44ABF00F7DAA3 /* treekeyidx.h in Headers */, + 0A58883B1FB44ABE00F7DAA3 /* latin1utf8.h in Headers */, + 0A5888611FB44ABE00F7DAA3 /* rawtext4.h in Headers */, + 0A5888711FB44ABE00F7DAA3 /* swconfig.h in Headers */, + 0A5888921FB44ABF00F7DAA3 /* thmlplain.h in Headers */, + 0A5888521FB44ABE00F7DAA3 /* osisvariants.h in Headers */, + 0A58887F1FB44ABE00F7DAA3 /* swoptfilter.h in Headers */, + 0A5888B91FB44ABF00F7DAA3 /* zstr.h in Headers */, + 0A58883E1FB44ABE00F7DAA3 /* lzsscomprs.h in Headers */, + 0A5888331FB44ABE00F7DAA3 /* gbfwebif.h in Headers */, + 0A5888AB1FB44ABF00F7DAA3 /* utf8transliterator.h in Headers */, + 0A58886C1FB44ABE00F7DAA3 /* swbuf.h in Headers */, + 0A58882B1FB44ABE00F7DAA3 /* gbflatex.h in Headers */, + 0A5888361FB44ABE00F7DAA3 /* greeklexattribs.h in Headers */, + 0A58884F1FB44ABE00F7DAA3 /* osisrtf.h in Headers */, + 0A5888A01FB44ABF00F7DAA3 /* utf8arabicpoints.h in Headers */, + 0A5888AD1FB44ABF00F7DAA3 /* utilstr.h in Headers */, + 0A58881A1FB44ABE00F7DAA3 /* cipherfil.h in Headers */, + 0A5888751FB44ABE00F7DAA3 /* swgenbook.h in Headers */, + 0A58881C1FB44ABE00F7DAA3 /* curlhttpt.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8DC2EF500486A6940098B216 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -2316,6 +4975,192 @@ A94EAC0B117B28920018B06F /* SwordBible.h in Headers */, A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */, A94EAC0F117B28920018B06F /* SwordBibleChapter.h in Headers */, + A9A12A2419DF1450005BCBC1 /* osisredletterwords.h in Headers */, + A9A12A3A19DF1452005BCBC1 /* rawverse4.h in Headers */, + A9A12A5719DF1455005BCBC1 /* swoptfilter.h in Headers */, + A9A12A8919DF145D005BCBC1 /* versekey.h in Headers */, + A9A12A1E19DF1450005BCBC1 /* osislatex.h in Headers */, + A9A12A8619DF145D005BCBC1 /* utf8utf16.h in Headers */, + A9A129E119DF144D005BCBC1 /* canon_kjva.h in Headers */, + A9A12A3E19DF1452005BCBC1 /* sapphire.h in Headers */, + A9A12A7819DF145A005BCBC1 /* url.h in Headers */, + A9A12A1A19DF144F005BCBC1 /* osisfootnotes.h in Headers */, + A9A12A7419DF145A005BCBC1 /* treekey.h in Headers */, + A9A12A9419DF1460005BCBC1 /* ztext.h in Headers */, + A9A12A7119DF1459005BCBC1 /* thmlwebif.h in Headers */, + A9A12A5D19DF1456005BCBC1 /* sysdata.h in Headers */, + A9A12A5919DF1456005BCBC1 /* swsearchable.h in Headers */, + A9A12A6119DF1457005BCBC1 /* teirtf.h in Headers */, + A9A12A4919DF1454005BCBC1 /* swconfig.h in Headers */, + A9A12A0E19DF144F005BCBC1 /* regex.h in Headers */, + A9A12A4719DF1453005BCBC1 /* swcom.h in Headers */, + A9A12A2219DF1450005BCBC1 /* osisosis.h in Headers */, + A9A12A2619DF1450005BCBC1 /* osisrtf.h in Headers */, + A9A12A5B19DF1456005BCBC1 /* swversion.h in Headers */, + A9A12A8F19DF145F005BCBC1 /* zconf.h in Headers */, + A9A12A7D19DF145B005BCBC1 /* utf8cantillation.h in Headers */, + A9A12A5F19DF1456005BCBC1 /* teilatex.h in Headers */, + A9A129FE19DF144E005BCBC1 /* gbfhtmlhref.h in Headers */, + A9A94A3A1DCB21AB00F69260 /* canon_segond.h in Headers */, + A9A129F319DF144D005BCBC1 /* encfiltmgr.h in Headers */, + A9A12A6F19DF1459005BCBC1 /* thmlstrongs.h in Headers */, + A9A12A2B19DF1451005BCBC1 /* osiswordjs.h in Headers */, + A9A12A7519DF145A005BCBC1 /* treekeyidx.h in Headers */, + A9A12A6B19DF1458005BCBC1 /* thmlosis.h in Headers */, + A9A129E019DF144D005BCBC1 /* canon_german.h in Headers */, + A9A12A4B19DF1454005BCBC1 /* swfilter.h in Headers */, + A9A12A5419DF1455005BCBC1 /* swmgr.h in Headers */, + A9A129F719DF144E005BCBC1 /* flatapi.h in Headers */, + A9A129FD19DF144E005BCBC1 /* gbfhtml.h in Headers */, + A9A12A8419DF145C005BCBC1 /* utf8scsu.h in Headers */, + A9A129DC19DF144D005BCBC1 /* canon.h in Headers */, + A9A12A4A19DF1454005BCBC1 /* swdisp.h in Headers */, + A9A129EA19DF144D005BCBC1 /* canon_synodal.h in Headers */, + A9A12A3519DF1452005BCBC1 /* rawstr.h in Headers */, + A9A12A7E19DF145B005BCBC1 /* utf8greekaccents.h in Headers */, + A9A12A4119DF1453005BCBC1 /* stringmgr.h in Headers */, + A9A129E719DF144D005BCBC1 /* canon_nrsva.h in Headers */, + A9A12A0C19DF144F005BCBC1 /* hrefcom.h in Headers */, + A9A12A6919DF1458005BCBC1 /* thmllemma.h in Headers */, + A9A12A2319DF1450005BCBC1 /* osisplain.h in Headers */, + A9A12A3B19DF1452005BCBC1 /* remotetrans.h in Headers */, + A9A12A3619DF1452005BCBC1 /* rawstr4.h in Headers */, + A9A12A0919DF144E005BCBC1 /* gbfxhtml.h in Headers */, + A9A129FB19DF144E005BCBC1 /* gbffootnotes.h in Headers */, + A9A12A6019DF1457005BCBC1 /* teiplain.h in Headers */, + A9A12A5019DF1455005BCBC1 /* swld.h in Headers */, + A9A12A8B19DF145E005BCBC1 /* versificationmgr.h in Headers */, + A9A12A0719DF144E005BCBC1 /* gbfwebif.h in Headers */, + A9A12A4C19DF1454005BCBC1 /* swfiltermgr.h in Headers */, + A9A12A3019DF1451005BCBC1 /* rawcom4.h in Headers */, + A9A12A5A19DF1456005BCBC1 /* swtext.h in Headers */, + A9A129F019DF144D005BCBC1 /* curlhttpt.h in Headers */, + A9A12A6619DF1457005BCBC1 /* thmlhtml.h in Headers */, + A9A12A8719DF145D005BCBC1 /* utilstr.h in Headers */, + A9A129ED19DF144D005BCBC1 /* cipherfil.h in Headers */, + A9A12A0A19DF144E005BCBC1 /* greeklexattribs.h in Headers */, + A9A12A0319DF144E005BCBC1 /* gbfredletterwords.h in Headers */, + A9A12A8119DF145C005BCBC1 /* utf8latin1.h in Headers */, + A9A12A9319DF145F005BCBC1 /* zstr.h in Headers */, + A9A12A7C19DF145B005BCBC1 /* utf8bidireorder.h in Headers */, + A9A12A9219DF145F005BCBC1 /* zlib.h in Headers */, + A9A12A2E19DF1451005BCBC1 /* papyriplain.h in Headers */, + A9A12A2919DF1450005BCBC1 /* osisvariants.h in Headers */, + A9A12A0419DF144E005BCBC1 /* gbfrtf.h in Headers */, + A9A12A7619DF145A005BCBC1 /* unicodertf.h in Headers */, + A9A129FA19DF144E005BCBC1 /* ftpparse.h in Headers */, + A9A12A7A19DF145B005BCBC1 /* utf8arabicpoints.h in Headers */, + A9A12A8A19DF145E005BCBC1 /* versetreekey.h in Headers */, + A9A12A6E19DF1459005BCBC1 /* thmlscripref.h in Headers */, + A9A12A8019DF145C005BCBC1 /* utf8html.h in Headers */, + A9A12A1D19DF1450005BCBC1 /* osishtmlhref.h in Headers */, + A9A12A4619DF1453005BCBC1 /* swcipher.h in Headers */, + A9A12A4E19DF1454005BCBC1 /* swinputmeth.h in Headers */, + A9A12A5219DF1455005BCBC1 /* swlog.h in Headers */, + A9A12A6419DF1457005BCBC1 /* thmlgbf.h in Headers */, + A9A129F119DF144D005BCBC1 /* defs.h in Headers */, + A9A129F519DF144E005BCBC1 /* femain.h in Headers */, + A9A12A1219DF144F005BCBC1 /* localemgr.h in Headers */, + A9A12A8C19DF145E005BCBC1 /* xzcomprs.h in Headers */, + A9A129E519DF144D005BCBC1 /* canon_mt.h in Headers */, + A9A12A1019DF144F005BCBC1 /* latin1utf8.h in Headers */, + A9A129EF19DF144D005BCBC1 /* curlftpt.h in Headers */, + A9A12A8E19DF145E005BCBC1 /* zcom4.h in Headers */, + A9A129DB19DF144D005BCBC1 /* bz2comprs.h in Headers */, + A9A12A0819DF144E005BCBC1 /* gbfwordjs.h in Headers */, + A9A12A2019DF1450005BCBC1 /* osismorph.h in Headers */, + A9A12A8219DF145C005BCBC1 /* utf8nfc.h in Headers */, + A9A12A5319DF1455005BCBC1 /* swmacs.h in Headers */, + A9A12A0219DF144E005BCBC1 /* gbfplain.h in Headers */, + A9A129F419DF144D005BCBC1 /* entriesblk.h in Headers */, + A9A12A4819DF1454005BCBC1 /* swcomprs.h in Headers */, + A9A12A3819DF1452005BCBC1 /* rawtext4.h in Headers */, + A9A12A7019DF1459005BCBC1 /* thmlvariants.h in Headers */, + A9A12A7F19DF145C005BCBC1 /* utf8hebrewpoints.h in Headers */, + A9A12A2719DF1450005BCBC1 /* osisscripref.h in Headers */, + A9A12A6519DF1457005BCBC1 /* thmlheadings.h in Headers */, + A9A12A4F19DF1454005BCBC1 /* swkey.h in Headers */, + A9A12A4219DF1453005BCBC1 /* strkey.h in Headers */, + A9A129DD19DF144D005BCBC1 /* canon_abbrevs.h in Headers */, + A9A12A4D19DF1454005BCBC1 /* swgenbook.h in Headers */, + A9A129DF19DF144D005BCBC1 /* canon_catholic2.h in Headers */, + A9A12A8D19DF145E005BCBC1 /* zcom.h in Headers */, + A9A12A2519DF1450005BCBC1 /* osisreferencelinks.h in Headers */, + A9A129E619DF144D005BCBC1 /* canon_nrsv.h in Headers */, + A9A12A1119DF144F005BCBC1 /* listkey.h in Headers */, + A9A12A4419DF1453005BCBC1 /* swbuf.h in Headers */, + A9A12A3419DF1451005BCBC1 /* rawld4.h in Headers */, + A9A12A1F19DF1450005BCBC1 /* osislemma.h in Headers */, + A9A129EC19DF144D005BCBC1 /* canon_vulg.h in Headers */, + A9A12A3219DF1451005BCBC1 /* rawgenbook.h in Headers */, + A9A12A8519DF145D005BCBC1 /* utf8transliterator.h in Headers */, + A9A12A0F19DF144F005BCBC1 /* latin1utf16.h in Headers */, + A9A94A381DCB21AB00F69260 /* canon_calvin.h in Headers */, + A9A12A8319DF145C005BCBC1 /* utf8nfkd.h in Headers */, + A9A12A9019DF145F005BCBC1 /* zipcomprs.h in Headers */, + A9A12A0519DF144E005BCBC1 /* gbfstrongs.h in Headers */, + A9A129E219DF144D005BCBC1 /* canon_leningrad.h in Headers */, + A9A12A1719DF144F005BCBC1 /* multimapwdef.h in Headers */, + A9A12A2F19DF1451005BCBC1 /* rawcom.h in Headers */, + A9A129F819DF144E005BCBC1 /* ftplib.h in Headers */, + A9A129FF19DF144E005BCBC1 /* gbflatex.h in Headers */, + A9A12A4319DF1453005BCBC1 /* swbasicfilter.h in Headers */, + A9A12A2C19DF1451005BCBC1 /* osisxhtml.h in Headers */, + A9A12A1619DF144F005BCBC1 /* markupfiltmgr.h in Headers */, + A9A12A7219DF1459005BCBC1 /* thmlwordjs.h in Headers */, + A9A12A5619DF1455005BCBC1 /* swobject.h in Headers */, + A9A12A2A19DF1451005BCBC1 /* osiswebif.h in Headers */, + A9A12A6A19DF1458005BCBC1 /* thmlmorph.h in Headers */, + A9A129F219DF144D005BCBC1 /* echomod.h in Headers */, + A9A12A1819DF144F005BCBC1 /* nullim.h in Headers */, + A9A12A6219DF1457005BCBC1 /* teixhtml.h in Headers */, + A9A12A0B19DF144E005BCBC1 /* hebrewmcim.h in Headers */, + A9A12A2819DF1450005BCBC1 /* osisstrongs.h in Headers */, + A9A12A8819DF145D005BCBC1 /* utilxml.h in Headers */, + A9A12A3319DF1451005BCBC1 /* rawld.h in Headers */, + A9A12A6D19DF1458005BCBC1 /* thmlrtf.h in Headers */, + A9A12A0619DF144E005BCBC1 /* gbfthml.h in Headers */, + A9A129F619DF144E005BCBC1 /* filemgr.h in Headers */, + A9A12A2D19DF1451005BCBC1 /* osisxlit.h in Headers */, + A9A12A5519DF1455005BCBC1 /* swmodule.h in Headers */, + A9A12A0019DF144E005BCBC1 /* gbfmorph.h in Headers */, + A9A12A1B19DF144F005BCBC1 /* osisglosses.h in Headers */, + A9A12A5E19DF1456005BCBC1 /* teihtmlhref.h in Headers */, + A9A12A1C19DF144F005BCBC1 /* osisheadings.h in Headers */, + A9A129E419DF144D005BCBC1 /* canon_lxx.h in Headers */, + A9A12A1319DF144F005BCBC1 /* lzsscomprs.h in Headers */, + A9A129DE19DF144D005BCBC1 /* canon_catholic.h in Headers */, + A9A12A3C19DF1452005BCBC1 /* roman.h in Headers */, + A9A12A1919DF144F005BCBC1 /* osisenum.h in Headers */, + A9A129FC19DF144E005BCBC1 /* gbfheadings.h in Headers */, + A9A12A9719DF1460005BCBC1 /* zverse4.h in Headers */, + A9A12A3F19DF1453005BCBC1 /* scsuutf8.h in Headers */, + A9A129E319DF144D005BCBC1 /* canon_luther.h in Headers */, + A9A12A6319DF1457005BCBC1 /* thmlfootnotes.h in Headers */, + A9A12A0119DF144E005BCBC1 /* gbfosis.h in Headers */, + A9A129EB19DF144D005BCBC1 /* canon_synodalprot.h in Headers */, + A9A12A7919DF145A005BCBC1 /* utf16utf8.h in Headers */, + A9A12A3D19DF1452005BCBC1 /* rtfhtml.h in Headers */, + A9A12A3719DF1452005BCBC1 /* rawtext.h in Headers */, + A9A12A9119DF145F005BCBC1 /* zld.h in Headers */, + A9A12A6719DF1458005BCBC1 /* thmlhtmlhref.h in Headers */, + A9A12A6819DF1458005BCBC1 /* thmllatex.h in Headers */, + A9A129E819DF144D005BCBC1 /* canon_null.h in Headers */, + A9A129F919DF144E005BCBC1 /* ftplibftpt.h in Headers */, + A9A12A7B19DF145B005BCBC1 /* utf8arshaping.h in Headers */, + A9A12A5119DF1455005BCBC1 /* swlocale.h in Headers */, + A9A129E919DF144D005BCBC1 /* canon_orthodox.h in Headers */, + A9A12A9519DF1460005BCBC1 /* ztext4.h in Headers */, + A9A12A6C19DF1458005BCBC1 /* thmlplain.h in Headers */, + A9A12A3119DF1451005BCBC1 /* rawfiles.h in Headers */, + A9A12A9619DF1460005BCBC1 /* zverse.h in Headers */, + A9A12A4519DF1453005BCBC1 /* swcacher.h in Headers */, + A9A12A0D19DF144F005BCBC1 /* installmgr.h in Headers */, + A9A12A2119DF1450005BCBC1 /* osismorphsegmentation.h in Headers */, + A9A12A7719DF145A005BCBC1 /* untgz.h in Headers */, + A9A12A3919DF1452005BCBC1 /* rawverse.h in Headers */, + A9A12A7319DF1459005BCBC1 /* thmlxhtml.h in Headers */, + A9A94A391DCB21AB00F69260 /* canon_darbyfr.h in Headers */, A94EAC11117B28920018B06F /* SwordBibleTextEntry.h in Headers */, A94EAC13117B28920018B06F /* SwordBook.h in Headers */, A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */, @@ -2336,29 +5181,69 @@ A929619D16B1BA240094E5BE /* SwordKey.h in Headers */, A929619F16B1BA240094E5BE /* SwordListKey.h in Headers */, A92961A116B1BA240094E5BE /* SwordVerseKey.h in Headers */, + A9A127A519DE93A0005BCBC1 /* SwordUtil.h in Headers */, + A9A127A619DE93A0005BCBC1 /* FilterProviderFactory.h in Headers */, + A9A127A719DE93A0005BCBC1 /* DefaultFilterProvider.h in Headers */, + A9A127A819DE93A0005BCBC1 /* SwordFilter.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - A954ABC113EE9AB00094E3FE /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 0A011D9D1FB4142500778C2B /* sword */ = { + isa = PBXNativeTarget; + buildConfigurationList = 0A011DAF1FB4142500778C2B /* Build configuration list for PBXNativeTarget "sword" */; + buildPhases = ( + 0A011D991FB4142500778C2B /* Sources */, + 0A011D9A1FB4142500778C2B /* Frameworks */, + 0A011D9B1FB4142500778C2B /* Headers */, + 0A011D9C1FB4142500778C2B /* Resources */, ); - runOnlyForDeploymentPostprocessing = 0; + buildRules = ( + ); + dependencies = ( + ); + name = sword; + productName = SWORD; + productReference = 0A011D9E1FB4142500778C2B /* sword.framework */; + productType = "com.apple.product-type.framework"; }; - A9BDFA651207F9870067ED5B /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */, - A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */, - A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */, + 0A011DA51FB4142500778C2B /* SWORDTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 0A011DB21FB4142500778C2B /* Build configuration list for PBXNativeTarget "SWORDTests" */; + buildPhases = ( + 0A011DA21FB4142500778C2B /* Sources */, + 0A011DA31FB4142500778C2B /* Frameworks */, + 0A011DA41FB4142500778C2B /* Resources */, ); - runOnlyForDeploymentPostprocessing = 0; + buildRules = ( + ); + dependencies = ( + 0A011DA91FB4142500778C2B /* PBXTargetDependency */, + ); + name = SWORDTests; + productName = SWORDTests; + productReference = 0A011DA61FB4142500778C2B /* SWORDTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 0A1F169F1FBB755B00E0AEFA /* SWORD */ = { + isa = PBXNativeTarget; + buildConfigurationList = 0A1F16A61FBB755B00E0AEFA /* Build configuration list for PBXNativeTarget "SWORD" */; + buildPhases = ( + 0A1F169C1FBB755B00E0AEFA /* Sources */, + 0A1F169D1FBB755B00E0AEFA /* Frameworks */, + 0A1F169E1FBB755B00E0AEFA /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SWORD; + productName = SWORD; + productReference = 0A1F16A01FBB755B00E0AEFA /* libSWORD.a */; + productType = "com.apple.product-type.library.static"; }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ 8DC2EF4F0486A6940098B216 /* ObjCSword */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */; @@ -2372,31 +5257,13 @@ buildRules = ( ); dependencies = ( - A954ABCA13EE9D0F0094E3FE /* PBXTargetDependency */, ); name = ObjCSword; productInstallPath = "$(HOME)/Library/Frameworks"; productName = ObjCSword; - productReference = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; + productReference = 8DC2EF5B0486A6940098B216 /* SWORD.framework */; productType = "com.apple.product-type.framework"; }; - A954ABC213EE9AB00094E3FE /* sword */ = { - isa = PBXNativeTarget; - buildConfigurationList = A954ABC413EE9AB00094E3FE /* Build configuration list for PBXNativeTarget "sword" */; - buildPhases = ( - A954ABBF13EE9AB00094E3FE /* Sources */, - A954ABC013EE9AB00094E3FE /* Frameworks */, - A954ABC113EE9AB00094E3FE /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = sword; - productName = libsword; - productReference = A954ABC313EE9AB00094E3FE /* libsword.dylib */; - productType = "com.apple.product-type.library.dynamic"; - }; A975EED811C792B9007C1532 /* mod2osis */ = { isa = PBXNativeTarget; buildConfigurationList = A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */; @@ -2407,7 +5274,6 @@ buildRules = ( ); dependencies = ( - A9A7EEAE14D5D4BB00B76B6A /* PBXTargetDependency */, ); name = mod2osis; productName = mod2osis; @@ -2424,33 +5290,12 @@ buildRules = ( ); dependencies = ( - A9A7EEC114D5D66400B76B6A /* PBXTargetDependency */, ); name = osis2mod; productName = osis2mod; productReference = A9A7EEB414D5D61700B76B6A /* osis2mod */; productType = "com.apple.product-type.tool"; }; - A9BDFA5A1207F9870067ED5B /* LongRunningTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */; - buildPhases = ( - A9BDFA5D1207F9870067ED5B /* Resources */, - A9BDFA5E1207F9870067ED5B /* Sources */, - A9BDFA611207F9870067ED5B /* Frameworks */, - A9BDFA641207F9870067ED5B /* ShellScript */, - A9BDFA651207F9870067ED5B /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */, - ); - name = LongRunningTests; - productName = Tests; - productReference = A9BDFA6B1207F9870067ED5B /* Tests.octest */; - productType = "com.apple.product-type.bundle"; - }; A9BFB0A113EDF51000032679 /* Tests */ = { isa = PBXNativeTarget; buildConfigurationList = A9BFB0B713EDF51100032679 /* Build configuration list for PBXNativeTarget "Tests" */; @@ -2458,7 +5303,6 @@ A9BFB09D13EDF51000032679 /* Sources */, A9BFB09E13EDF51000032679 /* Frameworks */, A9BFB09F13EDF51000032679 /* Resources */, - A9BFB0A013EDF51000032679 /* ShellScript */, ); buildRules = ( ); @@ -2467,8 +5311,8 @@ ); name = Tests; productName = "Tests-new"; - productReference = A9BFB0A213EDF51000032679 /* Tests.octest */; - productType = "com.apple.product-type.bundle"; + productReference = A9BFB0A213EDF51000032679 /* Tests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; }; A9D2714414D717D800DA8926 /* imp2gbs */ = { isa = PBXNativeTarget; @@ -2480,7 +5324,6 @@ buildRules = ( ); dependencies = ( - A9D2714514D717D800DA8926 /* PBXTargetDependency */, ); name = imp2gbs; productName = mod2osis; @@ -2497,7 +5340,6 @@ buildRules = ( ); dependencies = ( - A9D2715214D717FD00DA8926 /* PBXTargetDependency */, ); name = imp2ld; productName = mod2osis; @@ -2514,7 +5356,6 @@ buildRules = ( ); dependencies = ( - A9D2715F14D7181200DA8926 /* PBXTargetDependency */, ); name = imp2vs; productName = mod2osis; @@ -2531,7 +5372,6 @@ buildRules = ( ); dependencies = ( - A9D2716C14D7182300DA8926 /* PBXTargetDependency */, ); name = installmgr; productName = mod2osis; @@ -2548,7 +5388,6 @@ buildRules = ( ); dependencies = ( - A9D2717914D7183B00DA8926 /* PBXTargetDependency */, ); name = mod2imp; productName = mod2osis; @@ -2565,7 +5404,6 @@ buildRules = ( ); dependencies = ( - A9D2718614D7185800DA8926 /* PBXTargetDependency */, ); name = mod2vpl; productName = mod2osis; @@ -2582,7 +5420,6 @@ buildRules = ( ); dependencies = ( - A9D2719314D7186A00DA8926 /* PBXTargetDependency */, ); name = mod2zmod; productName = mod2osis; @@ -2599,7 +5436,6 @@ buildRules = ( ); dependencies = ( - A9D271A014D7187E00DA8926 /* PBXTargetDependency */, ); name = step2vpl; productName = osis2mod; @@ -2616,7 +5452,6 @@ buildRules = ( ); dependencies = ( - A9D271AD14D7189300DA8926 /* PBXTargetDependency */, ); name = stepdump; productName = osis2mod; @@ -2633,7 +5468,6 @@ buildRules = ( ); dependencies = ( - A9D271BA14D718A400DA8926 /* PBXTargetDependency */, ); name = tei2mod; productName = osis2mod; @@ -2650,7 +5484,6 @@ buildRules = ( ); dependencies = ( - A9D271C714D718B800DA8926 /* PBXTargetDependency */, ); name = vpl2mod; productName = osis2mod; @@ -2667,7 +5500,6 @@ buildRules = ( ); dependencies = ( - A9D271D414D718C800DA8926 /* PBXTargetDependency */, ); name = vs2osisref; productName = osis2mod; @@ -2684,7 +5516,6 @@ buildRules = ( ); dependencies = ( - A9D271E114D718DF00DA8926 /* PBXTargetDependency */, ); name = vs2osisreftxt; productName = osis2mod; @@ -2701,20 +5532,146 @@ buildRules = ( ); dependencies = ( - A9D271EE14D718F500DA8926 /* PBXTargetDependency */, ); name = xml2gbs; productName = osis2mod; productReference = A9D271F714D718F500DA8926 /* xml2gbs */; productType = "com.apple.product-type.tool"; }; + A9D8FD2D19E2EC5B0055700C /* introtest */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D8FD3419E2EC5B0055700C /* Build configuration list for PBXNativeTarget "introtest" */; + buildPhases = ( + A9D8FD3019E2EC5B0055700C /* Sources */, + A9D8FD3219E2EC5B0055700C /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = introtest; + productName = mod2osis; + productReference = A9D8FD3719E2EC5B0055700C /* introtest */; + productType = "com.apple.product-type.tool"; + }; + A9EE8A8A19E286E500CFFE6A /* LongRunningTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9EE8A9419E286E500CFFE6A /* Build configuration list for PBXNativeTarget "LongRunningTests" */; + buildPhases = ( + A9EE8A8719E286E500CFFE6A /* Sources */, + A9EE8A8819E286E500CFFE6A /* Frameworks */, + A9EE8A8919E286E500CFFE6A /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + A9EE8A9319E286E500CFFE6A /* PBXTargetDependency */, + ); + name = LongRunningTests; + productName = LongRunningTests; + productReference = A9EE8A8B19E286E500CFFE6A /* LongRunningTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastSwiftUpdateCheck = 0720; + LastTestingUpgradeCheck = 0610; + LastUpgradeCheck = 0910; + TargetAttributes = { + 0A011D9D1FB4142500778C2B = { + CreatedOnToolsVersion = 9.1; + DevelopmentTeam = J9J97ZC4K5; + ProvisioningStyle = Automatic; + }; + 0A011DA51FB4142500778C2B = { + CreatedOnToolsVersion = 9.1; + DevelopmentTeam = J9J97ZC4K5; + ProvisioningStyle = Automatic; + }; + 0A1F169F1FBB755B00E0AEFA = { + CreatedOnToolsVersion = 9.1; + DevelopmentTeam = J9J97ZC4K5; + ProvisioningStyle = Automatic; + }; + 8DC2EF4F0486A6940098B216 = { + DevelopmentTeam = J9J97ZC4K5; + ProvisioningStyle = Automatic; + }; + A975EED811C792B9007C1532 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9A7EEB314D5D61700B76B6A = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9BFB0A113EDF51000032679 = { + LastSwiftMigration = 0830; + }; + A9D2714414D717D800DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D2715114D717FD00DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D2715E14D7181200DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D2716B14D7182300DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D2717814D7183B00DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D2718514D7185800DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D2719214D7186A00DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D2719F14D7187E00DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D271AC14D7189300DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D271B914D718A400DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D271C614D718B800DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D271D314D718C800DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D271E014D718DF00DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9D271ED14D718F500DA8926 = { + DevelopmentTeam = 27XS5W9C3J; + ProvisioningStyle = Automatic; + }; + A9EE8A8A19E286E500CFFE6A = { + CreatedOnToolsVersion = 6.1; + }; + }; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */; compatibilityVersion = "Xcode 3.2"; @@ -2726,6 +5683,7 @@ French, German, en, + ru, ); mainGroup = 0867D691FE84028FC02AAC07 /* ObjCSword */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; @@ -2733,9 +5691,8 @@ projectRoot = ""; targets = ( 8DC2EF4F0486A6940098B216 /* ObjCSword */, - A9BDFA5A1207F9870067ED5B /* LongRunningTests */, A9BFB0A113EDF51000032679 /* Tests */, - A954ABC213EE9AB00094E3FE /* sword */, + A9EE8A8A19E286E500CFFE6A /* LongRunningTests */, A9D2714414D717D800DA8926 /* imp2gbs */, A9D2715114D717FD00DA8926 /* imp2ld */, A9D2715E14D7181200DA8926 /* imp2vs */, @@ -2753,11 +5710,29 @@ A9D271E014D718DF00DA8926 /* vs2osisreftxt */, A9D271ED14D718F500DA8926 /* xml2gbs */, A9D271FA14D7193300DA8926 /* Utilities */, + A9D8FD2D19E2EC5B0055700C /* introtest */, + 0A011D9D1FB4142500778C2B /* sword */, + 0A011DA51FB4142500778C2B /* SWORDTests */, + 0A1F169F1FBB755B00E0AEFA /* SWORD */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 0A011D9C1FB4142500778C2B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 0A011DA41FB4142500778C2B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8DC2EF520486A6940098B216 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -2768,14 +5743,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - A9BDFA5D1207F9870067ED5B /* Resources */ = { + A9BFB09F13EDF51000032679 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A995E6241C876E8900843E13 /* TestModules in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - A9BFB09F13EDF51000032679 /* Resources */ = { + A9EE8A8919E286E500CFFE6A /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -2784,36 +5760,364 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - A9BDFA641207F9870067ED5B /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; +/* Begin PBXSourcesBuildPhase section */ + 0A011D991FB4142500778C2B /* Sources */ = { + isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - ); - inputPaths = ( - ); - outputPaths = ( + 0A5887E31FB41E1500F7DAA3 /* thmlxhtml.cpp in Sources */, + 0A5887DB1FB41E1500F7DAA3 /* thmlosis.cpp in Sources */, + 0A011DC41FB4149000778C2B /* zutil.c in Sources */, + 0A5887AF1FB41E1500F7DAA3 /* gbfhtmlhref.cpp in Sources */, + 0A5887B51FB41E1500F7DAA3 /* gbfstrongs.cpp in Sources */, + 0A5887C61FB41E1500F7DAA3 /* osisrtf.cpp in Sources */, + 0A5887DF1FB41E1500F7DAA3 /* thmlstrongs.cpp in Sources */, + 0A5887E11FB41E1500F7DAA3 /* thmlwebif.cpp in Sources */, + 0A011DD11FB414A900778C2B /* curlhttpt.cpp in Sources */, + 0A5887A31FB41E1500F7DAA3 /* osislatex.cpp in Sources */, + 0A011DD21FB414A900778C2B /* encfiltmgr.cpp in Sources */, + 0A5887901FB41DCF00F7DAA3 /* rawverse.cpp in Sources */, + 0A5887991FB41DED00F7DAA3 /* hrefcom.cpp in Sources */, + 0A5887AE1FB41E1500F7DAA3 /* gbfhtml.cpp in Sources */, + 0A58878F1FB41DCF00F7DAA3 /* rawstr4.cpp in Sources */, + 0A5887E01FB41E1500F7DAA3 /* thmlvariants.cpp in Sources */, + 0A5887A91FB41E1500F7DAA3 /* osisreferencelinks.cpp in Sources */, + 0A5887BE1FB41E1500F7DAA3 /* osisheadings.cpp in Sources */, + 0A5887D61FB41E1500F7DAA3 /* thmlheadings.cpp in Sources */, + 0A5887C71FB41E1500F7DAA3 /* osisscripref.cpp in Sources */, + 0A5887EA1FB41E1500F7DAA3 /* utf8greekaccents.cpp in Sources */, + 0A5887A11FB41E1500F7DAA3 /* utf8scsu.cpp in Sources */, + 0A5887EB1FB41E1500F7DAA3 /* utf8hebrewpoints.cpp in Sources */, + 0A5887A61FB41E1500F7DAA3 /* thmllatex.cpp in Sources */, + 0A5887DA1FB41E1500F7DAA3 /* thmlmorph.cpp in Sources */, + 0A5887951FB41DCF00F7DAA3 /* zipcomprs.cpp in Sources */, + 0A58879F1FB41DED00F7DAA3 /* zcom4.cpp in Sources */, + 0A011DDD1FB414A900778C2B /* swmgr.cpp in Sources */, + 0A58878E1FB41DCF00F7DAA3 /* rawstr.cpp in Sources */, + 0A5887DD1FB41E1500F7DAA3 /* thmlrtf.cpp in Sources */, + 0A5887C11FB41E1500F7DAA3 /* osismorph.cpp in Sources */, + 0A011DBA1FB4149000778C2B /* gzlib.c in Sources */, + 0A011DCA1FB4149000778C2B /* swversion.cpp in Sources */, + 0A5887F31FB41E5800F7DAA3 /* swgenbook.cpp in Sources */, + 0A011DCC1FB4149000778C2B /* utilstr.cpp in Sources */, + 0A5887E61FB41E1500F7DAA3 /* utf8arabicpoints.cpp in Sources */, + 0A5887A71FB41E1500F7DAA3 /* osisenum.cpp in Sources */, + 0A5887E51FB41E1500F7DAA3 /* utf16utf8.cpp in Sources */, + 0A5887C91FB41E1500F7DAA3 /* osisvariants.cpp in Sources */, + 0A5887E91FB41E1500F7DAA3 /* utf8cantillation.cpp in Sources */, + 0A5887EC1FB41E1500F7DAA3 /* utf8html.cpp in Sources */, + 0A5887C21FB41E1500F7DAA3 /* osismorphsegmentation.cpp in Sources */, + 0A011DD61FB414A900778C2B /* localemgr.cpp in Sources */, + 0A5887BC1FB41E1500F7DAA3 /* latin1utf8.cpp in Sources */, + 0A011DCB1FB4149000778C2B /* url.cpp in Sources */, + 0A5887CB1FB41E1500F7DAA3 /* osiswordjs.cpp in Sources */, + 0A5887A51FB41E1500F7DAA3 /* teilatex.cpp in Sources */, + 0A011DD91FB414A900778C2B /* swcacher.cpp in Sources */, + 0A5887B71FB41E1500F7DAA3 /* gbfwebif.cpp in Sources */, + 0A5887B41FB41E1500F7DAA3 /* gbfrtf.cpp in Sources */, + 0A5887941FB41DCF00F7DAA3 /* swcomprs.cpp in Sources */, + 0A5887A81FB41E1500F7DAA3 /* osisglosses.cpp in Sources */, + 0A5887D31FB41E1500F7DAA3 /* teirtf.cpp in Sources */, + 0A5887981FB41DCF00F7DAA3 /* zverse4.cpp in Sources */, + 0A5887C01FB41E1500F7DAA3 /* osislemma.cpp in Sources */, + 0A58878C1FB41DCF00F7DAA3 /* entriesblk.cpp in Sources */, + 0A011DE71FB414BE00778C2B /* swlog.cpp in Sources */, + 0A011DE11FB414B200778C2B /* swkey.cpp in Sources */, + 0A5887EE1FB41E1500F7DAA3 /* utf8nfc.cpp in Sources */, + 0A5887B01FB41E1500F7DAA3 /* gbfmorph.cpp in Sources */, + 0A011DE41FB414B200778C2B /* versekey.cpp in Sources */, + 0AA1DD361FB46FD00082E131 /* sword.m in Sources */, + 0A011DC91FB4149000778C2B /* swobject.cpp in Sources */, + 0A5887B11FB41E1500F7DAA3 /* gbfosis.cpp in Sources */, + 0A011DD71FB414A900778C2B /* markupfiltmgr.cpp in Sources */, + 0A5887F11FB41E1500F7DAA3 /* utf8utf16.cpp in Sources */, + 0A011DCF1FB414A900778C2B /* versificationmgr.cpp in Sources */, + 0A5887F71FB41E5800F7DAA3 /* zld.cpp in Sources */, + 0A011DBB1FB4149000778C2B /* gzread.c in Sources */, + 0A011DB71FB4149000778C2B /* crc32.c in Sources */, + 0A011DD01FB414A900778C2B /* curlftpt.cpp in Sources */, + 0A5887F41FB41E5800F7DAA3 /* rawld.cpp in Sources */, + 0A5887C51FB41E1500F7DAA3 /* osisredletterwords.cpp in Sources */, + 0A011DDC1FB414A900778C2B /* swlocale.cpp in Sources */, + 0A5887FA1FB41E5800F7DAA3 /* rawtext4.cpp in Sources */, + 0A5887DE1FB41E1500F7DAA3 /* thmlscripref.cpp in Sources */, + 0A5887971FB41DCF00F7DAA3 /* zverse.cpp in Sources */, + 0A5887C31FB41E1500F7DAA3 /* osisosis.cpp in Sources */, + 0A5887CD1FB41E1500F7DAA3 /* papyriplain.cpp in Sources */, + 0A58879D1FB41DED00F7DAA3 /* swcom.cpp in Sources */, + 0A5887DC1FB41E1500F7DAA3 /* thmlplain.cpp in Sources */, + 0A5887F91FB41E5800F7DAA3 /* rawtext.cpp in Sources */, + 0A011DE31FB414B200778C2B /* treekeyidx.cpp in Sources */, + 0A5887D11FB41E1500F7DAA3 /* teihtmlhref.cpp in Sources */, + 0A011DC31FB4149000778C2B /* untgz.c in Sources */, + 0A5887AB1FB41E1500F7DAA3 /* cipherfil.cpp in Sources */, + 0A5887D91FB41E1500F7DAA3 /* thmllemma.cpp in Sources */, + 0A011DC01FB4149000778C2B /* inftrees.c in Sources */, + 0A011DCE1FB414A900778C2B /* remotetrans.cpp in Sources */, + 0A011DDF1FB414B200778C2B /* listkey.cpp in Sources */, + 0A5887AC1FB41E1500F7DAA3 /* gbffootnotes.cpp in Sources */, + 0A5887D41FB41E1500F7DAA3 /* thmlfootnotes.cpp in Sources */, + 0A5887A21FB41E1500F7DAA3 /* gbflatex.cpp in Sources */, + 0A5887CA1FB41E1500F7DAA3 /* osiswebif.cpp in Sources */, + 0A011DB51FB4149000778C2B /* adler32.c in Sources */, + 0A5887FB1FB41E5800F7DAA3 /* swtext.cpp in Sources */, + 0A5887B31FB41E1500F7DAA3 /* gbfredletterwords.cpp in Sources */, + 0A011DB61FB4149000778C2B /* compress.c in Sources */, + 0A5887B21FB41E1500F7DAA3 /* gbfplain.cpp in Sources */, + 0A5887C41FB41E1500F7DAA3 /* osisplain.cpp in Sources */, + 0A58879C1FB41DED00F7DAA3 /* rawfiles.cpp in Sources */, + 0A5887FD1FB41E5800F7DAA3 /* ztext4.cpp in Sources */, + 0A58879E1FB41DED00F7DAA3 /* zcom.cpp in Sources */, + 0A011DBE1FB4149000778C2B /* inffast.c in Sources */, + 0A011DC71FB4149000778C2B /* roman.cpp in Sources */, + 0A011DBF1FB4149000778C2B /* inflate.c in Sources */, + 0A5887931FB41DCF00F7DAA3 /* swcipher.cpp in Sources */, + 0A011DC11FB4149000778C2B /* trees.c in Sources */, + 0A5887A01FB41E1500F7DAA3 /* scsuutf8.cpp in Sources */, + 0A58879A1FB41DED00F7DAA3 /* rawcom.cpp in Sources */, + 0A5887B61FB41E1500F7DAA3 /* gbfthml.cpp in Sources */, + 0A5887D21FB41E1500F7DAA3 /* teiplain.cpp in Sources */, + 0A5887EF1FB41E1500F7DAA3 /* utf8nfkd.cpp in Sources */, + 0A5887F01FB41E1500F7DAA3 /* utf8transliterator.cpp in Sources */, + 0A5887921FB41DCF00F7DAA3 /* sapphire.cpp in Sources */, + 0A5887E21FB41E1500F7DAA3 /* thmlwordjs.cpp in Sources */, + 0A5887BD1FB41E1500F7DAA3 /* osisfootnotes.cpp in Sources */, + 0A5887E41FB41E1500F7DAA3 /* unicodertf.cpp in Sources */, + 0A011DB91FB4149000778C2B /* gzclose.c in Sources */, + 0A5887E81FB41E1500F7DAA3 /* utf8bidireorder.cpp in Sources */, + 0A5887CF1FB41E1500F7DAA3 /* swbasicfilter.cpp in Sources */, + 0A011DC81FB4149000778C2B /* swbuf.cpp in Sources */, + 0A5887BF1FB41E1500F7DAA3 /* osishtmlhref.cpp in Sources */, + 0A58879B1FB41DED00F7DAA3 /* rawcom4.cpp in Sources */, + 0A011DE01FB414B200778C2B /* strkey.cpp in Sources */, + 0A58878D1FB41DCF00F7DAA3 /* lzsscomprs.cpp in Sources */, + 0A011DC21FB4149000778C2B /* uncompr.c in Sources */, + 0A011DD31FB414A900778C2B /* filemgr.cpp in Sources */, + 0A5887CC1FB41E1500F7DAA3 /* osisxhtml.cpp in Sources */, + 0A011DE61FB414BE00778C2B /* swdisp.cpp in Sources */, + 0A011DC51FB4149000778C2B /* ftplib.c in Sources */, + 0A5887F81FB41E5800F7DAA3 /* swmodule.cpp in Sources */, + 0A5887ED1FB41E1500F7DAA3 /* utf8latin1.cpp in Sources */, + 0A5887CE1FB41E1500F7DAA3 /* rtfhtml.cpp in Sources */, + 0A011DC61FB4149000778C2B /* ftpparse.c in Sources */, + 0A011DD51FB414A900778C2B /* installmgr.cpp in Sources */, + 0A5887D71FB41E1500F7DAA3 /* thmlhtml.cpp in Sources */, + 0A5887E71FB41E1500F7DAA3 /* utf8arshaping.cpp in Sources */, + 0A5887F61FB41E5800F7DAA3 /* swld.cpp in Sources */, + 0A5887D51FB41E1500F7DAA3 /* thmlgbf.cpp in Sources */, + 0A5887BB1FB41E1500F7DAA3 /* latin1utf16.cpp in Sources */, + 0A011DBC1FB4149000778C2B /* gzwrite.c in Sources */, + 0A5887C81FB41E1500F7DAA3 /* osisstrongs.cpp in Sources */, + 0A011DB81FB4149000778C2B /* deflate.c in Sources */, + 0A011DCD1FB4149000778C2B /* utilxml.cpp in Sources */, + 0A5887BA1FB41E1500F7DAA3 /* greeklexattribs.cpp in Sources */, + 0A1F169B1FBB70ED00E0AEFA /* flatapi.cpp in Sources */, + 0A011DD41FB414A900778C2B /* ftplibftpt.cpp in Sources */, + 0A5887F51FB41E5800F7DAA3 /* rawld4.cpp in Sources */, + 0A5887D01FB41E1500F7DAA3 /* swoptfilter.cpp in Sources */, + 0A5887911FB41DCF00F7DAA3 /* rawverse4.cpp in Sources */, + 0A5887FC1FB41E5800F7DAA3 /* ztext.cpp in Sources */, + 0A011DDA1FB414A900778C2B /* swconfig.cpp in Sources */, + 0A011DE51FB414B200778C2B /* versetreekey.cpp in Sources */, + 0A5887AD1FB41E1500F7DAA3 /* gbfheadings.cpp in Sources */, + 0A5887961FB41DCF00F7DAA3 /* zstr.cpp in Sources */, + 0A011DDB1FB414A900778C2B /* swfiltermgr.cpp in Sources */, + 0A5887F21FB41E5800F7DAA3 /* rawgenbook.cpp in Sources */, + 0A5887B81FB41E1500F7DAA3 /* gbfwordjs.cpp in Sources */, + 0A011DBD1FB4149000778C2B /* infback.c in Sources */, + 0A011DE21FB414B200778C2B /* treekey.cpp in Sources */, + 0A5887A41FB41E1500F7DAA3 /* osisxlit.cpp in Sources */, + 0A011DD81FB414A900778C2B /* stringmgr.cpp in Sources */, + 0A5887B91FB41E1500F7DAA3 /* gbfxhtml.cpp in Sources */, + 0A5887AA1FB41E1500F7DAA3 /* teixhtml.cpp in Sources */, + 0A5887D81FB41E1500F7DAA3 /* thmlhtmlhref.cpp in Sources */, + 0A011DDE1FB414A900778C2B /* swsearchable.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; }; - A9BFB0A013EDF51000032679 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; + 0A011DA21FB4142500778C2B /* Sources */ = { + isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 0A011DAC1FB4142500778C2B /* SWORDTests.m in Sources */, ); - inputPaths = ( - ); - outputPaths = ( + runOnlyForDeploymentPostprocessing = 0; + }; + 0A1F169C1FBB755B00E0AEFA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0A1F16D21FBB762D00E0AEFA /* untgz.c in Sources */, + 0A1F170C1FBB768100E0AEFA /* osisosis.cpp in Sources */, + 0A1F17051FBB768100E0AEFA /* latin1utf8.cpp in Sources */, + 0A1F173D1FBB76A700E0AEFA /* rawcom4.cpp in Sources */, + 0A1F16F21FBB768100E0AEFA /* osisreferencelinks.cpp in Sources */, + 0A1F16D71FBB762D00E0AEFA /* swbuf.cpp in Sources */, + 0A1F16BB1FBB75D600E0AEFA /* localemgr.cpp in Sources */, + 0A1F16E01FBB765A00E0AEFA /* rawld4.cpp in Sources */, + 0A1F173A1FBB768100E0AEFA /* utf8utf16.cpp in Sources */, + 0A1F16BE1FBB75D600E0AEFA /* swcacher.cpp in Sources */, + 0A1F16B61FBB75D600E0AEFA /* curlhttpt.cpp in Sources */, + 0A1F16B31FBB75D600E0AEFA /* remotetrans.cpp in Sources */, + 0A1F16A41FBB755B00E0AEFA /* SWORD.m in Sources */, + 0A1F16E21FBB765A00E0AEFA /* zld.cpp in Sources */, + 0A1F16B11FBB75D600E0AEFA /* versekey.cpp in Sources */, + 0A1F16A91FBB75AB00E0AEFA /* flatapi.cpp in Sources */, + 0A1F17211FBB768100E0AEFA /* thmlhtmlhref.cpp in Sources */, + 0A1F17181FBB768100E0AEFA /* swbasicfilter.cpp in Sources */, + 0A1F17481FBB76A700E0AEFA /* rawverse4.cpp in Sources */, + 0A1F16B41FBB75D600E0AEFA /* versificationmgr.cpp in Sources */, + 0A1F17231FBB768100E0AEFA /* thmlmorph.cpp in Sources */, + 0A1F16D41FBB762D00E0AEFA /* ftplib.c in Sources */, + 0A1F17301FBB768100E0AEFA /* utf8arshaping.cpp in Sources */, + 0A1F171C1FBB768100E0AEFA /* teirtf.cpp in Sources */, + 0A1F17271FBB768100E0AEFA /* thmlscripref.cpp in Sources */, + 0A1F17221FBB768100E0AEFA /* thmllemma.cpp in Sources */, + 0A1F171E1FBB768100E0AEFA /* thmlgbf.cpp in Sources */, + 0A1F16B21FBB75D600E0AEFA /* versetreekey.cpp in Sources */, + 0A1F170A1FBB768100E0AEFA /* osismorph.cpp in Sources */, + 0A1F172B1FBB768100E0AEFA /* thmlwordjs.cpp in Sources */, + 0A1F16B81FBB75D600E0AEFA /* filemgr.cpp in Sources */, + 0A1F16B91FBB75D600E0AEFA /* ftplibftpt.cpp in Sources */, + 0A1F172E1FBB768100E0AEFA /* utf16utf8.cpp in Sources */, + 0A1F16D31FBB762D00E0AEFA /* zutil.c in Sources */, + 0A1F16F91FBB768100E0AEFA /* gbfmorph.cpp in Sources */, + 0A1F17081FBB768100E0AEFA /* osishtmlhref.cpp in Sources */, + 0A1F17121FBB768100E0AEFA /* osisvariants.cpp in Sources */, + 0A1F16E81FBB765A00E0AEFA /* ztext4.cpp in Sources */, + 0A1F173B1FBB76A700E0AEFA /* hrefcom.cpp in Sources */, + 0A1F16F41FBB768100E0AEFA /* cipherfil.cpp in Sources */, + 0A1F16AE1FBB75D600E0AEFA /* swkey.cpp in Sources */, + 0A1F17251FBB768100E0AEFA /* thmlplain.cpp in Sources */, + 0A1F16C61FBB762D00E0AEFA /* crc32.c in Sources */, + 0A1F16CD1FBB762D00E0AEFA /* inffast.c in Sources */, + 0A1F16FF1FBB768100E0AEFA /* gbfthml.cpp in Sources */, + 0A1F16FB1FBB768100E0AEFA /* gbfplain.cpp in Sources */, + 0A1F17391FBB768100E0AEFA /* utf8transliterator.cpp in Sources */, + 0A1F17371FBB768100E0AEFA /* utf8nfc.cpp in Sources */, + 0A1F170F1FBB768100E0AEFA /* osisrtf.cpp in Sources */, + 0A1F17441FBB76A700E0AEFA /* lzsscomprs.cpp in Sources */, + 0A1F16F61FBB768100E0AEFA /* gbfheadings.cpp in Sources */, + 0A1F17161FBB768100E0AEFA /* papyriplain.cpp in Sources */, + 0A1F16AB1FBB75D600E0AEFA /* swlog.cpp in Sources */, + 0A1F16DC1FBB762D00E0AEFA /* utilxml.cpp in Sources */, + 0A1F16DD1FBB765A00E0AEFA /* rawgenbook.cpp in Sources */, + 0A1F17001FBB768100E0AEFA /* gbfwebif.cpp in Sources */, + 0A1F16C31FBB75D600E0AEFA /* swsearchable.cpp in Sources */, + 0A1F17031FBB768100E0AEFA /* greeklexattribs.cpp in Sources */, + 0A1F17071FBB768100E0AEFA /* osisheadings.cpp in Sources */, + 0A1F17061FBB768100E0AEFA /* osisfootnotes.cpp in Sources */, + 0A1F16C71FBB762D00E0AEFA /* deflate.c in Sources */, + 0A1F174A1FBB76A700E0AEFA /* swcipher.cpp in Sources */, + 0A1F16E31FBB765A00E0AEFA /* swmodule.cpp in Sources */, + 0A1F174F1FBB76A700E0AEFA /* zverse4.cpp in Sources */, + 0A1F16DA1FBB762D00E0AEFA /* url.cpp in Sources */, + 0A1F17171FBB768100E0AEFA /* rtfhtml.cpp in Sources */, + 0A1F171F1FBB768100E0AEFA /* thmlheadings.cpp in Sources */, + 0A1F16CE1FBB762D00E0AEFA /* inflate.c in Sources */, + 0A1F16FA1FBB768100E0AEFA /* gbfosis.cpp in Sources */, + 0A1F16BF1FBB75D600E0AEFA /* swconfig.cpp in Sources */, + 0A1F16AD1FBB75D600E0AEFA /* strkey.cpp in Sources */, + 0A1F17361FBB768100E0AEFA /* utf8latin1.cpp in Sources */, + 0A1F16EA1FBB768100E0AEFA /* utf8scsu.cpp in Sources */, + 0A1F17281FBB768100E0AEFA /* thmlstrongs.cpp in Sources */, + 0A1F16DE1FBB765A00E0AEFA /* swgenbook.cpp in Sources */, + 0A1F16EF1FBB768100E0AEFA /* thmllatex.cpp in Sources */, + 0A1F16DF1FBB765A00E0AEFA /* rawld.cpp in Sources */, + 0A1F170E1FBB768100E0AEFA /* osisredletterwords.cpp in Sources */, + 0A1F17401FBB76A700E0AEFA /* zcom.cpp in Sources */, + 0A1F17141FBB768100E0AEFA /* osiswordjs.cpp in Sources */, + 0A1F17111FBB768100E0AEFA /* osisstrongs.cpp in Sources */, + 0A1F16C41FBB762D00E0AEFA /* adler32.c in Sources */, + 0A1F16B71FBB75D600E0AEFA /* encfiltmgr.cpp in Sources */, + 0A1F172C1FBB768100E0AEFA /* thmlxhtml.cpp in Sources */, + 0A1F16BA1FBB75D600E0AEFA /* installmgr.cpp in Sources */, + 0A1F16E61FBB765A00E0AEFA /* swtext.cpp in Sources */, + 0A1F16F51FBB768100E0AEFA /* gbffootnotes.cpp in Sources */, + 0A1F16C51FBB762D00E0AEFA /* compress.c in Sources */, + 0A1F16D11FBB762D00E0AEFA /* uncompr.c in Sources */, + 0A1F170B1FBB768100E0AEFA /* osismorphsegmentation.cpp in Sources */, + 0A1F16CA1FBB762D00E0AEFA /* gzread.c in Sources */, + 0A1F171B1FBB768100E0AEFA /* teiplain.cpp in Sources */, + 0A1F16F81FBB768100E0AEFA /* gbfhtmlhref.cpp in Sources */, + 0A1F17451FBB76A700E0AEFA /* rawstr.cpp in Sources */, + 0A1F17311FBB768100E0AEFA /* utf8bidireorder.cpp in Sources */, + 0A1F17331FBB768100E0AEFA /* utf8greekaccents.cpp in Sources */, + 0A1F16D91FBB762D00E0AEFA /* swversion.cpp in Sources */, + 0A1F17461FBB76A700E0AEFA /* rawstr4.cpp in Sources */, + 0A1F17021FBB768100E0AEFA /* gbfxhtml.cpp in Sources */, + 0A1F16F01FBB768100E0AEFA /* osisenum.cpp in Sources */, + 0A1F17261FBB768100E0AEFA /* thmlrtf.cpp in Sources */, + 0A1F17491FBB76A700E0AEFA /* sapphire.cpp in Sources */, + 0A1F17091FBB768100E0AEFA /* osislemma.cpp in Sources */, + 0A1F16F71FBB768100E0AEFA /* gbfhtml.cpp in Sources */, + 0A1F172A1FBB768100E0AEFA /* thmlwebif.cpp in Sources */, + 0A1F173E1FBB76A700E0AEFA /* rawfiles.cpp in Sources */, + 0A1F17191FBB768100E0AEFA /* swoptfilter.cpp in Sources */, + 0A1F16B51FBB75D600E0AEFA /* curlftpt.cpp in Sources */, + 0A1F16D61FBB762D00E0AEFA /* roman.cpp in Sources */, + 0A1F17431FBB76A700E0AEFA /* entriesblk.cpp in Sources */, + 0A1F16F11FBB768100E0AEFA /* osisglosses.cpp in Sources */, + 0A1F17381FBB768100E0AEFA /* utf8nfkd.cpp in Sources */, + 0A1F17471FBB76A700E0AEFA /* rawverse.cpp in Sources */, + 0A1F16BC1FBB75D600E0AEFA /* markupfiltmgr.cpp in Sources */, + 0A1F17421FBB76A700E0AEFA /* bz2comprs.cpp in Sources */, + 0A1F16DB1FBB762D00E0AEFA /* utilstr.cpp in Sources */, + 0A1F16ED1FBB768100E0AEFA /* osisxlit.cpp in Sources */, + 0A1F171D1FBB768100E0AEFA /* thmlfootnotes.cpp in Sources */, + 0A1F17341FBB768100E0AEFA /* utf8hebrewpoints.cpp in Sources */, + 0A1F174C1FBB76A700E0AEFA /* zipcomprs.cpp in Sources */, + 0A1F16EB1FBB768100E0AEFA /* gbflatex.cpp in Sources */, + 0A1F170D1FBB768100E0AEFA /* osisplain.cpp in Sources */, + 0A1F16F31FBB768100E0AEFA /* teixhtml.cpp in Sources */, + 0A1F17151FBB768100E0AEFA /* osisxhtml.cpp in Sources */, + 0A1F17101FBB768100E0AEFA /* osisscripref.cpp in Sources */, + 0A1F16E11FBB765A00E0AEFA /* swld.cpp in Sources */, + 0A1F16C21FBB75D600E0AEFA /* swmgr.cpp in Sources */, + 0A1F16EE1FBB768100E0AEFA /* teilatex.cpp in Sources */, + 0A1F17291FBB768100E0AEFA /* thmlvariants.cpp in Sources */, + 0A1F16C11FBB75D600E0AEFA /* swlocale.cpp in Sources */, + 0A1F16AF1FBB75D600E0AEFA /* treekey.cpp in Sources */, + 0A1F171A1FBB768100E0AEFA /* teihtmlhref.cpp in Sources */, + 0A1F16C81FBB762D00E0AEFA /* gzclose.c in Sources */, + 0A1F16E41FBB765A00E0AEFA /* rawtext.cpp in Sources */, + 0A1F16D81FBB762D00E0AEFA /* swobject.cpp in Sources */, + 0A1F16B01FBB75D600E0AEFA /* treekeyidx.cpp in Sources */, + 0A1F17241FBB768100E0AEFA /* thmlosis.cpp in Sources */, + 0A1F16D01FBB762D00E0AEFA /* trees.c in Sources */, + 0A1F16CC1FBB762D00E0AEFA /* infback.c in Sources */, + 0A1F174D1FBB76A700E0AEFA /* zstr.cpp in Sources */, + 0A1F172F1FBB768100E0AEFA /* utf8arabicpoints.cpp in Sources */, + 0A1F173C1FBB76A700E0AEFA /* rawcom.cpp in Sources */, + 0A1F16FD1FBB768100E0AEFA /* gbfrtf.cpp in Sources */, + 0A1F16CB1FBB762D00E0AEFA /* gzwrite.c in Sources */, + 0A1F16BD1FBB75D600E0AEFA /* stringmgr.cpp in Sources */, + 0A1F16CF1FBB762D00E0AEFA /* inftrees.c in Sources */, + 0A1F16E71FBB765A00E0AEFA /* ztext.cpp in Sources */, + 0A1F16EC1FBB768100E0AEFA /* osislatex.cpp in Sources */, + 0A1F16C91FBB762D00E0AEFA /* gzlib.c in Sources */, + 0A1F16FC1FBB768100E0AEFA /* gbfredletterwords.cpp in Sources */, + 0A1F16AC1FBB75D600E0AEFA /* listkey.cpp in Sources */, + 0A1F16E51FBB765A00E0AEFA /* rawtext4.cpp in Sources */, + 0A1F173F1FBB76A700E0AEFA /* swcom.cpp in Sources */, + 0A1F17411FBB76A700E0AEFA /* zcom4.cpp in Sources */, + 0A1F174B1FBB76A700E0AEFA /* swcomprs.cpp in Sources */, + 0A1F17201FBB768100E0AEFA /* thmlhtml.cpp in Sources */, + 0A1F16E91FBB768100E0AEFA /* scsuutf8.cpp in Sources */, + 0A1F174E1FBB76A700E0AEFA /* zverse.cpp in Sources */, + 0A1F17041FBB768100E0AEFA /* latin1utf16.cpp in Sources */, + 0A1F16FE1FBB768100E0AEFA /* gbfstrongs.cpp in Sources */, + 0A1F16C01FBB75D600E0AEFA /* swfiltermgr.cpp in Sources */, + 0A1F16D51FBB762D00E0AEFA /* ftpparse.c in Sources */, + 0A1F17131FBB768100E0AEFA /* osiswebif.cpp in Sources */, + 0A1F17351FBB768100E0AEFA /* utf8html.cpp in Sources */, + 0A1F17011FBB768100E0AEFA /* gbfwordjs.cpp in Sources */, + 0A1F172D1FBB768100E0AEFA /* unicodertf.cpp in Sources */, + 0A1F17321FBB768100E0AEFA /* utf8cantillation.cpp in Sources */, + 0A1F16AA1FBB75D600E0AEFA /* swdisp.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ 8DC2EF540486A6940098B216 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2823,6 +6127,7 @@ A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */, A94EAC14117B28920018B06F /* SwordBook.mm in Sources */, A94EAC16117B28920018B06F /* SwordCommentary.mm in Sources */, + 0A1F169A1FBB70E300E0AEFA /* flatapi.cpp in Sources */, A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */, A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */, A94EAC1C117B28920018B06F /* SwordInstallSourceManager.mm in Sources */, @@ -2847,275 +6152,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - A954ABBF13EE9AB00094E3FE /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A999FF3F17951CCE00E65919 /* bz2comprs.cpp in Sources */, - A999FF4017951CCE00E65919 /* xzcomprs.cpp in Sources */, - A999FF4117951CCE00E65919 /* scsuutf8.cpp in Sources */, - A96C2359176AFA3C008D714B /* remotetrans.cpp in Sources */, - A96C235A176AFA3C008D714B /* osisenum.cpp in Sources */, - A96C235B176AFA3C008D714B /* osisglosses.cpp in Sources */, - A96C235C176AFA3C008D714B /* osisxlit.cpp in Sources */, - A96C235C176AFA3C008D714B /* osisreferencelinks.cpp in Sources */, - A96C235D176AFA3C008D714B /* gzclose.c in Sources */, - A96C235E176AFA3C008D714B /* gzlib.c in Sources */, - A96C235F176AFA3C008D714B /* gzread.c in Sources */, - A96C2360176AFA3C008D714B /* gzwrite.c in Sources */, - A96C2361176AFA3C008D714B /* infback.c in Sources */, - A91C8B6817523609008702B9 /* versificationmgr.cpp in Sources */, - A967FB5616806B16004ED73C /* teixhtml.cpp in Sources */, - A954ACCA13EEA5340094E3FE /* ftplib.c in Sources */, - A954ACCB13EEA5340094E3FE /* ftpparse.c in Sources */, - A954ACCD13EEA5340094E3FE /* adler32.c in Sources */, - A954ACCE13EEA5340094E3FE /* compress.c in Sources */, - A954ACCF13EEA5340094E3FE /* crc32.c in Sources */, - A954ACD013EEA5340094E3FE /* deflate.c in Sources */, - A954ACD413EEA5340094E3FE /* inffast.c in Sources */, - A954ACD513EEA5340094E3FE /* inflate.c in Sources */, - A954ACD613EEA5340094E3FE /* inftrees.c in Sources */, - A954ACD913EEA5340094E3FE /* trees.c in Sources */, - A954ACDA13EEA5340094E3FE /* uncompr.c in Sources */, - A954ACDB13EEA5340094E3FE /* untgz.c in Sources */, - A954ACDC13EEA5340094E3FE /* zutil.c in Sources */, - A954AC3A13EEA0C10094E3FE /* swdisp.cpp in Sources */, - A954AC3B13EEA0C10094E3FE /* swlog.cpp in Sources */, - A954AC3C13EEA0C10094E3FE /* listkey.cpp in Sources */, - A954AC3D13EEA0C10094E3FE /* strkey.cpp in Sources */, - A954AC3E13EEA0C10094E3FE /* swkey.cpp in Sources */, - A954AC3F13EEA0C10094E3FE /* treekey.cpp in Sources */, - A954AC4013EEA0C10094E3FE /* treekeyidx.cpp in Sources */, - A954AC4113EEA0C10094E3FE /* versekey.cpp in Sources */, - A954AC4213EEA0C10094E3FE /* versetreekey.cpp in Sources */, - A954AC4313EEA0C10094E3FE /* curlftpt.cpp in Sources */, - A954AC4413EEA0C10094E3FE /* curlhttpt.cpp in Sources */, - A954AC4513EEA0C10094E3FE /* encfiltmgr.cpp in Sources */, - A954AC4613EEA0C10094E3FE /* filemgr.cpp in Sources */, - A954AC4713EEA0C10094E3FE /* ftplibftpt.cpp in Sources */, - A954AC4913EEA0C10094E3FE /* installmgr.cpp in Sources */, - A954AC4A13EEA0C10094E3FE /* localemgr.cpp in Sources */, - A954AC4B13EEA0C10094E3FE /* markupfiltmgr.cpp in Sources */, - A954AC4C13EEA0C10094E3FE /* stringmgr.cpp in Sources */, - A954AC4D13EEA0C10094E3FE /* swcacher.cpp in Sources */, - A954AC4E13EEA0C10094E3FE /* swconfig.cpp in Sources */, - A954AC4F13EEA0C10094E3FE /* swfiltermgr.cpp in Sources */, - A954AC5013EEA0C10094E3FE /* swlocale.cpp in Sources */, - A954AC5113EEA0C10094E3FE /* swmgr.cpp in Sources */, - A954AC5213EEA0C10094E3FE /* swsearchable.cpp in Sources */, - A954AC5413EEA0C10094E3FE /* hrefcom.cpp in Sources */, - A954AC5513EEA0C10094E3FE /* rawcom.cpp in Sources */, - A954AC5613EEA0C10094E3FE /* rawcom4.cpp in Sources */, - A954AC5713EEA0C10094E3FE /* rawfiles.cpp in Sources */, - A954AC5813EEA0C10094E3FE /* swcom.cpp in Sources */, - A954AC5913EEA0C10094E3FE /* zcom.cpp in Sources */, - A954AC5A13EEA0C10094E3FE /* entriesblk.cpp in Sources */, - A954AC5B13EEA0C10094E3FE /* lzsscomprs.cpp in Sources */, - A954AC5C13EEA0C10094E3FE /* rawstr.cpp in Sources */, - A954AC5D13EEA0C10094E3FE /* rawstr4.cpp in Sources */, - A954AC5E13EEA0C10094E3FE /* rawverse.cpp in Sources */, - A954AC5F13EEA0C10094E3FE /* rawverse4.cpp in Sources */, - A954AC6013EEA0C10094E3FE /* sapphire.cpp in Sources */, - A954AC6113EEA0C10094E3FE /* swcipher.cpp in Sources */, - A954AC6213EEA0C10094E3FE /* swcomprs.cpp in Sources */, - A954AC6313EEA0C10094E3FE /* zipcomprs.cpp in Sources */, - A954AC6413EEA0C10094E3FE /* zstr.cpp in Sources */, - A954AC6513EEA0C10094E3FE /* zverse.cpp in Sources */, - A954AC6613EEA0C10094E3FE /* cipherfil.cpp in Sources */, - A954AC6713EEA0C10094E3FE /* gbffootnotes.cpp in Sources */, - A954AC6813EEA0C10094E3FE /* gbfheadings.cpp in Sources */, - A954AC6913EEA0C10094E3FE /* gbfhtml.cpp in Sources */, - A954AC6A13EEA0C10094E3FE /* gbfhtmlhref.cpp in Sources */, - A954AC6B13EEA0C10094E3FE /* gbfmorph.cpp in Sources */, - A954AC6C13EEA0C10094E3FE /* gbfosis.cpp in Sources */, - A954AC6D13EEA0C10094E3FE /* gbfplain.cpp in Sources */, - A954AC6E13EEA0C10094E3FE /* gbfredletterwords.cpp in Sources */, - A954AC6F13EEA0C10094E3FE /* gbfrtf.cpp in Sources */, - A954AC7013EEA0C10094E3FE /* gbfstrongs.cpp in Sources */, - A954AC7113EEA0C10094E3FE /* gbfthml.cpp in Sources */, - A954AC7213EEA0C10094E3FE /* gbfwebif.cpp in Sources */, - A954AC7313EEA0C10094E3FE /* gbfwordjs.cpp in Sources */, - A954AC7413EEA0C10094E3FE /* gbfxhtml.cpp in Sources */, - A954AC7513EEA0C10094E3FE /* greeklexattribs.cpp in Sources */, - A954AC7613EEA0C10094E3FE /* latin1utf16.cpp in Sources */, - A954AC7713EEA0C10094E3FE /* latin1utf8.cpp in Sources */, - A954AC7813EEA0C10094E3FE /* osisfootnotes.cpp in Sources */, - A954AC7913EEA0C10094E3FE /* osisheadings.cpp in Sources */, - A954AC7A13EEA0C10094E3FE /* osishtmlhref.cpp in Sources */, - A954AC7B13EEA0C10094E3FE /* osislemma.cpp in Sources */, - A954AC7C13EEA0C10094E3FE /* osismorph.cpp in Sources */, - A954AC7D13EEA0C10094E3FE /* osismorphsegmentation.cpp in Sources */, - A954AC7E13EEA0C10094E3FE /* osisosis.cpp in Sources */, - A954AC7F13EEA0C10094E3FE /* osisplain.cpp in Sources */, - A954AC8013EEA0C10094E3FE /* osisredletterwords.cpp in Sources */, - A954AC8113EEA0C10094E3FE /* osisrtf.cpp in Sources */, - A954AC8313EEA0C10094E3FE /* osisscripref.cpp in Sources */, - A954AC8413EEA0C10094E3FE /* osisstrongs.cpp in Sources */, - A954AC8513EEA0C10094E3FE /* osisvariants.cpp in Sources */, - A954AC8613EEA0C10094E3FE /* osiswebif.cpp in Sources */, - A954AC8713EEA0C10094E3FE /* osiswordjs.cpp in Sources */, - A954AC8813EEA0C10094E3FE /* osisxhtml.cpp in Sources */, - A954AC8913EEA0C10094E3FE /* papyriplain.cpp in Sources */, - A954AC8C13EEA0C10094E3FE /* rtfhtml.cpp in Sources */, - A954AC8D13EEA0C10094E3FE /* swbasicfilter.cpp in Sources */, - A954AC8E13EEA0C10094E3FE /* swoptfilter.cpp in Sources */, - A954AC8F13EEA0C10094E3FE /* teihtmlhref.cpp in Sources */, - A954AC9013EEA0C10094E3FE /* teiplain.cpp in Sources */, - A954AC9113EEA0C10094E3FE /* teirtf.cpp in Sources */, - A954AC9213EEA0C10094E3FE /* thmlfootnotes.cpp in Sources */, - A954AC9313EEA0C10094E3FE /* thmlgbf.cpp in Sources */, - A954AC9413EEA0C10094E3FE /* thmlheadings.cpp in Sources */, - A954AC9513EEA0C10094E3FE /* thmlhtml.cpp in Sources */, - A954AC9613EEA0C10094E3FE /* thmlhtmlhref.cpp in Sources */, - A954AC9713EEA0C10094E3FE /* thmllemma.cpp in Sources */, - A954AC9813EEA0C10094E3FE /* thmlmorph.cpp in Sources */, - A954AC9913EEA0C10094E3FE /* thmlosis.cpp in Sources */, - A954AC9A13EEA0C10094E3FE /* thmlplain.cpp in Sources */, - A954AC9B13EEA0C10094E3FE /* thmlrtf.cpp in Sources */, - A954AC9C13EEA0C10094E3FE /* thmlscripref.cpp in Sources */, - A954AC9D13EEA0C10094E3FE /* thmlstrongs.cpp in Sources */, - A954AC9E13EEA0C10094E3FE /* thmlvariants.cpp in Sources */, - A954AC9F13EEA0C10094E3FE /* thmlwebif.cpp in Sources */, - A954ACA013EEA0C10094E3FE /* thmlwordjs.cpp in Sources */, - A954ACA113EEA0C10094E3FE /* thmlxhtml.cpp in Sources */, - A954ACA213EEA0C10094E3FE /* unicodertf.cpp in Sources */, - A954ACA313EEA0C10094E3FE /* utf16utf8.cpp in Sources */, - A954ACA413EEA0C10094E3FE /* utf8arabicpoints.cpp in Sources */, - A954ACA513EEA0C10094E3FE /* utf8arshaping.cpp in Sources */, - A954ACA613EEA0C10094E3FE /* utf8bidireorder.cpp in Sources */, - A954ACA713EEA0C10094E3FE /* utf8cantillation.cpp in Sources */, - A954ACA813EEA0C10094E3FE /* utf8greekaccents.cpp in Sources */, - A954ACA913EEA0C10094E3FE /* utf8hebrewpoints.cpp in Sources */, - A954ACAA13EEA0C10094E3FE /* utf8html.cpp in Sources */, - A954ACAB13EEA0C10094E3FE /* utf8latin1.cpp in Sources */, - A954ACAC13EEA0C10094E3FE /* utf8nfc.cpp in Sources */, - A954ACAD13EEA0C10094E3FE /* utf8nfkd.cpp in Sources */, - A954ACAE13EEA0C10094E3FE /* utf8transliterator.cpp in Sources */, - A954ACAF13EEA0C10094E3FE /* utf8utf16.cpp in Sources */, - A954ACB013EEA0C10094E3FE /* rawgenbook.cpp in Sources */, - A954ACB113EEA0C10094E3FE /* swgenbook.cpp in Sources */, - A954ACB213EEA0C10094E3FE /* rawld.cpp in Sources */, - A954ACB313EEA0C10094E3FE /* rawld4.cpp in Sources */, - A954ACB413EEA0C10094E3FE /* swld.cpp in Sources */, - A954ACB513EEA0C10094E3FE /* zld.cpp in Sources */, - A954ACB613EEA0C10094E3FE /* swmodule.cpp in Sources */, - A954ACB713EEA0C10094E3FE /* rawtext.cpp in Sources */, - A954ACB813EEA0C10094E3FE /* rawtext4.cpp in Sources */, - A954ACB913EEA0C10094E3FE /* swtext.cpp in Sources */, - A954ACBA13EEA0C10094E3FE /* ztext.cpp in Sources */, - A954ACBB13EEA0C10094E3FE /* roman.cpp in Sources */, - A954ACBC13EEA0C10094E3FE /* swbuf.cpp in Sources */, - A954ACBD13EEA0C10094E3FE /* swobject.cpp in Sources */, - A954ACBF13EEA0C10094E3FE /* swversion.cpp in Sources */, - A954ACC013EEA0C10094E3FE /* url.cpp in Sources */, - A954ACC113EEA0C10094E3FE /* utilstr.cpp in Sources */, - A954ACC213EEA0C10094E3FE /* utilxml.cpp in Sources */, - A954ABCB13EE9E460094E3FE /* AnalysisHeader.cpp in Sources */, - A954ABCC13EE9E460094E3FE /* Analyzers.cpp in Sources */, - A954ABCD13EE9E470094E3FE /* StandardAnalyzer.cpp in Sources */, - A954ABCE13EE9E470094E3FE /* StandardFilter.cpp in Sources */, - A954ABCF13EE9E470094E3FE /* StandardTokenizer.cpp in Sources */, - A954ABD013EE9E470094E3FE /* gunichartables.cpp in Sources */, - A954ABD113EE9E470094E3FE /* repl_lltot.cpp in Sources */, - A954ABD213EE9E470094E3FE /* repl_tcscasecmp.cpp in Sources */, - A954ABD313EE9E470094E3FE /* repl_tcslwr.cpp in Sources */, - A954ABD413EE9E470094E3FE /* repl_tcstod.cpp in Sources */, - A954ABD513EE9E470094E3FE /* repl_tcstoll.cpp in Sources */, - A954ABD613EE9E470094E3FE /* repl_tprintf.cpp in Sources */, - A954ABD713EE9E470094E3FE /* threads.cpp in Sources */, - A954ABD813EE9E470094E3FE /* utf8.cpp in Sources */, - A954ABD913EE9E470094E3FE /* condition.cpp in Sources */, - A954ABDA13EE9E470094E3FE /* error.cpp in Sources */, - A954ABDB13EE9E470094E3FE /* memtracking.cpp in Sources */, - A954ABDC13EE9E470094E3FE /* DateField.cpp in Sources */, - A954ABDD13EE9E470094E3FE /* Document.cpp in Sources */, - A954ABDE13EE9E470094E3FE /* Field.cpp in Sources */, - A954ABDF13EE9E470094E3FE /* CompoundFile.cpp in Sources */, - A954ABE013EE9E470094E3FE /* DocumentWriter.cpp in Sources */, - A954ABE113EE9E470094E3FE /* FieldInfos.cpp in Sources */, - A954ABE213EE9E470094E3FE /* FieldsReader.cpp in Sources */, - A954ABE313EE9E470094E3FE /* FieldsWriter.cpp in Sources */, - A954ABE413EE9E470094E3FE /* IndexModifier.cpp in Sources */, - A954ABE513EE9E470094E3FE /* IndexReader.cpp in Sources */, - A954ABE613EE9E470094E3FE /* IndexWriter.cpp in Sources */, - A954ABE713EE9E470094E3FE /* MultiReader.cpp in Sources */, - A954ABE813EE9E470094E3FE /* SegmentInfos.cpp in Sources */, - A954ABE913EE9E470094E3FE /* SegmentMergeInfo.cpp in Sources */, - A954ABEA13EE9E470094E3FE /* SegmentMergeQueue.cpp in Sources */, - A954ABEB13EE9E470094E3FE /* SegmentMerger.cpp in Sources */, - A954ABEC13EE9E470094E3FE /* SegmentReader.cpp in Sources */, - A954ABED13EE9E470094E3FE /* SegmentTermDocs.cpp in Sources */, - A954ABEE13EE9E470094E3FE /* SegmentTermEnum.cpp in Sources */, - A954ABEF13EE9E470094E3FE /* SegmentTermPositions.cpp in Sources */, - A954ABF013EE9E470094E3FE /* SegmentTermVector.cpp in Sources */, - A954ABF113EE9E470094E3FE /* Term.cpp in Sources */, - A954ABF213EE9E470094E3FE /* TermInfo.cpp in Sources */, - A954ABF313EE9E470094E3FE /* TermInfosReader.cpp in Sources */, - A954ABF413EE9E470094E3FE /* TermInfosWriter.cpp in Sources */, - A954ABF513EE9E470094E3FE /* TermVectorReader.cpp in Sources */, - A954ABF613EE9E470094E3FE /* TermVectorWriter.cpp in Sources */, - A954ABF713EE9E470094E3FE /* Lexer.cpp in Sources */, - A954ABF813EE9E470094E3FE /* MultiFieldQueryParser.cpp in Sources */, - A954ABF913EE9E470094E3FE /* QueryParser.cpp in Sources */, - A954ABFA13EE9E470094E3FE /* QueryParserBase.cpp in Sources */, - A954ABFB13EE9E470094E3FE /* QueryToken.cpp in Sources */, - A954ABFC13EE9E470094E3FE /* TokenList.cpp in Sources */, - A954ABFD13EE9E470094E3FE /* BooleanQuery.cpp in Sources */, - A954ABFE13EE9E470094E3FE /* BooleanScorer.cpp in Sources */, - A954ABFF13EE9E470094E3FE /* CachingWrapperFilter.cpp in Sources */, - A954AC0013EE9E470094E3FE /* ChainedFilter.cpp in Sources */, - A954AC0113EE9E470094E3FE /* ConjunctionScorer.cpp in Sources */, - A954AC0213EE9E470094E3FE /* DateFilter.cpp in Sources */, - A954AC0313EE9E470094E3FE /* ExactPhraseScorer.cpp in Sources */, - A954AC0413EE9E470094E3FE /* Explanation.cpp in Sources */, - A954AC0513EE9E470094E3FE /* FieldCache.cpp in Sources */, - A954AC0613EE9E470094E3FE /* FieldCacheImpl.cpp in Sources */, - A954AC0713EE9E470094E3FE /* FieldDocSortedHitQueue.cpp in Sources */, - A954AC0813EE9E470094E3FE /* FieldSortedHitQueue.cpp in Sources */, - A954AC0913EE9E470094E3FE /* FilteredTermEnum.cpp in Sources */, - A954AC0A13EE9E470094E3FE /* FuzzyQuery.cpp in Sources */, - A954AC0B13EE9E470094E3FE /* HitQueue.cpp in Sources */, - A954AC0C13EE9E470094E3FE /* Hits.cpp in Sources */, - A954AC0D13EE9E470094E3FE /* IndexSearcher.cpp in Sources */, - A954AC0E13EE9E470094E3FE /* MultiSearcher.cpp in Sources */, - A954AC0F13EE9E470094E3FE /* MultiTermQuery.cpp in Sources */, - A954AC1013EE9E470094E3FE /* PhrasePositions.cpp in Sources */, - A954AC1113EE9E470094E3FE /* PhraseQuery.cpp in Sources */, - A954AC1213EE9E470094E3FE /* PhraseScorer.cpp in Sources */, - A954AC1313EE9E470094E3FE /* PrefixQuery.cpp in Sources */, - A954AC1413EE9E470094E3FE /* QueryFilter.cpp in Sources */, - A954AC1513EE9E470094E3FE /* RangeFilter.cpp in Sources */, - A954AC1613EE9E470094E3FE /* RangeQuery.cpp in Sources */, - A954AC1713EE9E470094E3FE /* SearchHeader.cpp in Sources */, - A954AC1813EE9E470094E3FE /* Similarity.cpp in Sources */, - A954AC1913EE9E470094E3FE /* SloppyPhraseScorer.cpp in Sources */, - A954AC1A13EE9E470094E3FE /* Sort.cpp in Sources */, - A954AC1B13EE9E470094E3FE /* TermQuery.cpp in Sources */, - A954AC1C13EE9E470094E3FE /* TermScorer.cpp in Sources */, - A954AC1D13EE9E470094E3FE /* WildcardQuery.cpp in Sources */, - A954AC1E13EE9E470094E3FE /* WildcardTermEnum.cpp in Sources */, - A954AC1F13EE9E470094E3FE /* StdHeader.cpp in Sources */, - A954AC2013EE9E470094E3FE /* FSDirectory.cpp in Sources */, - A954AC2113EE9E470094E3FE /* IndexInput.cpp in Sources */, - A954AC2213EE9E470094E3FE /* IndexOutput.cpp in Sources */, - A954AC2313EE9E470094E3FE /* Lock.cpp in Sources */, - A954AC2413EE9E470094E3FE /* MMapInput.cpp in Sources */, - A954AC2513EE9E470094E3FE /* RAMDirectory.cpp in Sources */, - A954AC2613EE9E470094E3FE /* TransactionalRAMDirectory.cpp in Sources */, - A954AC2713EE9E470094E3FE /* BitSet.cpp in Sources */, - A954AC2813EE9E470094E3FE /* dirent.cpp in Sources */, - A954AC2913EE9E470094E3FE /* Equators.cpp in Sources */, - A954AC2A13EE9E470094E3FE /* FastCharStream.cpp in Sources */, - A954AC2B13EE9E470094E3FE /* fileinputstream.cpp in Sources */, - A954AC2C13EE9E470094E3FE /* MD5Digester.cpp in Sources */, - A954AC2D13EE9E470094E3FE /* Misc.cpp in Sources */, - A954AC2E13EE9E470094E3FE /* Reader.cpp in Sources */, - A954AC2F13EE9E470094E3FE /* StringBuffer.cpp in Sources */, - A954AC3013EE9E470094E3FE /* StringIntern.cpp in Sources */, - A954AC3113EE9E470094E3FE /* ThreadLocal.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; A975EED611C792B9007C1532 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -3132,21 +6168,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - A9BDFA5E1207F9870067ED5B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; A9BFB09D13EDF51000032679 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A9BFB0BC13EDF5C900032679 /* SwordManagerTest.m in Sources */, + A995E6271C877DD000843E13 /* SwordManagerTest.m in Sources */, + A968BE4D19DFF832002C9B78 /* SwordBibleTest.swift in Sources */, A9BFB0BD13EDF5C900032679 /* SwordModuleTest.m in Sources */, + A969DC7B1DA1289100C8E976 /* SwordLocaleManagerTest.swift in Sources */, A9BFB0BE13EDF5C900032679 /* SwordListKeyTest.m in Sources */, + 8C92CC9CEC8A341B902C53E2 /* SwordInstallSourceManagerTest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3262,109 +6293,35 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + A9D8FD3019E2EC5B0055700C /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D8FD3819E2EC730055700C /* introtest.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9EE8A8719E286E500CFFE6A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9EE8A9719E2877500CFFE6A /* SwordModuleLongRunTest.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - A954ABCA13EE9D0F0094E3FE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A954ABC913EE9D0F0094E3FE /* PBXContainerItemProxy */; - }; - A9A7EEAE14D5D4BB00B76B6A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9A7EEAD14D5D4BB00B76B6A /* PBXContainerItemProxy */; - }; - A9A7EEC114D5D66400B76B6A /* PBXTargetDependency */ = { + 0A011DA91FB4142500778C2B /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9A7EEC014D5D66400B76B6A /* PBXContainerItemProxy */; - }; - A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8DC2EF4F0486A6940098B216 /* ObjCSword */; - targetProxy = A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */; + target = 0A011D9D1FB4142500778C2B /* sword */; + targetProxy = 0A011DA81FB4142500778C2B /* PBXContainerItemProxy */; }; A9BFB0BB13EDF5B600032679 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 8DC2EF4F0486A6940098B216 /* ObjCSword */; targetProxy = A9BFB0BA13EDF5B600032679 /* PBXContainerItemProxy */; }; - A9D2714514D717D800DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D2714614D717D800DA8926 /* PBXContainerItemProxy */; - }; - A9D2715214D717FD00DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D2715314D717FD00DA8926 /* PBXContainerItemProxy */; - }; - A9D2715F14D7181200DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D2716014D7181200DA8926 /* PBXContainerItemProxy */; - }; - A9D2716C14D7182300DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D2716D14D7182300DA8926 /* PBXContainerItemProxy */; - }; - A9D2717914D7183B00DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D2717A14D7183B00DA8926 /* PBXContainerItemProxy */; - }; - A9D2718614D7185800DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D2718714D7185800DA8926 /* PBXContainerItemProxy */; - }; - A9D2719314D7186A00DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D2719414D7186A00DA8926 /* PBXContainerItemProxy */; - }; - A9D271A014D7187E00DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D271A114D7187E00DA8926 /* PBXContainerItemProxy */; - }; - A9D271AD14D7189300DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D271AE14D7189300DA8926 /* PBXContainerItemProxy */; - }; - A9D271BA14D718A400DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D271BB14D718A400DA8926 /* PBXContainerItemProxy */; - }; - A9D271C714D718B800DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D271C814D718B800DA8926 /* PBXContainerItemProxy */; - }; - A9D271D414D718C800DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D271D514D718C800DA8926 /* PBXContainerItemProxy */; - }; - A9D271E114D718DF00DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D271E214D718DF00DA8926 /* PBXContainerItemProxy */; - }; - A9D271EE14D718F500DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D271EF14D718F500DA8926 /* PBXContainerItemProxy */; - }; - A9D271FF14D7193A00DA8926 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A954ABC213EE9AB00094E3FE /* sword */; - targetProxy = A9D271FE14D7193A00DA8926 /* PBXContainerItemProxy */; - }; A9D2720114D7194E00DA8926 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = A9D2714414D717D800DA8926 /* imp2gbs */; @@ -3445,6 +6402,11 @@ target = A9D271ED14D718F500DA8926 /* xml2gbs */; targetProxy = A9D2721E14D7194E00DA8926 /* PBXContainerItemProxy */; }; + A9EE8A9319E286E500CFFE6A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8DC2EF4F0486A6940098B216 /* ObjCSword */; + targetProxy = A9EE8A9219E286E500CFFE6A /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -3459,34 +6421,305 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 0A011DB01FB4142500778C2B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = J9J97ZC4K5; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = SWORD/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = NO; + PRODUCT_BUNDLE_IDENTIFIER = org.crosswire.apple.SWORD; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 0A011DB11FB4142500778C2B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = J9J97ZC4K5; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = SWORD/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = org.crosswire.apple.SWORD; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 0A011DB31FB4142500778C2B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = J9J97ZC4K5; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = SWORDTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = org.crosswire.apple.SWORDTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 0A011DB41FB4142500778C2B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = J9J97ZC4K5; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = SWORDTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = org.crosswire.apple.SWORDTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 0A1F16A71FBB755B00E0AEFA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = J9J97ZC4K5; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + IPHONEOS_DEPLOYMENT_TARGET = 11.1; + MTL_ENABLE_DEBUG_INFO = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 0A1F16A81FBB755B00E0AEFA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = J9J97ZC4K5; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + IPHONEOS_DEPLOYMENT_TARGET = 11.1; + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; 1DEB91AE08733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_ENABLE_OBJC_ARC = YES; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = J9J97ZC4K5; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", + "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(PROJECT_DIR)/dependencies", ); FRAMEWORK_VERSION = A; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_GC = required; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ObjCSword_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = ""; - HEADER_SEARCH_PATHS = "../../include/**"; + HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@rpath"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; + OBJROOT = "$(PROJECT_DIR)/Build/Intermediates"; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-DDEBUG"; OTHER_LDFLAGS = ( @@ -3494,8 +6727,10 @@ "-lz", "-licucore", ); - PRODUCT_NAME = ObjCSword; + PRODUCT_BUNDLE_IDENTIFIER = org.crosswire.apple.SWORD; + PRODUCT_NAME = SWORD; SDKROOT = macosx; + SYMROOT = "$(PROJECT_DIR)/Build/Products"; VALID_ARCHS = x86_64; WARNING_CFLAGS = "-Wall"; WRAPPER_EXTENSION = framework; @@ -3506,38 +6741,46 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_ENABLE_OBJC_ARC = YES; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = J9J97ZC4K5; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", + "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(PROJECT_DIR)/dependencies", ); FRAMEWORK_VERSION = A; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_GC = required; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ObjCSword_Prefix.pch; GCC_VERSION = ""; - HEADER_SEARCH_PATHS = "../../include/**"; + HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@rpath"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; + OBJROOT = "$(PROJECT_DIR)/Build/Intermediates"; OTHER_CFLAGS = "-DRELEASE"; OTHER_LDFLAGS = ( "-lcurl", "-lz", "-licucore", ); - PRODUCT_NAME = ObjCSword; + PRODUCT_BUNDLE_IDENTIFIER = org.crosswire.apple.SWORD; + PRODUCT_NAME = SWORD; SDKROOT = macosx; + SYMROOT = "$(PROJECT_DIR)/Build/Products"; VALID_ARCHS = x86_64; WARNING_CFLAGS = "-Wall"; WRAPPER_EXTENSION = framework; @@ -3547,102 +6790,111 @@ 1DEB91B208733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = ""; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - 1DEB91B308733DA50010E9CD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_VERSION = ""; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - SDKROOT = macosx; - }; - name = Release; - }; - A954ABC513EE9AB00094E3FE /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - EXECUTABLE_PREFIX = lib; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../include/**", - "$(SRCROOT)/dependencies/clucene/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(PROJECT_DIR)/../../include", + "$(PROJECT_DIR)/dependencies/curl/include", ); - INSTALL_PATH = "@rpath"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/dependencies/curl/lib"; + OBJROOT = Build/Intermediates; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( - "-DCURLAVAILABLE", + "-DUNIX", "-Dunix", "-D__unix__", - "-DUSELUCENE", - "-D_ICU_", + "-DEXCLUDEBZIP2", + "-DEXCLUDEXZ", + "-DCURLAVAILABLE", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", ); - PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include/**/** $(SRCROOT)/dependencies/clucene/** $(SRCROOT)/dependencies/icu/include/**"; VALID_ARCHS = x86_64; }; name = Debug; }; - A954ABC613EE9AB00094E3FE /* Release */ = { + 1DEB91B308733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - EXECUTABLE_PREFIX = lib; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = ""; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_NO_COMMON_BLOCKS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../include/**", - "$(SRCROOT)/dependencies/clucene/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(PROJECT_DIR)/../../include", + "$(PROJECT_DIR)/dependencies/curl/include", ); - INSTALL_PATH = "@rpath"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/dependencies/curl/lib"; + OBJROOT = Build/Intermediates; OTHER_CFLAGS = ( - "-DNS_BLOCK_ASSERTIONS=1", - "-DCURLAVAILABLE", + "-DUNIX", "-Dunix", "-D__unix__", - "-DUSELUCENE", - "-D_ICU_", + "-DEXCLUDEBZIP2", + "-DEXCLUDEXZ", + "-DCURLAVAILABLE", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", ); - PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include/**/** $(SRCROOT)/dependencies/clucene/** $(SRCROOT)/dependencies/icu/include/**"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; VALID_ARCHS = x86_64; }; name = Release; @@ -3651,21 +6903,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -3676,6 +6934,7 @@ PRODUCT_NAME = mod2osis; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -3683,20 +6942,26 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -3707,6 +6972,7 @@ PRODUCT_NAME = mod2osis; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; ZERO_LINK = NO; }; name = Release; @@ -3715,8 +6981,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3728,15 +6995,19 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -3745,6 +7016,7 @@ "-licucore", ); PRODUCT_NAME = "$(TARGET_NAME)"; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -3752,23 +7024,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -3777,68 +7054,7 @@ "-licucore", ); PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - A9BDFA691207F9870067ED5B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "test/Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, - ); - PRODUCT_NAME = Tests; - SDKROOT = macosx; VALID_ARCHS = x86_64; - WRAPPER_EXTENSION = octest; - }; - name = Debug; - }; - A9BDFA6A1207F9870067ED5B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "test/Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, - ); - PRODUCT_NAME = Tests; - SDKROOT = macosx; - VALID_ARCHS = x86_64; - WRAPPER_EXTENSION = octest; - ZERO_LINK = NO; }; name = Release; }; @@ -3846,28 +7062,41 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", + "INSTALL_SOURCE_PATH=\"$PROJECT_DIR/LocalTestInstallSource\"", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/../../include", + /Users/mbergmann/Development/Apps/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + ); INFOPLIST_FILE = "test/Tests-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; + OTHER_SWIFT_FLAGS = ""; + PRODUCT_BUNDLE_IDENTIFIER = "de.mabe.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + SWIFT_OBJC_BRIDGING_HEADER = "test/Tests-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + SYMROOT = "$(PROJECT_DIR)/Build/Products"; VALID_ARCHS = x86_64; - WRAPPER_EXTENSION = octest; }; name = Debug; }; @@ -3875,23 +7104,34 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/../../include", + /Users/mbergmann/Development/Apps/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + ); INFOPLIST_FILE = "test/Tests-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; + OTHER_SWIFT_FLAGS = ""; + PRODUCT_BUNDLE_IDENTIFIER = "de.mabe.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + SWIFT_OBJC_BRIDGING_HEADER = "test/Tests-Bridging-Header.h"; + SWIFT_VERSION = 3.0; + SYMROOT = "$(PROJECT_DIR)/Build/Products"; VALID_ARCHS = x86_64; - WRAPPER_EXTENSION = octest; }; name = Release; }; @@ -3899,21 +7139,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -3924,6 +7170,7 @@ PRODUCT_NAME = imp2gbs; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -3931,20 +7178,26 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -3955,6 +7208,7 @@ PRODUCT_NAME = imp2gbs; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; ZERO_LINK = NO; }; name = Release; @@ -3963,21 +7217,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -3988,6 +7248,7 @@ PRODUCT_NAME = imp2ld; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -3995,20 +7256,26 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4019,6 +7286,7 @@ PRODUCT_NAME = imp2ld; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; ZERO_LINK = NO; }; name = Release; @@ -4027,21 +7295,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4052,6 +7326,7 @@ PRODUCT_NAME = imp2vs; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4059,20 +7334,26 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4083,6 +7364,7 @@ PRODUCT_NAME = imp2vs; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; ZERO_LINK = NO; }; name = Release; @@ -4091,21 +7373,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4116,6 +7404,7 @@ PRODUCT_NAME = installmgr; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4123,20 +7412,26 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4147,6 +7442,7 @@ PRODUCT_NAME = installmgr; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; ZERO_LINK = NO; }; name = Release; @@ -4155,21 +7451,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4180,6 +7482,7 @@ PRODUCT_NAME = mod2imp; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4187,20 +7490,26 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4211,6 +7520,7 @@ PRODUCT_NAME = mod2imp; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; ZERO_LINK = NO; }; name = Release; @@ -4219,21 +7529,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4244,6 +7560,7 @@ PRODUCT_NAME = mod2vpl; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4251,20 +7568,26 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4275,6 +7598,7 @@ PRODUCT_NAME = mod2vpl; SDKROOT = macosx; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; ZERO_LINK = NO; }; name = Release; @@ -4283,21 +7607,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4315,20 +7645,26 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); INSTALL_PATH = /usr/local/bin; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4347,8 +7683,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -4360,15 +7697,19 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4377,6 +7718,7 @@ "-licucore", ); PRODUCT_NAME = step2vpl; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4384,23 +7726,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4409,6 +7756,7 @@ "-licucore", ); PRODUCT_NAME = step2vpl; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -4416,8 +7764,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -4429,15 +7778,19 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4446,6 +7799,7 @@ "-licucore", ); PRODUCT_NAME = stepdump; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4453,23 +7807,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4478,6 +7837,7 @@ "-licucore", ); PRODUCT_NAME = stepdump; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -4485,8 +7845,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -4498,15 +7859,19 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4515,6 +7880,7 @@ "-licucore", ); PRODUCT_NAME = tei2mod; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4522,23 +7888,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4547,6 +7918,7 @@ "-licucore", ); PRODUCT_NAME = tei2mod; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -4554,8 +7926,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -4567,15 +7940,19 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4584,6 +7961,7 @@ "-licucore", ); PRODUCT_NAME = vpl2mod; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4591,23 +7969,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4616,6 +7999,7 @@ "-licucore", ); PRODUCT_NAME = vpl2mod; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -4623,8 +8007,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -4636,15 +8021,19 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4653,6 +8042,7 @@ "-licucore", ); PRODUCT_NAME = vs2osisref; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4660,23 +8050,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4685,6 +8080,7 @@ "-licucore", ); PRODUCT_NAME = vs2osisref; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -4692,8 +8088,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -4705,15 +8102,19 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4722,6 +8123,7 @@ "-licucore", ); PRODUCT_NAME = vs2osisreftxt; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4729,23 +8131,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4754,6 +8161,7 @@ "-licucore", ); PRODUCT_NAME = vs2osisreftxt; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -4761,8 +8169,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -4774,15 +8183,19 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4791,6 +8204,7 @@ "-licucore", ); PRODUCT_NAME = xml2gbs; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4798,23 +8212,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 27XS5W9C3J; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "../../include/**", - "$(SRCROOT)/dependencies/icu/include/**", + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", ); LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = ( "-DCURLAVAILABLE", "-Dunix", "-D__unix__", + "-DEXCLUDEXZ", "-D_ICU_", ); OTHER_LDFLAGS = ( @@ -4823,6 +8242,7 @@ "-licucore", ); PRODUCT_NAME = xml2gbs; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -4830,7 +8250,9 @@ isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = "$(TARGET_NAME)"; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -4838,6 +8260,178 @@ isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = "$(TARGET_NAME)"; + VALID_ARCHS = x86_64; + }; + name = Release; + }; + A9D8FD3519E2EC5B0055700C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-DEXCLUDEXZ", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = introtest; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; + }; + name = Debug; + }; + A9D8FD3619E2EC5B0055700C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_MODEL_TUNING = G5; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../include", + "$(SRCROOT)/dependencies/icu/source/i18n", + "$(SRCROOT)/dependencies/icu/source/common", + "$(SRCROOT)/dependencies/icu/source/io", + "$(SRCROOT)/dependencies/clucene", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-DEXCLUDEXZ", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = introtest; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = x86_64; + ZERO_LINK = NO; + }; + name = Release; + }; + A9EE8A9519E286E500CFFE6A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = ""; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(inherited)", + ); + GCC_DYNAMIC_NO_PIC = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Users/mbergmann/Development/Apps/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(PROJECT_DIR)/../../include", + ); + INFOPLIST_FILE = LongRunningTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "de.mabe.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + A9EE8A9619E286E500CFFE6A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = ""; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Users/mbergmann/Development/Apps/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(PROJECT_DIR)/../../include", + ); + INFOPLIST_FILE = LongRunningTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "de.mabe.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4845,56 +8439,65 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */ = { + 0A011DAF1FB4142500778C2B /* Build configuration list for PBXNativeTarget "sword" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1DEB91AE08733DA50010E9CD /* Debug */, - 1DEB91AF08733DA50010E9CD /* Release */, + 0A011DB01FB4142500778C2B /* Debug */, + 0A011DB11FB4142500778C2B /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */ = { + 0A011DB21FB4142500778C2B /* Build configuration list for PBXNativeTarget "SWORDTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1DEB91B208733DA50010E9CD /* Debug */, - 1DEB91B308733DA50010E9CD /* Release */, + 0A011DB31FB4142500778C2B /* Debug */, + 0A011DB41FB4142500778C2B /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A954ABC413EE9AB00094E3FE /* Build configuration list for PBXNativeTarget "sword" */ = { + 0A1F16A61FBB755B00E0AEFA /* Build configuration list for PBXNativeTarget "SWORD" */ = { isa = XCConfigurationList; buildConfigurations = ( - A954ABC513EE9AB00094E3FE /* Debug */, - A954ABC613EE9AB00094E3FE /* Release */, + 0A1F16A71FBB755B00E0AEFA /* Debug */, + 0A1F16A81FBB755B00E0AEFA /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */ = { + 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */ = { isa = XCConfigurationList; buildConfigurations = ( - A975EEDE11C792BA007C1532 /* Debug */, - A975EEDF11C792BA007C1532 /* Release */, + 1DEB91AE08733DA50010E9CD /* Debug */, + 1DEB91AF08733DA50010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A9A7EEBB14D5D61700B76B6A /* Build configuration list for PBXNativeTarget "osis2mod" */ = { + 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */ = { isa = XCConfigurationList; buildConfigurations = ( - A9A7EEBC14D5D61700B76B6A /* Debug */, - A9A7EEBD14D5D61700B76B6A /* Release */, + 1DEB91B208733DA50010E9CD /* Debug */, + 1DEB91B308733DA50010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */ = { + A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A975EEDE11C792BA007C1532 /* Debug */, + A975EEDF11C792BA007C1532 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9A7EEBB14D5D61700B76B6A /* Build configuration list for PBXNativeTarget "osis2mod" */ = { isa = XCConfigurationList; buildConfigurations = ( - A9BDFA691207F9870067ED5B /* Debug */, - A9BDFA6A1207F9870067ED5B /* Release */, + A9A7EEBC14D5D61700B76B6A /* Debug */, + A9A7EEBD14D5D61700B76B6A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -5043,6 +8646,24 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + A9D8FD3419E2EC5B0055700C /* Build configuration list for PBXNativeTarget "introtest" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D8FD3519E2EC5B0055700C /* Debug */, + A9D8FD3619E2EC5B0055700C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9EE8A9419E286E500CFFE6A /* Build configuration list for PBXNativeTarget "LongRunningTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9EE8A9519E286E500CFFE6A /* Debug */, + A9EE8A9619E286E500CFFE6A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 0867D690FE84028FC02AAC07 /* Project object */; diff --git a/bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj b/bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj deleted file mode 100644 index ecd4c13..0000000 --- a/bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj +++ /dev/null @@ -1,1060 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 45; - objects = { - -/* Begin PBXBuildFile section */ - 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; - 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; }; - A918B8E411C6697400024D84 /* SwordModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A918B8E211C6697400024D84 /* SwordModuleTest.h */; }; - A918B8E511C6697400024D84 /* SwordModuleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A918B8E311C6697400024D84 /* SwordModuleTest.m */; }; - A94EAC0B117B28920018B06F /* SwordBible.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE3117B28910018B06F /* SwordBible.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE4117B28910018B06F /* SwordBible.mm */; }; - A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE5117B28920018B06F /* SwordBibleBook.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC0E117B28920018B06F /* SwordBibleBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE6117B28920018B06F /* SwordBibleBook.mm */; }; - A94EAC0F117B28920018B06F /* SwordBibleChapter.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE7117B28920018B06F /* SwordBibleChapter.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE8117B28920018B06F /* SwordBibleChapter.m */; }; - A94EAC11117B28920018B06F /* SwordBibleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC12117B28920018B06F /* SwordBibleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */; }; - A94EAC13117B28920018B06F /* SwordBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEB117B28920018B06F /* SwordBook.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC14117B28920018B06F /* SwordBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEC117B28920018B06F /* SwordBook.mm */; }; - A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABED117B28920018B06F /* SwordCommentary.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC16117B28920018B06F /* SwordCommentary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEE117B28920018B06F /* SwordCommentary.mm */; }; - A94EAC17117B28920018B06F /* SwordDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEF117B28920018B06F /* SwordDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF0117B28920018B06F /* SwordDictionary.mm */; }; - A94EAC19117B28920018B06F /* SwordInstallSource.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF1117B28920018B06F /* SwordInstallSource.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF2117B28920018B06F /* SwordInstallSource.mm */; }; - A94EAC1B117B28920018B06F /* SwordInstallSourceController.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF3117B28920018B06F /* SwordInstallSourceController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC1C117B28920018B06F /* SwordInstallSourceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */; }; - A94EAC1D117B28920018B06F /* SwordKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF5117B28920018B06F /* SwordKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC1E117B28920018B06F /* SwordKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF6117B28920018B06F /* SwordKey.mm */; }; - A94EAC1F117B28920018B06F /* SwordListKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF7117B28920018B06F /* SwordListKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC20117B28920018B06F /* SwordListKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF8117B28920018B06F /* SwordListKey.mm */; }; - A94EAC21117B28920018B06F /* SwordManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF9117B28920018B06F /* SwordManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC22117B28920018B06F /* SwordManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFA117B28920018B06F /* SwordManager.mm */; }; - A94EAC25117B28920018B06F /* SwordModule.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFD117B28920018B06F /* SwordModule.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC26117B28920018B06F /* SwordModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFE117B28920018B06F /* SwordModule.mm */; }; - A94EAC27117B28920018B06F /* SwordModuleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC28117B28920018B06F /* SwordModuleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */; }; - A94EAC29117B28920018B06F /* SwordModuleTreeEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC2A117B28920018B06F /* SwordModuleTreeEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */; }; - A94EAC2D117B28920018B06F /* SwordVerseKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC05117B28920018B06F /* SwordVerseKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC2E117B28920018B06F /* SwordVerseKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC06117B28920018B06F /* SwordVerseKey.mm */; }; - A94EAC2F117B28920018B06F /* SwordVerseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC07117B28920018B06F /* SwordVerseManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC30117B28920018B06F /* SwordVerseManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC08117B28920018B06F /* SwordVerseManager.mm */; }; - A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC09117B28920018B06F /* VerseEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC32117B28920018B06F /* VerseEnumerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC0A117B28920018B06F /* VerseEnumerator.mm */; }; - A956316611FD8C5B007DC7AD /* libsword-ub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A956316411FD8C55007DC7AD /* libsword-ub.a */; }; - A956316711FD8C5E007DC7AD /* libsword-ub.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = A956316411FD8C55007DC7AD /* libsword-ub.a */; }; - A956324411FD90CE007DC7AD /* libclucene-ub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A956324211FD90C9007DC7AD /* libclucene-ub.a */; }; - A956324511FD90D2007DC7AD /* libclucene-ub.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = A956324211FD90C9007DC7AD /* libclucene-ub.a */; }; - A964657C11C662CF00640FAC /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; }; - A964658F11C6654300640FAC /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */; }; - A96465A511C6657900640FAC /* SwordManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A964658111C663E200640FAC /* SwordManagerTest.m */; }; - A96465AD11C6658200640FAC /* SwordManagerTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A964658011C663E200640FAC /* SwordManagerTest.h */; }; - A975EAC511C77862007C1532 /* ObjCSword.h in Headers */ = {isa = PBXBuildFile; fileRef = A975EAC411C77862007C1532 /* ObjCSword.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A975EEE511C79308007C1532 /* mod2osis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAC11C7925C007C1532 /* mod2osis.cpp */; }; - A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A2C17C118D9D3D0002873D /* Notifications.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */; }; - A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; }; - A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A964658011C663E200640FAC /* SwordManagerTest.h */; }; - A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A918B8E211C6697400024D84 /* SwordModuleTest.h */; }; - A9BDFA781207F9F00067ED5B /* SwordListKeyTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */; }; - A9BDFA791207F9F00067ED5B /* SwordListKeyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */; }; - A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */; }; - A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */; }; - A9C2856F11C446B700803CB5 /* Configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2856D11C446B700803CB5 /* Configuration.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2857111C4471400803CB5 /* OSXConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9C2857411C4471400803CB5 /* OSXConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2857211C4471400803CB5 /* OSXConfiguration.m */; }; - A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2858211C44A0A00803CB5 /* Configuration.m */; }; - A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */; }; - A9D4382311C52947007AFE83 /* locales.d in Resources */ = {isa = PBXBuildFile; fileRef = A9D437CE11C52947007AFE83 /* locales.d */; }; - A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A9EF1414120595650078A27C /* SwordLocaleManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9EF1415120595650078A27C /* SwordLocaleManager.mm */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - A964657A11C662CA00640FAC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8DC2EF4F0486A6940098B216; - remoteInfo = ObjCSword; - }; - A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8DC2EF4F0486A6940098B216; - remoteInfo = ObjCSword; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - A9A5050211C75C4B00EB6EA5 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - A956324511FD90D2007DC7AD /* libclucene-ub.a in CopyFiles */, - A956316711FD8C5E007DC7AD /* libsword-ub.a in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; - 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; - 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; - 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; - 32DBCF5E0370ADEE00C91783 /* ObjCSword_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword_Prefix.pch; sourceTree = "<group>"; }; - 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; - 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjCSword.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - A9013D3F11E316C700E1CCCA /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = "<group>"; }; - A918B8E211C6697400024D84 /* SwordModuleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTest.h; path = test/SwordModuleTest.h; sourceTree = "<group>"; }; - A918B8E311C6697400024D84 /* SwordModuleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTest.m; path = test/SwordModuleTest.m; sourceTree = "<group>"; }; - A94EABE3117B28910018B06F /* SwordBible.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBible.h; path = src/SwordBible.h; sourceTree = "<group>"; }; - A94EABE4117B28910018B06F /* SwordBible.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBible.mm; path = src/SwordBible.mm; sourceTree = "<group>"; }; - A94EABE5117B28920018B06F /* SwordBibleBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleBook.h; path = src/SwordBibleBook.h; sourceTree = "<group>"; }; - A94EABE6117B28920018B06F /* SwordBibleBook.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBibleBook.mm; path = src/SwordBibleBook.mm; sourceTree = "<group>"; }; - A94EABE7117B28920018B06F /* SwordBibleChapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleChapter.h; path = src/SwordBibleChapter.h; sourceTree = "<group>"; }; - A94EABE8117B28920018B06F /* SwordBibleChapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleChapter.m; path = src/SwordBibleChapter.m; sourceTree = "<group>"; }; - A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleTextEntry.h; path = src/SwordBibleTextEntry.h; sourceTree = "<group>"; }; - A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleTextEntry.m; path = src/SwordBibleTextEntry.m; sourceTree = "<group>"; }; - A94EABEB117B28920018B06F /* SwordBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBook.h; path = src/SwordBook.h; sourceTree = "<group>"; }; - A94EABEC117B28920018B06F /* SwordBook.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBook.mm; path = src/SwordBook.mm; sourceTree = "<group>"; }; - A94EABED117B28920018B06F /* SwordCommentary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordCommentary.h; path = src/SwordCommentary.h; sourceTree = "<group>"; }; - A94EABEE117B28920018B06F /* SwordCommentary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordCommentary.mm; path = src/SwordCommentary.mm; sourceTree = "<group>"; }; - A94EABEF117B28920018B06F /* SwordDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordDictionary.h; path = src/SwordDictionary.h; sourceTree = "<group>"; }; - A94EABF0117B28920018B06F /* SwordDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordDictionary.mm; path = src/SwordDictionary.mm; sourceTree = "<group>"; }; - A94EABF1117B28920018B06F /* SwordInstallSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSource.h; path = src/SwordInstallSource.h; sourceTree = "<group>"; }; - A94EABF2117B28920018B06F /* SwordInstallSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSource.mm; path = src/SwordInstallSource.mm; sourceTree = "<group>"; }; - A94EABF3117B28920018B06F /* SwordInstallSourceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSourceController.h; path = src/SwordInstallSourceController.h; sourceTree = "<group>"; }; - A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSourceController.mm; path = src/SwordInstallSourceController.mm; sourceTree = "<group>"; }; - A94EABF5117B28920018B06F /* SwordKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordKey.h; path = src/SwordKey.h; sourceTree = "<group>"; }; - A94EABF6117B28920018B06F /* SwordKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordKey.mm; path = src/SwordKey.mm; sourceTree = "<group>"; }; - A94EABF7117B28920018B06F /* SwordListKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKey.h; path = src/SwordListKey.h; sourceTree = "<group>"; }; - A94EABF8117B28920018B06F /* SwordListKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordListKey.mm; path = src/SwordListKey.mm; sourceTree = "<group>"; }; - A94EABF9117B28920018B06F /* SwordManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManager.h; path = src/SwordManager.h; sourceTree = "<group>"; }; - A94EABFA117B28920018B06F /* SwordManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordManager.mm; path = src/SwordManager.mm; sourceTree = "<group>"; }; - A94EABFD117B28920018B06F /* SwordModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModule.h; path = src/SwordModule.h; sourceTree = "<group>"; }; - A94EABFE117B28920018B06F /* SwordModule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModule.mm; path = src/SwordModule.mm; sourceTree = "<group>"; }; - A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTextEntry.h; path = src/SwordModuleTextEntry.h; sourceTree = "<group>"; }; - A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTextEntry.m; path = src/SwordModuleTextEntry.m; sourceTree = "<group>"; }; - A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTreeEntry.h; path = src/SwordModuleTreeEntry.h; sourceTree = "<group>"; }; - A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTreeEntry.m; path = src/SwordModuleTreeEntry.m; sourceTree = "<group>"; }; - A94EAC05117B28920018B06F /* SwordVerseKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseKey.h; path = src/SwordVerseKey.h; sourceTree = "<group>"; }; - A94EAC06117B28920018B06F /* SwordVerseKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseKey.mm; path = src/SwordVerseKey.mm; sourceTree = "<group>"; }; - A94EAC07117B28920018B06F /* SwordVerseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseManager.h; path = src/SwordVerseManager.h; sourceTree = "<group>"; }; - A94EAC08117B28920018B06F /* SwordVerseManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseManager.mm; path = src/SwordVerseManager.mm; sourceTree = "<group>"; }; - A94EAC09117B28920018B06F /* VerseEnumerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VerseEnumerator.h; path = src/VerseEnumerator.h; sourceTree = "<group>"; }; - A94EAC0A117B28920018B06F /* VerseEnumerator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VerseEnumerator.mm; path = src/VerseEnumerator.mm; sourceTree = "<group>"; }; - A956316411FD8C55007DC7AD /* libsword-ub.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsword-ub.a"; path = "build_sword/build/result_inst/lib/libsword-ub.a"; sourceTree = "<group>"; }; - A956324211FD90C9007DC7AD /* libclucene-ub.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libclucene-ub.a"; path = "build_clucene/build/result_inst/lib/libclucene-ub.a"; sourceTree = "<group>"; }; - A964658011C663E200640FAC /* SwordManagerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManagerTest.h; path = test/SwordManagerTest.h; sourceTree = "<group>"; }; - A964658111C663E200640FAC /* SwordManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordManagerTest.m; path = test/SwordManagerTest.m; sourceTree = "<group>"; }; - A975EAC411C77862007C1532 /* ObjCSword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword.h; sourceTree = "<group>"; }; - A975ED9811C7925C007C1532 /* imp2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2gbs.cpp; sourceTree = "<group>"; }; - A975ED9911C7925C007C1532 /* imp2ld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2ld.cpp; sourceTree = "<group>"; }; - A975ED9A11C7925C007C1532 /* imp2vs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2vs.cpp; sourceTree = "<group>"; }; - A975ED9B11C7925C007C1532 /* installmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = installmgr.cpp; sourceTree = "<group>"; }; - A975EDAB11C7925C007C1532 /* mod2imp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2imp.cpp; sourceTree = "<group>"; }; - A975EDAC11C7925C007C1532 /* mod2osis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2osis.cpp; sourceTree = "<group>"; }; - A975EDAD11C7925C007C1532 /* mod2vpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2vpl.cpp; sourceTree = "<group>"; }; - A975EDAE11C7925C007C1532 /* mod2zmod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2zmod.cpp; sourceTree = "<group>"; }; - A975EDB111C7925C007C1532 /* osis2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osis2mod.cpp; sourceTree = "<group>"; }; - A975EDB811C7925C007C1532 /* step2vpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = step2vpl.cpp; sourceTree = "<group>"; }; - A975EDB911C7925C007C1532 /* stepdump.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stepdump.cpp; sourceTree = "<group>"; }; - A975EDBB11C7925C007C1532 /* tei2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tei2mod.cpp; sourceTree = "<group>"; }; - A975EDD811C7925C007C1532 /* vpl2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vpl2mod.cpp; sourceTree = "<group>"; }; - A975EDD911C7925C007C1532 /* vs2osisref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vs2osisref.cpp; sourceTree = "<group>"; }; - A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vs2osisreftxt.cpp; sourceTree = "<group>"; }; - A975EDDB11C7925C007C1532 /* xml2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml2gbs.cpp; sourceTree = "<group>"; }; - A975EED911C792B9007C1532 /* mod2osis */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2osis; sourceTree = BUILT_PRODUCTS_DIR; }; - A9921A1911FD9CA8002DAA72 /* libSword.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSword.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; - A9A2C17C118D9D3D0002873D /* Notifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Notifications.h; path = src/Notifications.h; sourceTree = "<group>"; }; - A9BDFA6B1207F9870067ED5B /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; - A9BDFA6E1207F9870067ED5B /* Tests-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info copy.plist"; sourceTree = "<group>"; }; - A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKeyTest.h; path = test/SwordListKeyTest.h; sourceTree = "<group>"; }; - A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordListKeyTest.m; path = test/SwordListKeyTest.m; sourceTree = "<group>"; }; - A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleLongRunTest.h; path = test/SwordModuleLongRunTest.h; sourceTree = "<group>"; }; - A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModuleLongRunTest.mm; path = test/SwordModuleLongRunTest.mm; sourceTree = "<group>"; }; - A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; - A9C2819611C43C4900803CB5 /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; - A9C2819711C43C4900803CB5 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; }; - A9C2856D11C446B700803CB5 /* Configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Configuration.h; path = src/services/Configuration.h; sourceTree = "<group>"; }; - A9C2857111C4471400803CB5 /* OSXConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OSXConfiguration.h; path = src/services/OSXConfiguration.h; sourceTree = "<group>"; }; - A9C2857211C4471400803CB5 /* OSXConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OSXConfiguration.m; path = src/services/OSXConfiguration.m; sourceTree = "<group>"; }; - A9C2858211C44A0A00803CB5 /* Configuration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Configuration.m; path = src/services/Configuration.m; sourceTree = "<group>"; }; - A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SwordModule+Index.h"; path = "src/SwordModule+Index.h"; sourceTree = "<group>"; }; - A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "SwordModule+Index.mm"; path = "src/SwordModule+Index.mm"; sourceTree = "<group>"; }; - A9D437CE11C52947007AFE83 /* locales.d */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locales.d; path = ../../locales.d; sourceTree = SOURCE_ROOT; }; - A9EF1414120595650078A27C /* SwordLocaleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordLocaleManager.h; path = src/SwordLocaleManager.h; sourceTree = "<group>"; }; - A9EF1415120595650078A27C /* SwordLocaleManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordLocaleManager.mm; path = src/SwordLocaleManager.mm; sourceTree = "<group>"; }; - D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8DC2EF560486A6940098B216 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A956324411FD90CE007DC7AD /* libclucene-ub.a in Frameworks */, - A956316611FD8C5B007DC7AD /* libsword-ub.a in Frameworks */, - 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A975EED711C792B9007C1532 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9BDFA611207F9870067ED5B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */, - A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9C2819311C43C4900803CB5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A964658F11C6654300640FAC /* SenTestingKit.framework in Frameworks */, - A964657C11C662CF00640FAC /* ObjCSword.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 034768DFFF38A50411DB9C8B /* Products */ = { - isa = PBXGroup; - children = ( - 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */, - A9C2819611C43C4900803CB5 /* Tests.octest */, - A975EED911C792B9007C1532 /* mod2osis */, - A9921A1911FD9CA8002DAA72 /* libSword.dylib */, - A9BDFA6B1207F9870067ED5B /* Tests.octest */, - ); - name = Products; - sourceTree = "<group>"; - }; - 0867D691FE84028FC02AAC07 /* ObjCSword */ = { - isa = PBXGroup; - children = ( - A975ECD211C7925B007C1532 /* Utilities */, - A9C2857911C4486400803CB5 /* Tests */, - A94EAE72117B32AF0018B06F /* Services */, - 08FB77AEFE84172EC02AAC07 /* SwordWrapper */, - 32C88DFF0371C24200C91783 /* Other Sources */, - 089C1665FE841158C02AAC07 /* Resources */, - 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, - 034768DFFF38A50411DB9C8B /* Products */, - A9C2819711C43C4900803CB5 /* Tests-Info.plist */, - A9BDFA6E1207F9870067ED5B /* Tests-Info copy.plist */, - ); - name = ObjCSword; - sourceTree = "<group>"; - }; - 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = { - isa = PBXGroup; - children = ( - 1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */, - 1058C7B2FEA5585E11CA2CBB /* Other Frameworks */, - ); - name = "External Frameworks and Libraries"; - sourceTree = "<group>"; - }; - 089C1665FE841158C02AAC07 /* Resources */ = { - isa = PBXGroup; - children = ( - A9D437CE11C52947007AFE83 /* locales.d */, - 8DC2EF5A0486A6940098B216 /* Info.plist */, - 089C1666FE841158C02AAC07 /* InfoPlist.strings */, - A9013D3F11E316C700E1CCCA /* Info copy.plist */, - ); - name = Resources; - sourceTree = "<group>"; - }; - 08FB77AEFE84172EC02AAC07 /* SwordWrapper */ = { - isa = PBXGroup; - children = ( - A9EF1414120595650078A27C /* SwordLocaleManager.h */, - A9EF1415120595650078A27C /* SwordLocaleManager.mm */, - A94EABF9117B28920018B06F /* SwordManager.h */, - A94EABFA117B28920018B06F /* SwordManager.mm */, - A94EAC07117B28920018B06F /* SwordVerseManager.h */, - A94EAC08117B28920018B06F /* SwordVerseManager.mm */, - A94EABFD117B28920018B06F /* SwordModule.h */, - A94EABFE117B28920018B06F /* SwordModule.mm */, - A94EABE3117B28910018B06F /* SwordBible.h */, - A94EABE4117B28910018B06F /* SwordBible.mm */, - A94EABEB117B28920018B06F /* SwordBook.h */, - A94EABEC117B28920018B06F /* SwordBook.mm */, - A94EABED117B28920018B06F /* SwordCommentary.h */, - A94EABEE117B28920018B06F /* SwordCommentary.mm */, - A94EABEF117B28920018B06F /* SwordDictionary.h */, - A94EABF0117B28920018B06F /* SwordDictionary.mm */, - A94EABE5117B28920018B06F /* SwordBibleBook.h */, - A94EABE6117B28920018B06F /* SwordBibleBook.mm */, - A94EABE7117B28920018B06F /* SwordBibleChapter.h */, - A94EABE8117B28920018B06F /* SwordBibleChapter.m */, - A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */, - A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */, - A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */, - A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */, - A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */, - A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */, - A94EABF5117B28920018B06F /* SwordKey.h */, - A94EABF6117B28920018B06F /* SwordKey.mm */, - A94EABF7117B28920018B06F /* SwordListKey.h */, - A94EABF8117B28920018B06F /* SwordListKey.mm */, - A94EABE7117B28920018B06F /* SwordBibleChapter.h */, - A94EABE8117B28920018B06F /* SwordBibleChapter.m */, - A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */, - A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */, - A94EABF5117B28920018B06F /* SwordKey.h */, - A94EABF6117B28920018B06F /* SwordKey.mm */, - A94EABF7117B28920018B06F /* SwordListKey.h */, - A94EABF8117B28920018B06F /* SwordListKey.mm */, - A94EAC05117B28920018B06F /* SwordVerseKey.h */, - A94EAC06117B28920018B06F /* SwordVerseKey.mm */, - A94EAC09117B28920018B06F /* VerseEnumerator.h */, - A94EAC0A117B28920018B06F /* VerseEnumerator.mm */, - A94EABF1117B28920018B06F /* SwordInstallSource.h */, - A94EABF2117B28920018B06F /* SwordInstallSource.mm */, - A94EABF3117B28920018B06F /* SwordInstallSourceController.h */, - A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */, - A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */, - A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */, - ); - name = SwordWrapper; - sourceTree = "<group>"; - }; - 1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */ = { - isa = PBXGroup; - children = ( - 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */, - A956316411FD8C55007DC7AD /* libsword-ub.a */, - A956324211FD90C9007DC7AD /* libclucene-ub.a */, - ); - name = "Linked Frameworks"; - sourceTree = "<group>"; - }; - 1058C7B2FEA5585E11CA2CBB /* Other Frameworks */ = { - isa = PBXGroup; - children = ( - 0867D6A5FE840307C02AAC07 /* AppKit.framework */, - D2F7E79907B2D74100F64583 /* CoreData.framework */, - 0867D69BFE84028FC02AAC07 /* Foundation.framework */, - A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */, - ); - name = "Other Frameworks"; - sourceTree = "<group>"; - }; - 32C88DFF0371C24200C91783 /* Other Sources */ = { - isa = PBXGroup; - children = ( - A9A2C17C118D9D3D0002873D /* Notifications.h */, - 32DBCF5E0370ADEE00C91783 /* ObjCSword_Prefix.pch */, - A975EAC411C77862007C1532 /* ObjCSword.h */, - ); - name = "Other Sources"; - sourceTree = "<group>"; - }; - A94EAE72117B32AF0018B06F /* Services */ = { - isa = PBXGroup; - children = ( - A9C2856D11C446B700803CB5 /* Configuration.h */, - A9C2858211C44A0A00803CB5 /* Configuration.m */, - A9C2857111C4471400803CB5 /* OSXConfiguration.h */, - A9C2857211C4471400803CB5 /* OSXConfiguration.m */, - ); - name = Services; - sourceTree = "<group>"; - }; - A975ECD211C7925B007C1532 /* Utilities */ = { - isa = PBXGroup; - children = ( - A975ED9811C7925C007C1532 /* imp2gbs.cpp */, - A975ED9911C7925C007C1532 /* imp2ld.cpp */, - A975ED9A11C7925C007C1532 /* imp2vs.cpp */, - A975ED9B11C7925C007C1532 /* installmgr.cpp */, - A975EDAB11C7925C007C1532 /* mod2imp.cpp */, - A975EDAC11C7925C007C1532 /* mod2osis.cpp */, - A975EDAD11C7925C007C1532 /* mod2vpl.cpp */, - A975EDAE11C7925C007C1532 /* mod2zmod.cpp */, - A975EDB111C7925C007C1532 /* osis2mod.cpp */, - A975EDB811C7925C007C1532 /* step2vpl.cpp */, - A975EDB911C7925C007C1532 /* stepdump.cpp */, - A975EDBB11C7925C007C1532 /* tei2mod.cpp */, - A975EDD811C7925C007C1532 /* vpl2mod.cpp */, - A975EDD911C7925C007C1532 /* vs2osisref.cpp */, - A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */, - A975EDDB11C7925C007C1532 /* xml2gbs.cpp */, - ); - name = Utilities; - path = ../../utilities; - sourceTree = SOURCE_ROOT; - }; - A9C2857911C4486400803CB5 /* Tests */ = { - isa = PBXGroup; - children = ( - A964658011C663E200640FAC /* SwordManagerTest.h */, - A964658111C663E200640FAC /* SwordManagerTest.m */, - A918B8E211C6697400024D84 /* SwordModuleTest.h */, - A918B8E311C6697400024D84 /* SwordModuleTest.m */, - A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */, - A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */, - A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */, - A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */, - ); - name = Tests; - sourceTree = "<group>"; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 8DC2EF500486A6940098B216 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - A975EAC511C77862007C1532 /* ObjCSword.h in Headers */, - A94EAC0B117B28920018B06F /* SwordBible.h in Headers */, - A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */, - A94EAC0F117B28920018B06F /* SwordBibleChapter.h in Headers */, - A94EAC11117B28920018B06F /* SwordBibleTextEntry.h in Headers */, - A94EAC13117B28920018B06F /* SwordBook.h in Headers */, - A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */, - A94EAC17117B28920018B06F /* SwordDictionary.h in Headers */, - A94EAC19117B28920018B06F /* SwordInstallSource.h in Headers */, - A94EAC1B117B28920018B06F /* SwordInstallSourceController.h in Headers */, - A94EAC1D117B28920018B06F /* SwordKey.h in Headers */, - A94EAC1F117B28920018B06F /* SwordListKey.h in Headers */, - A94EAC21117B28920018B06F /* SwordManager.h in Headers */, - A94EAC25117B28920018B06F /* SwordModule.h in Headers */, - A94EAC27117B28920018B06F /* SwordModuleTextEntry.h in Headers */, - A94EAC29117B28920018B06F /* SwordModuleTreeEntry.h in Headers */, - A94EAC2D117B28920018B06F /* SwordVerseKey.h in Headers */, - A94EAC2F117B28920018B06F /* SwordVerseManager.h in Headers */, - A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */, - A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */, - A9C2856F11C446B700803CB5 /* Configuration.h in Headers */, - A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */, - A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */, - A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9BDFA651207F9870067ED5B /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */, - A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */, - A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9C281B611C43DB800803CB5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - A96465AD11C6658200640FAC /* SwordManagerTest.h in Headers */, - A918B8E411C6697400024D84 /* SwordModuleTest.h in Headers */, - A9BDFA781207F9F00067ED5B /* SwordListKeyTest.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 8DC2EF4F0486A6940098B216 /* ObjCSword */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */; - buildPhases = ( - 8DC2EF500486A6940098B216 /* Headers */, - 8DC2EF520486A6940098B216 /* Resources */, - 8DC2EF540486A6940098B216 /* Sources */, - 8DC2EF560486A6940098B216 /* Frameworks */, - A9A5050211C75C4B00EB6EA5 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = ObjCSword; - productInstallPath = "$(HOME)/Library/Frameworks"; - productName = ObjCSword; - productReference = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; - productType = "com.apple.product-type.framework"; - }; - A975EED811C792B9007C1532 /* mod2osis */ = { - isa = PBXNativeTarget; - buildConfigurationList = A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */; - buildPhases = ( - A975EED611C792B9007C1532 /* Sources */, - A975EED711C792B9007C1532 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = mod2osis; - productName = mod2osis; - productReference = A975EED911C792B9007C1532 /* mod2osis */; - productType = "com.apple.product-type.tool"; - }; - A9BDFA5A1207F9870067ED5B /* LongRunningTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */; - buildPhases = ( - A9BDFA5D1207F9870067ED5B /* Resources */, - A9BDFA5E1207F9870067ED5B /* Sources */, - A9BDFA611207F9870067ED5B /* Frameworks */, - A9BDFA641207F9870067ED5B /* ShellScript */, - A9BDFA651207F9870067ED5B /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */, - ); - name = LongRunningTests; - productName = Tests; - productReference = A9BDFA6B1207F9870067ED5B /* Tests.octest */; - productType = "com.apple.product-type.bundle"; - }; - A9C2819511C43C4900803CB5 /* Tests */ = { - isa = PBXNativeTarget; - buildConfigurationList = A9C2819A11C43C4900803CB5 /* Build configuration list for PBXNativeTarget "Tests" */; - buildPhases = ( - A9C2819111C43C4900803CB5 /* Resources */, - A9C2819211C43C4900803CB5 /* Sources */, - A9C2819311C43C4900803CB5 /* Frameworks */, - A9C2819411C43C4900803CB5 /* ShellScript */, - A9C281B611C43DB800803CB5 /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - A964657B11C662CA00640FAC /* PBXTargetDependency */, - ); - name = Tests; - productName = Tests; - productReference = A9C2819611C43C4900803CB5 /* Tests.octest */; - productType = "com.apple.product-type.bundle"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 0867D690FE84028FC02AAC07 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */; - compatibilityVersion = "Xcode 3.1"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = 0867D691FE84028FC02AAC07 /* ObjCSword */; - productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8DC2EF4F0486A6940098B216 /* ObjCSword */, - A9C2819511C43C4900803CB5 /* Tests */, - A9BDFA5A1207F9870067ED5B /* LongRunningTests */, - A975EED811C792B9007C1532 /* mod2osis */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8DC2EF520486A6940098B216 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */, - A9D4382311C52947007AFE83 /* locales.d in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9BDFA5D1207F9870067ED5B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9C2819111C43C4900803CB5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - A9BDFA641207F9870067ED5B /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; - }; - A9C2819411C43C4900803CB5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8DC2EF540486A6940098B216 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */, - A94EAC0E117B28920018B06F /* SwordBibleBook.mm in Sources */, - A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */, - A94EAC12117B28920018B06F /* SwordBibleTextEntry.m in Sources */, - A94EAC14117B28920018B06F /* SwordBook.mm in Sources */, - A94EAC16117B28920018B06F /* SwordCommentary.mm in Sources */, - A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */, - A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */, - A94EAC1C117B28920018B06F /* SwordInstallSourceController.mm in Sources */, - A94EAC1E117B28920018B06F /* SwordKey.mm in Sources */, - A94EAC20117B28920018B06F /* SwordListKey.mm in Sources */, - A94EAC22117B28920018B06F /* SwordManager.mm in Sources */, - A94EAC26117B28920018B06F /* SwordModule.mm in Sources */, - A94EAC28117B28920018B06F /* SwordModuleTextEntry.m in Sources */, - A94EAC2A117B28920018B06F /* SwordModuleTreeEntry.m in Sources */, - A94EAC2E117B28920018B06F /* SwordVerseKey.mm in Sources */, - A94EAC30117B28920018B06F /* SwordVerseManager.mm in Sources */, - A94EAC32117B28920018B06F /* VerseEnumerator.mm in Sources */, - A9C2857411C4471400803CB5 /* OSXConfiguration.m in Sources */, - A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */, - A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */, - A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A975EED611C792B9007C1532 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A975EEE511C79308007C1532 /* mod2osis.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9BDFA5E1207F9870067ED5B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9C2819211C43C4900803CB5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A96465A511C6657900640FAC /* SwordManagerTest.m in Sources */, - A918B8E511C6697400024D84 /* SwordModuleTest.m in Sources */, - A9BDFA791207F9F00067ED5B /* SwordListKeyTest.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - A964657B11C662CA00640FAC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8DC2EF4F0486A6940098B216 /* ObjCSword */; - targetProxy = A964657A11C662CA00640FAC /* PBXContainerItemProxy */; - }; - A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8DC2EF4F0486A6940098B216 /* ObjCSword */; - targetProxy = A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 089C1666FE841158C02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 089C1667FE841158C02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = "<group>"; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 1DEB91AE08733DA50010E9CD /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", - ); - FRAMEWORK_VERSION = A; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_ENABLE_OBJC_GC = required; - GCC_ENABLE_SYMBOL_SEPARATION = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ObjCSword_Prefix.pch; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "../../include/**"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "@rpath"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/build_sword/build/result_inst/lib\"", - "\"$(SRCROOT)/build_clucene/build/result_inst/lib\"", - ); - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = "-DDEBUG"; - OTHER_LDFLAGS = ( - "-lcurl", - "-lz", - "-licucore", - ); - PRODUCT_NAME = ObjCSword; - SDKROOT = macosx10.5; - WARNING_CFLAGS = "-Wall"; - WRAPPER_EXTENSION = framework; - }; - name = Debug; - }; - 1DEB91AF08733DA50010E9CD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - ppc, - "$(ARCHS_STANDARD_32_64_BIT)", - ); - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", - ); - FRAMEWORK_VERSION = A; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_GC = required; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ObjCSword_Prefix.pch; - HEADER_SEARCH_PATHS = "../../include/**"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "@rpath"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/build_sword/build/result_inst/lib\"", - "\"$(SRCROOT)/build_clucene/build/result_inst/lib\"", - ); - MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_CFLAGS = "-DRELEASE"; - OTHER_LDFLAGS = ( - "-lcurl", - "-lz", - "-licucore", - ); - PRODUCT_NAME = ObjCSword; - SDKROOT = macosx10.5; - WARNING_CFLAGS = "-Wall"; - WRAPPER_EXTENSION = framework; - }; - name = Release; - }; - 1DEB91B208733DA50010E9CD /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; - }; - name = Debug; - }; - 1DEB91B308733DA50010E9CD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; - }; - name = Release; - }; - A975EEDE11C792BA007C1532 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - HEADER_SEARCH_PATHS = "../../include/**"; - INSTALL_PATH = /usr/local/bin; - LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - PREBINDING = NO; - PRODUCT_NAME = mod2osis; - SDKROOT = macosx10.5; - STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; - }; - name = Debug; - }; - A975EEDF11C792BA007C1532 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - HEADER_SEARCH_PATHS = "../../include/**"; - INSTALL_PATH = /usr/local/bin; - LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - PREBINDING = NO; - PRODUCT_NAME = mod2osis; - SDKROOT = macosx10.5; - STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; - ZERO_LINK = NO; - }; - name = Release; - }; - A9BDFA691207F9870067ED5B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "Tests-Info copy.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, - ); - PREBINDING = NO; - PRODUCT_NAME = Tests; - SDKROOT = macosx10.5; - WRAPPER_EXTENSION = octest; - }; - name = Debug; - }; - A9BDFA6A1207F9870067ED5B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "Tests-Info copy.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, - ); - PREBINDING = NO; - PRODUCT_NAME = Tests; - SDKROOT = macosx10.5; - WRAPPER_EXTENSION = octest; - ZERO_LINK = NO; - }; - name = Release; - }; - A9C2819811C43C4900803CB5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, - ); - PREBINDING = NO; - PRODUCT_NAME = Tests; - SDKROOT = macosx10.5; - WRAPPER_EXTENSION = octest; - }; - name = Debug; - }; - A9C2819911C43C4900803CB5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, - ); - PREBINDING = NO; - PRODUCT_NAME = Tests; - SDKROOT = macosx10.5; - WRAPPER_EXTENSION = octest; - ZERO_LINK = NO; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1DEB91AE08733DA50010E9CD /* Debug */, - 1DEB91AF08733DA50010E9CD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1DEB91B208733DA50010E9CD /* Debug */, - 1DEB91B308733DA50010E9CD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - A975EEDE11C792BA007C1532 /* Debug */, - A975EEDF11C792BA007C1532 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - A9BDFA691207F9870067ED5B /* Debug */, - A9BDFA6A1207F9870067ED5B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - A9C2819A11C43C4900803CB5 /* Build configuration list for PBXNativeTarget "Tests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - A9C2819811C43C4900803CB5 /* Debug */, - A9C2819911C43C4900803CB5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 0867D690FE84028FC02AAC07 /* Project object */; -} diff --git a/bindings/objc/README b/bindings/objc/README deleted file mode 100644 index 8d1b5ed..0000000 --- a/bindings/objc/README +++ /dev/null @@ -1,27 +0,0 @@ -Building ObjCSword wrapper framework howto (>= Mac OSX Lion (10.7) -=================================================================== -Open Xcode Project (ObjCSword.xcodeproj) and build. - - -Building ObjCSword wrapper framework howto (pre Mac OSX Lion (10.7) -=================================================================== - -Mac OS X target: -The framework for Mac OS X relies on a manually, via makefile compiled SWORD library. -The Xcode project also includes a target which builds the SWORD library but the result of this library does not work properly on PPC aritectures. Therefore the library has to be build manually. -But don't worry, this process it relatively easy. - -1. build CLucene dependency -cd to the "build_clucene" folder and type "make release-fat". -This will compile clucene binaries for PPC, i686 and x86_64 and a universal binary will be created which is used in the Xcode project. - -2. build SWORD library -cd to "build_sword" folder and type "make release-fat". -This will similarly as for CLucene build binaries for PPC, i686 and x86_64 including a resulting universal binary that is used in the Xcode project. - -1. and 2. only need to be done if you are starting from a fresh SVN checkout. -2. only needs to be repeated if the SWORD sources are changed. - -3. open the Xcode project and create ObjCSword framework. - - diff --git a/bindings/objc/SWORDTests/Info.plist b/bindings/objc/SWORDTests/Info.plist new file mode 100644 index 0000000..6c40a6c --- /dev/null +++ b/bindings/objc/SWORDTests/Info.plist @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>$(DEVELOPMENT_LANGUAGE)</string> + <key>CFBundleExecutable</key> + <string>$(EXECUTABLE_NAME)</string> + <key>CFBundleIdentifier</key> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>$(PRODUCT_NAME)</string> + <key>CFBundlePackageType</key> + <string>BNDL</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CFBundleVersion</key> + <string>1</string> +</dict> +</plist> diff --git a/bindings/objc/SWORDTests/SWORDTests.m b/bindings/objc/SWORDTests/SWORDTests.m new file mode 100644 index 0000000..130e6ae --- /dev/null +++ b/bindings/objc/SWORDTests/SWORDTests.m @@ -0,0 +1,38 @@ +// +// SWORDTests.m +// SWORDTests +// +// Created by scribe on 11/8/17. +// + +#import <XCTest/XCTest.h> + +@interface SWORDTests : XCTestCase + +@end + +@implementation SWORDTests + +- (void)setUp { + [super setUp]; + // Put setup code here. This method is called before the invocation of each test method in the class. +} + +- (void)tearDown { + // Put teardown code here. This method is called after the invocation of each test method in the class. + [super tearDown]; +} + +- (void)testExample { + // This is an example of a functional test case. + // Use XCTAssert and related functions to verify your tests produce the correct results. +} + +- (void)testPerformanceExample { + // This is an example of a performance test case. + [self measureBlock:^{ + // Put the code you want to measure the time of here. + }]; +} + +@end diff --git a/bindings/objc/TestResources/TestModules/populate.sh b/bindings/objc/TestResources/TestModules/populate.sh new file mode 100755 index 0000000..1ee531b --- /dev/null +++ b/bindings/objc/TestResources/TestModules/populate.sh @@ -0,0 +1,2 @@ +#!/bin/sh +wget "http://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJV.zip" -O KJV.zip && unzip KJV.zip && rm KJV.zip diff --git a/bindings/objc/build_clucene/Makefile b/bindings/objc/build_clucene/Makefile deleted file mode 100644 index e75feb9..0000000 --- a/bindings/objc/build_clucene/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -.PHONY: default release-ppc release-intel release-fat debug-ppc debug-intel debug-fat clean - -default: release-fat - -release-ppc: - ./build_mac_clucene.sh release ppc - -release-intel: - ./build_mac_clucene.sh release intel - -release-fat: - ./build_mac_clucene.sh release fat - -debug-ppc: - ./build_mac_clucene.sh debug ppc - -debug-intel: - ./build_mac_clucene.sh debug intel - -debug-fat: - ./build_mac_clucene.sh debug fat - -clean: - rm -rf build - diff --git a/bindings/objc/build_clucene/build_mac_clucene.sh b/bindings/objc/build_clucene/build_mac_clucene.sh deleted file mode 100755 index 9ff2169..0000000 --- a/bindings/objc/build_clucene/build_mac_clucene.sh +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/sh -e -# script by Manfred Bergmann in 2006, updated in 2010 -# - -APP=clucene -COMP=core -VERS=0.9.21b -BDIR=`pwd` - -SRCPACKAGE="$APP-$COMP-$VERS.tar.gz" - -DEBUG=0 -FAT=0 -PPC=0 -INTEL=0 - -# check commandline -for arg in "$@" -do - if [ "$arg" = "debug" ]; then - DEBUG=1 - echo "building debug version" - fi - if [ "$arg" = "fat" ]; then - FAT=1 - PPC=1 - INTEL=1 - echo "building fat version" - fi - if [ "$arg" = "ppc" ]; then - PPC=1 - echo "building ppc version" - else - PPC=0 - fi - if [ "$arg" = "intel" ]; then - INTEL=1 - echo "building intel version" - else - INTEL=0 - fi -done - -# using seperate build dirs and building in them doesn't work with sword -BUILD=$BDIR/build -PPCPREFIX=$BUILD/ppc_inst -INTELPREFIX=$BUILD/intel_inst -INTEL64PREFIX=$BUILD/intel64_inst -RESULTPREFIX=$BUILD/result_inst - -# Create install dirs if they doesn't exist -if [ ! -d $BUILD ]; then - mkdir -p $BUILD -fi -if [ ! -d $PPCPREFIX ]; then - mkdir -p $PPCPREFIX -fi -if [ ! -d $INTELPREFIX ]; then - mkdir -p $INTELPREFIX -fi -if [ ! -d $INTEL64PREFIX ]; then - mkdir -p $INTEL64PREFIX -fi -if [ ! -d $RESULTPREFIX ]; then - mkdir -p $RESULTPREFIX - if [ ! -d $RESULTPREFIX/lib ]; then - mkdir -p $RESULTPREFIX/lib - fi -fi - -# delete old source dir -/bin/rm -rf $SRCPACKAGE - -# download first is not exist -# due to size limitation in the source repo this file wil be downloaded -# and buiding will need an internet connection -if [ ! -f $SRCPACKAGE ]; then - curl -o $SRCPACKAGE http://www.crosswire.org/~mbergmann/$SRCPACKAGE -fi -# ungzip src -tar -xzf $SRCPACKAGE - -CLUCENEPATH="$BDIR/$APP-$COMP-$VERS" - -# build stuff -if [ $PPC -eq 1 ] || [ $FAT -eq 1 ]; then - echo "building PPC version of library..." - cd $CLUCENEPATH - export CC=gcc - export CXX=g++ - export SDK=/Developer/SDKs/MacOSX10.5.sdk - if [ $DEBUG -eq 1 ]; then - export CFLAGS="-O0 -g -arch ppc -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include" - else - export CFLAGS="-O2 -g0 -arch ppc -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include" - fi - export CXXFLAGS="$CFLAGS" - export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK" - ./configure --prefix=$PPCPREFIX - make install - make clean - cd $BDIR - # copy to result dir - PPC_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-ppc.a" - cp $PPCPREFIX/lib/lib$APP.a $PPC_LIB_EXPORT - echo "building PPC version of library...done" -fi - -if [ $INTEL -eq 1 ] || [ $FAT -eq 1 ]; then - echo "building INTEL version of library..." - cd $CLUCENEPATH - export CC=gcc - export CXX=g++ - export SDK=/Developer/SDKs/MacOSX10.5.sdk - if [ $DEBUG -eq 1 ]; then - export CFLAGS="-O0 -g -arch i686 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" - else - export CFLAGS="-O2 -g0 -arch i686 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" - fi - export CXXFLAGS="$CFLAGS" - export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK" - ./configure --prefix=$INTELPREFIX - make install - make clean - cd $BDIR - # copy to result dir - INTEL_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-intel.a" - cp $INTELPREFIX/lib/lib$APP.a $INTEL_LIB_EXPORT - echo "building INTEL version of library...done" - - echo "building INTEL64 version of library..." - cd $CLUCENEPATH - export CC=gcc - export CXX=g++ - export SDK=/Developer/SDKs/MacOSX10.5.sdk - if [ $DEBUG -eq 1 ]; then - export CFLAGS="-O0 -g -arch x86_64 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include" - else - export CFLAGS="-O2 -g0 -arch x86_64 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include" - fi - export CXXFLAGS="$CFLAGS" - export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK" - ./configure --prefix=$INTEL64PREFIX - make install - make clean - cd $BDIR - # copy to result dir - INTEL64_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-intel64.a" - cp $INTEL64PREFIX/lib/lib$APP.a $INTEL64_LIB_EXPORT - echo "building INTEL64 version of library...done" -fi - -# only for fat version -if [ $FAT -eq 1 ]; then - # creating result - # build fat binary with lipo - lipo -create $PPC_LIB_EXPORT $INTEL_LIB_EXPORT $INTEL64_LIB_EXPORT -output $RESULTPREFIX/lib/lib$APP-ub.a -fi diff --git a/bindings/objc/build_sword/build_mac_sword.sh b/bindings/objc/build_sword/build_mac_sword.sh deleted file mode 100755 index 77cfff9..0000000 --- a/bindings/objc/build_sword/build_mac_sword.sh +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/sh -e -# script by Manfred Bergmann in 2006, updated in 2010 -# - -APP=sword -VERS=1.6.2 -BDIR=`pwd` - -SWORDPATH="$BDIR/../../../" -ICUPATH="$BDIR/../dependencies/icu" -PPCCLUCENEPATH="$BDIR/../build_clucene/build/ppc_inst" -INTELCLUCENEPATH="$BDIR/../build_clucene/build/intel_inst" -INTEL64CLUCENEPATH="$BDIR/../build_clucene/build/intel64_inst" - -usage() { -cat << EOF -usage: $0 options - -OPTIONS: - -d Buildtype debug version - -a Architecture [intel|intel64|ppc|fat] - -b Buildpath, default = "build" - -c With clucene - -s Path to SDK i.e. "/Developer/SDKs/MacOSX10.5.sdk" - -t Deplyoment target i.e. "10.5" -EOF -} - -DEBUG=0 -FAT=0 -PPC=0 -INTEL=0 -INTEL64=0 -USECLUCENE=0 -BUILDDIR=build -SDKDIR=/Developer/SDKs/MacOSX10.5.sdk -DTARGET=10.5 - -while getopts “da:b:s:t:c?” OPTION -do - case $OPTION in - d) - DEBUG=1 - echo "building debug version" - ;; - a) - if [ "$OPTARG" = "fat" ]; then - FAT=1 - PPC=1 - INTEL=1 - INTEL64=1 - echo "building fat version" - fi - if [ "$OPTARG" = "ppc" ]; then - PPC=1 - echo "building ppc version" - fi - if [ "$OPTARG" = "intel" ]; then - INTEL=1 - echo "building intel version" - fi - if [ "$OPTARG" = "intel64" ]; then - INTEL64=1 - echo "building intel64 version" - fi - ;; - b) - BUILDDIR="$OPTARG" - echo "using builddir $BUILDDIR" - ;; - s) - SDKDIR="$OPTARG" - echo "using SDK at $SDKDIR" - ;; - t) - DTARGET="$OPTARG" - echo "using deployment target $DTARGET" - ;; - c) - USECLUCENE=1 - echo "building with clucene" - ;; - ?) - usage - exit - ;; - esac -done - -# using seperate build dirs and building in them doesn't work with sword -BUILD=$BDIR/"$BUILDDIR" -PPCPREFIX=$BUILD/ppc_inst -INTELPREFIX=$BUILD/intel_inst -INTEL64PREFIX=$BUILD/intel64_inst -RESULTPREFIX=$BUILD/result_inst - -# Create install dirs if they doesn't exist -if [ ! -d $BUILD ]; then - mkdir -p $BUILD -fi -if [ ! -d $PPCPREFIX ]; then - mkdir -p $PPCPREFIX -fi -if [ ! -d $INTELPREFIX ]; then - mkdir -p $INTELPREFIX -fi -if [ ! -d $INTEL64PREFIX ]; then - mkdir -p $INTEL64PREFIX -fi -if [ ! -d $RESULTPREFIX ]; then - mkdir -p $RESULTPREFIX - if [ ! -d $RESULTPREFIX/lib ]; then - mkdir -p $RESULTPREFIX/lib - fi -fi - -# add icu tools to path -export PATH="$PATH:$ICUPATH/bin" -export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$ICUPATH/lib" - -PPC_LIB_EXPORT= -INTEL_LIB_EXPORT= -INTEL64_LIB_EXPORT= - -# build stuff -if [ $PPC -eq 1 ] || [ $FAT -eq 1 ]; then - echo "building PPC version of library..." - cd $SWORDPATH - echo 'autogen.sh ...' - ./autogen.sh - echo 'autogen.sh ... done' - export CC=gcc - export CXX=g++ - export SDK=$SDKDIR - if [ $DEBUG -eq 1 ]; then - export CFLAGS="-O0 -g -arch ppc -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" - else - export CFLAGS="-O2 -g0 -arch ppc -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" - fi - export CXXFLAGS="$CFLAGS" - export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK" - if [ $USECLUCENE -eq 1 ]; then - ./configure --prefix=$PPCPREFIX --with-clucene=$PPCCLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --disable-tests --disable-shared - else - ./configure --prefix=$PPCPREFIX --without-clucene --with-zlib --with-conf --with-icu --with-curl --disable-tests --disable-shared --enable-utilities - fi - make all install - make clean - cd $BDIR - # copy to result dir - PPC_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-ppc.a" - cp $PPCPREFIX/lib/lib$APP.a $PPC_LIB_EXPORT - echo "building PPC version of library...done" -fi - -if [ $INTEL -eq 1 ] || [ $FAT -eq 1 ]; then - echo "building INTEL version of library..." - cd $SWORDPATH - echo 'autogen.sh ...' - ./autogen.sh - echo 'autogen.sh ... done' - export CC=gcc - export CXX=g++ - export SDK=$SDKDIR - if [ $DEBUG -eq 1 ]; then - export CFLAGS="-O0 -g -arch i686 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" - else - export CFLAGS="-O2 -g0 -arch i686 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" - fi - export CXXFLAGS="$CFLAGS" - export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK" - if [ $USECLUCENE -eq 1 ]; then - ./configure --prefix=$INTELPREFIX --with-clucene=$INTELCLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared - else - ./configure --prefix=$INTELPREFIX --without-clucene --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared --enable-utilities - fi - make all install - make clean - cd $BDIR - # copy to result dir - INTEL_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-intel.a" - cp $INTELPREFIX/lib/lib$APP.a $INTEL_LIB_EXPORT - echo "building INTEL version of library...done" -fi - -if [ $INTEL64 -eq 1 ] || [ $FAT -eq 1 ]; then - echo "building INTEL64 version of library..." - cd $SWORDPATH - echo 'autogen.sh ...' - ./autogen.sh - echo 'autogen.sh ... done' - export CC=gcc - export CXX=g++ - export SDK=$SDKDIR - if [ $DEBUG -eq 1 ]; then - export CFLAGS="-O0 -g -arch x86_64 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" - else - export CFLAGS="-O2 -g0 -arch x86_64 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" - fi - export CXXFLAGS="$CFLAGS" - export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK" - if [ $USECLUCENE -eq 1 ]; then - ./configure --prefix=$INTEL64PREFIX --with-clucene=$INTEL64CLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared - else - ./configure --prefix=$INTEL64PREFIX --without-clucene --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared --enable-utilities - fi - make all install - make clean - cd $BDIR - # copy to result dir - INTEL64_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-intel64.a" - cp $INTEL64PREFIX/lib/lib$APP.a $INTEL64_LIB_EXPORT - echo "building INTEL64 version of library...done" -fi - -# only for fat version -if [ $FAT -eq 1 ]; then - # creating result - # build fat binary with lipo - lipo -create $PPC_LIB_EXPORT $INTEL_LIB_EXPORT $INTEL64_LIB_EXPORT -output $RESULTPREFIX/lib/lib$APP-ub.a -fi - - -# run runlib to update the library content -#ranlib $RESULTPREFIX/lib/* diff --git a/bindings/objc/build_sword/build_ub_mac_swordutils.sh b/bindings/objc/build_sword/build_ub_mac_swordutils.sh deleted file mode 100755 index 55c21f7..0000000 --- a/bindings/objc/build_sword/build_ub_mac_swordutils.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -e -# script by Manfred Bergmann in 2006 -# - -# dependencies for this script are: -# that "build_mac_sword.sh" has been executed in "fat" mode and -# successfully created a "build_tools" folder with directories: "ppc_inst" and "intel_inst" - -# first build library -./build_mac_sword.sh -a fat -b build_tools - -BDIR=. -SWORDBUILD=$BDIR/build_tools -PPCPREFIX=$SWORDBUILD/ppc_inst -INTELPREFIX=$SWORDBUILD/intel_inst -RESULTPREFIX=$SWORDBUILD/result_inst - -# Create install dirs if they doesn't exist -if [ ! -d $SWORDBUILD ]; then - echo "build folder doesn't exist!\n" - exit 1 -fi -if [ ! -d $PPCPREFIX ]; then - echo "ppc installation folder doesn't exist!\n" - exit 1 -fi -if [ ! -d $INTELPREFIX ]; then - echo "intel installation folder doesn't exist!\n" - exit 1 -fi -if [ ! -d $RESULTPREFIX ]; then - echo "result(fat) installation folder doesn't exist!\n" - exit 1 -fi - -BINDESTINATION=$RESULTPREFIX/bin -if [ -d $BINDESTINATION ]; then - rm -r $BINDESTINATION -fi -mkdir $BINDESTINATION - -function callLipo { - lipo -create $INTELPREFIX/bin/$1 $PPCPREFIX/bin/$1 -output $BINDESTINATION/$1 -} - -callLipo imp2gbs -callLipo imp2ld -callLipo imp2vs -callLipo installmgr -callLipo mod2imp -callLipo mod2osis -callLipo mod2vpl -callLipo mod2zmod -callLipo osis2mod -callLipo tei2mod -callLipo vpl2mod -callLipo vs2osisref -callLipo vs2osisreftxt -callLipo xml2gbs diff --git a/bindings/objc/build_sword/readme.txt b/bindings/objc/build_sword/readme.txt deleted file mode 100644 index f20e49e..0000000 --- a/bindings/objc/build_sword/readme.txt +++ /dev/null @@ -1,9 +0,0 @@ -Building sword library for Eloquent: - -- make a symlink for libtoolize: -ln -s /usr/bin/glibtoolize /usr/bin/libtoolize - -- build the library as it is a dependency for the Xcode project: -./build_mac_sword.sh -a fat -c -(check -? for possible options). - diff --git a/bindings/objc/dependencies/Makefile b/bindings/objc/dependencies/Makefile new file mode 100644 index 0000000..94b5ba4 --- /dev/null +++ b/bindings/objc/dependencies/Makefile @@ -0,0 +1,39 @@ +LIBCURLVERSION=7.57.0 +ICUVERSION=53.1 +CLUCENEVERSION=9.21b + +all: curl/unpacked icu/unpacked clucene/unpacked + +clean: curlclean icuclean cluceneclean + +libcurl_src.tar.gz: + wget http://crosswire.org/ftpmirror/pub/sword/dependencies/apple/libcurl-${LIBCURLVERSION}/libcurl_src.tar.gz + +clucene_src.tar.gz: + wget http://crosswire.org/ftpmirror/pub/sword/dependencies/apple/clucene-${CLUCENEVERSION}/clucene_src.tar.gz + +icu_src.tar.gz: + wget http://crosswire.org/ftpmirror/pub/sword/dependencies/apple/icu-${ICUVERSION}/icu_src.tar.gz + + +curl/unpacked: libcurl_src.tar.gz + tar xjfv libcurl_src.tar.gz + touch curl/unpacked + +icu/unpacked: icu_src.tar.gz + tar xzfv icu_src.tar.gz + touch icu/unpacked + +clucene/unpacked: clucene_src.tar.gz + tar xzfv clucene_src.tar.gz + touch clucene/unpacked + +curlclean: + rm -rf libcurl* curl + +icuclean: + rm -rf icu* + +cluceneclean: + rm -rf clucene* + diff --git a/bindings/objc/dependencies/readme.txt b/bindings/objc/dependencies/readme.txt new file mode 100644 index 0000000..446403d --- /dev/null +++ b/bindings/objc/dependencies/readme.txt @@ -0,0 +1,4 @@ +These dependencies have been moved from version control to downloads from crosswire.org/ftpmirror/pub/sword/dependencies/apple. The included Makefile in this folder should get and expand these for you. It should... + +Unpack clucene, libcurl, and icu source packages so that you end up with folders "clucene", "curl", and "icu" within dependencies. + diff --git a/bindings/objc/dependencies/retrieve.sh b/bindings/objc/dependencies/retrieve.sh deleted file mode 100755 index 547a9fe..0000000 --- a/bindings/objc/dependencies/retrieve.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# this script downloads icu dependencies and unpacks them -# ICU is needed for building SWORD - -curl -o icu_build-ub.tar.gz http://www.crosswire.org/~mbergmann/icu_build-ub.tar.gz -tar -xzf icu_build-ub.tar.gz - -curl -o clucene_src.tar.gz http://www.crosswire.org/~mbergmann/clucene_src.tar.gz -tar -xzf clucene_src.tar.gz - -cd icu/lib -ln -s libicudata.dylib libicudata.dylib.36 -ln -s libicui18n.dylib libicui18n.dylib.36 -ln -s libicuio.dylib libicuio.dylib.36 -ln -s libicule.dylib libicule.dylib.36 -ln -s libiculx.dylib libiculx.dylib.36 -ln -s libicutu.dylib libicutu.dylib.36 -ln -s libicuuc.dylib libicuuc.dylib.36 diff --git a/bindings/objc/dependencies/retrieve_iOS.sh b/bindings/objc/dependencies/retrieve_iOS.sh deleted file mode 100755 index 4415a3b..0000000 --- a/bindings/objc/dependencies/retrieve_iOS.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# this script downloads dependencies for iOS project - -curl -o libcurl_build.tar.gz http://www.crosswire.org/~mbergmann/libcurl_build.tar.gz -tar -xzf libcurl_build.tar.gz diff --git a/bindings/objc/src/DefaultFilterProvider.h b/bindings/objc/src/DefaultFilterProvider.h index 435daa0..7484212 100644 --- a/bindings/objc/src/DefaultFilterProvider.h +++ b/bindings/objc/src/DefaultFilterProvider.h @@ -18,7 +18,6 @@ - (SwordFilter *)newThmlPlainFilter; - (SwordFilter *)newTeiRenderFilter; - (SwordFilter *)newTeiPlainFilter; -- (SwordFilter *)newHtmlPlainFilter; @end @@ -32,6 +31,5 @@ - (SwordFilter *)newThmlPlainFilter; - (SwordFilter *)newTeiRenderFilter; - (SwordFilter *)newTeiPlainFilter; -- (SwordFilter *)newHtmlPlainFilter; @end diff --git a/bindings/objc/src/DefaultFilterProvider.mm b/bindings/objc/src/DefaultFilterProvider.mm index 65d8c0a..aaae02c 100644 --- a/bindings/objc/src/DefaultFilterProvider.mm +++ b/bindings/objc/src/DefaultFilterProvider.mm @@ -5,11 +5,11 @@ #import "DefaultFilterProvider.h" -#import "SwordFilter.h" @implementation DefaultFilterProvider - (SwordFilter *)newOsisRenderFilter { +// return [SwordOsisXHtmlFilter filter]; return [SwordOsisHtmlRefFilter filter]; } diff --git a/bindings/objc/src/FilterProviderFactory.mm b/bindings/objc/src/FilterProviderFactory.mm index 75abc68..6da290c 100644 --- a/bindings/objc/src/FilterProviderFactory.mm +++ b/bindings/objc/src/FilterProviderFactory.mm @@ -9,7 +9,7 @@ @interface FilterProviderFactory () -@property(nonatomic, retain) id <FilterProvider> filterProvider; +@property(nonatomic, strong) id <FilterProvider> filterProvider; @end @@ -33,10 +33,6 @@ return self.filterProvider; } -- (void)dealloc { - self.filterProvider = nil; - [super dealloc]; -} @end
\ No newline at end of file diff --git a/bindings/objc/src/Notifications.h b/bindings/objc/src/Notifications.h index 3972646..556c1fd 100644 --- a/bindings/objc/src/Notifications.h +++ b/bindings/objc/src/Notifications.h @@ -8,9 +8,3 @@ */ // Notification identifiers - -/** -\brief this notification is send, when the modules have changed (updated, added, removed) - */ -#define NotificationModulesChanged @"NotificationModulesChanged" -#define SendNotifyModulesChanged(X) [[NSNotificationCenter defaultCenter] postNotificationName:NotificationModulesChanged object:X]; diff --git a/bindings/objc/src/SwordBible.h b/bindings/objc/src/SwordBible.h index f57d322..ce8a926 100644 --- a/bindings/objc/src/SwordBible.h +++ b/bindings/objc/src/SwordBible.h @@ -26,10 +26,10 @@ typedef enum { }Testament; @interface SwordBible : SwordModule { - NSMutableDictionary *books; + NSDictionary *_books; } -@property (retain, readwrite) NSMutableDictionary *books; +@property (strong, readwrite) NSDictionary *books; // ----------- class methods ------------- + (void)decodeRef:(NSString *)ref intoBook:(NSString **)bookName book:(int *)book chapter:(int *)chapter verse:(int *)verse; @@ -47,11 +47,12 @@ typedef enum { - (NSArray *)bookList; - (NSString *)bookIntroductionFor:(SwordBibleBook *)aBook; -- (NSString *)chapterIntroductionFor:(SwordBibleBook *)aBook chapter:(int)chapter; +- (NSString *)chapterIntroductionIn:(SwordBibleBook *)aBook forChapter:(int)chapter; - (NSString *)moduleIntroduction; // some numbers -- (SwordBibleBook *)bookForLocalizedName:(NSString *)bookName; +- (SwordBibleBook *)bookWithNamePrefix:(NSString *)aPrefix; +- (SwordBibleBook *)bookForName:(NSString *)bookName; - (int)chaptersForBookName:(NSString *)bookName; - (int)versesForChapter:(int)chapter bookName:(NSString *)bookName; - (int)versesForBible; diff --git a/bindings/objc/src/SwordBible.mm b/bindings/objc/src/SwordBible.mm index 03e378e..7b78af5 100644 --- a/bindings/objc/src/SwordBible.mm +++ b/bindings/objc/src/SwordBible.mm @@ -19,7 +19,7 @@ using sword::AttributeValue; @interface SwordBible () -- (void)buildBookList; +- (NSDictionary *)buildBookList; - (BOOL)containsBookNumber:(int)aBookNum; - (NSArray *)textEntriesForReference:(NSString *)aReference context:(int)context textType:(TextPullType)textType; @@ -78,14 +78,14 @@ NSLock *bibleLock = nil; //if abbr contains : or . then we are a verse so return a chapter if([abbr rangeOfString:@":"].location != NSNotFound || [abbr rangeOfString:@"."].location != NSNotFound) { - return [firstBits objectAtIndex:0]; + return firstBits[0]; } //otherwise return a book firstBits = [first componentsSeparatedByString:@" "]; if([firstBits count] > 0) { - return [firstBits objectAtIndex:0]; + return firstBits[0]; } return abbr; @@ -96,22 +96,13 @@ NSLock *bibleLock = nil; that is: book number + testament * 100 */ + (int)bookIndexForSWKey:(sword::VerseKey *)key { - return key->Book() + key->Testament() * 100; + return key->getBookMax() + key->getTestamentMax() * 100; } #pragma mark - Initializers -- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager { - self = [super initWithName:aName swordManager:aManager]; - if(self) { - [self setBooks:nil]; - } - - return self; -} - - (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager { - self = [super initWithSWModule:aModule swordManager:aManager]; + self = [super initWithSWModule:aModule]; if(self) { [self setBooks:nil]; } @@ -119,20 +110,11 @@ NSLock *bibleLock = nil; return self; } -- (void)finalize { - [super finalize]; -} -- (void)dealloc { - [books release]; - [super dealloc]; -} #pragma mark - Bible information -- (void)buildBookList { - [moduleLock lock]; - +- (NSDictionary *)buildBookList { sword::VersificationMgr *vmgr = sword::VersificationMgr::getSystemVersificationMgr(); const sword::VersificationMgr::System *system = vmgr->getVersificationSystem([[self versification] UTF8String]); @@ -141,15 +123,13 @@ NSLock *bibleLock = nil; for(int i = 0;i < bookCount;i++) { sword::VersificationMgr::Book *book = (sword::VersificationMgr::Book *)system->getBook(i); - SwordBibleBook *bb = [[[SwordBibleBook alloc] initWithBook:book] autorelease]; + SwordBibleBook *bb = [[SwordBibleBook alloc] initWithBook:book]; [bb setNumber:i+1]; NSString *bookName = [bb name]; - [buf setObject:bb forKey:bookName]; + buf[bookName] = bb; } - self.books = buf; - - [moduleLock unlock]; + return [NSDictionary dictionaryWithDictionary:buf]; } - (BOOL)containsBookNumber:(int)aBookNum { @@ -161,17 +141,15 @@ NSLock *bibleLock = nil; return NO; } -- (NSMutableDictionary *)books { - if(books == nil) { - [self buildBookList]; +- (NSDictionary *)books { + if(_books == nil) { + _books = [self buildBookList]; } - return books; + return _books; } -- (void)setBooks:(NSMutableDictionary *)aBooks { - [aBooks retain]; - [books release]; - books = aBooks; +- (void)setBooks:(NSDictionary *)aBooks { + _books = aBooks; } - (NSArray *)bookList { @@ -181,15 +159,15 @@ NSLock *bibleLock = nil; } - (BOOL)hasReference:(NSString *)ref { - [moduleLock lock]; + [self.moduleLock lock]; - sword::VerseKey *key = (sword::VerseKey *)(swModule->CreateKey()); + sword::VerseKey *key = (sword::VerseKey *)(swModule->createKey()); (*key) = [ref UTF8String]; NSString *bookName = [NSString stringWithUTF8String:key->getBookName()]; - int chapter = key->Chapter(); - int verse = key->Verse(); + int chapter = key->getChapterMax(); + int verse = key->getVerseMax(); - SwordBibleBook *bb = [[self books] objectForKey:bookName]; + SwordBibleBook *bb = [self books][bookName]; if(bb) { if(chapter > 0 && chapter < [bb numberOfChapters]) { if(verse > 0 && verse < [bb numberOfVersesForChapter:chapter]) { @@ -198,7 +176,7 @@ NSLock *bibleLock = nil; } } - [moduleLock unlock]; + [self.moduleLock unlock]; return NO; } @@ -208,41 +186,29 @@ NSLock *bibleLock = nil; if(aReference && [aReference length] > 0) { sword::VerseKey vk; - sword::ListKey listKey = vk.ParseVerseList([aReference UTF8String], "Gen1", true); + sword::ListKey listKey = vk.parseVerseList([aReference UTF8String], "Gen1", true); // unfortunately there is no other way then loop though all verses to know how many - for(listKey = sword::TOP; !listKey.Error(); listKey++) ret++; + for(listKey = sword::TOP; !listKey.popError(); listKey++) ret++; } return ret; } - (int)chaptersForBookName:(NSString *)bookName { - [moduleLock lock]; - - int maxChapters; - sword::VerseKey *key = (sword::VerseKey *)swModule->CreateKey(); - (*key) = [bookName UTF8String]; - maxChapters = key->getChapterMax(); - delete key; - - [moduleLock unlock]; - - return maxChapters; + SwordBibleBook *book = [self bookForName:bookName]; + if(book != nil) { + return [book numberOfChapters]; + } + return -1; } - - (int)versesForChapter:(int)chapter bookName:(NSString *)bookName { int ret = -1; - [moduleLock lock]; - - SwordBibleBook *bb = [[self books] objectForKey:bookName]; + SwordBibleBook *bb = [self books][bookName]; if(bb) { ret = [bb numberOfVersesForChapter:chapter]; } - - [moduleLock unlock]; - return ret; } @@ -261,9 +227,18 @@ NSLock *bibleLock = nil; return ret; } -- (SwordBibleBook *)bookForLocalizedName:(NSString *)bookName { +- (SwordBibleBook *)bookForName:(NSString *)bookName { for(SwordBibleBook *book in [[self books] allValues]) { - if([[book localizedName] isEqualToString:bookName]) { + if([[book localizedName] isEqualToString:bookName] || [[book name] isEqualToString:bookName]) { + return book; + } + } + return nil; +} + +- (SwordBibleBook *)bookWithNamePrefix:(NSString *)aPrefix { + for(SwordBibleBook *book in [[self books] allValues]) { + if([[book localizedName] hasPrefix:aPrefix] || [[book name] hasPrefix:aPrefix]) { return book; } } @@ -273,62 +248,69 @@ NSLock *bibleLock = nil; - (NSString *)moduleIntroduction { NSString *ret; + [self.moduleLock lock]; + // save key - SwordVerseKey *save = [(SwordVerseKey *)[self getKeyCopy] autorelease]; + SwordVerseKey *save = (SwordVerseKey *)[self getKeyCopy]; SwordVerseKey *key = [SwordVerseKey verseKeyWithVersification:[self versification]]; [key setHeadings:YES]; - [key setPosition:0]; + [key setTestament:0]; [self setSwordKey:key]; ret = [self renderedText]; // restore old key [self setSwordKey:save]; + [self.moduleLock unlock]; + return ret; } - (NSString *)bookIntroductionFor:(SwordBibleBook *)aBook { NSString *ret; + [self.moduleLock lock]; + // save key - SwordVerseKey *save = [(SwordVerseKey *)[self getKeyCopy] autorelease]; + SwordVerseKey *save = (SwordVerseKey *)[self getKeyCopy]; SwordVerseKey *key = [SwordVerseKey verseKeyWithVersification:[self versification]]; [key setHeadings:YES]; - [key setAutoNormalize:NO]; - [key setTestament:[aBook testament]]; - [key setBook:[aBook numberInTestament]]; - [key setChapter:0]; - [key setVerse:0]; + [key setTestament:(char) [aBook testament]]; + [key setBook:(char) [aBook numberInTestament]]; [self setSwordKey:key]; ret = [self renderedText]; // restore old key [self setSwordKey:save]; + [self.moduleLock unlock]; + return ret; } -- (NSString *)chapterIntroductionFor:(SwordBibleBook *)aBook chapter:(int)chapter { +- (NSString *)chapterIntroductionIn:(SwordBibleBook *)aBook forChapter:(int)chapter { NSString *ret; - + + [self.moduleLock lock]; + // save key - SwordVerseKey *save = [(SwordVerseKey *)[self getKeyCopy] autorelease]; + SwordVerseKey *save = (SwordVerseKey *)[self getKeyCopy]; SwordVerseKey *key = [SwordVerseKey verseKeyWithVersification:[self versification]]; [key setHeadings:YES]; - [key setAutoNormalize:NO]; - [key setTestament:[aBook testament]]; - [key setBook:[aBook numberInTestament]]; + [key setTestament:(char) [aBook testament]]; + [key setBook:(char) [aBook numberInTestament]]; [key setChapter:chapter]; - [key setVerse:0]; [self setSwordKey:key]; ret = [self renderedText]; // restore old key [self setSwordKey:save]; + [self.moduleLock unlock]; + return ret; } @@ -336,7 +318,7 @@ NSLock *bibleLock = nil; SwordBibleTextEntry *ret = nil; if(aKey) { - [moduleLock lock]; + [self.moduleLock lock]; [self setSwordKey:aKey]; if(![self error]) { NSString *txt; @@ -352,32 +334,32 @@ NSLock *bibleLock = nil; ALog(@"nil key"); } - if([swManager globalOption:SW_OPTION_HEADINGS] && [self hasFeature:SWMOD_FEATURE_HEADINGS]) { + if([self.swManager globalOption:SW_OPTION_HEADINGS] && [self hasFeature:SWMOD_FEATURE_HEADINGS]) { NSString *preverseHeading = [self entryAttributeValuePreverse]; if(preverseHeading && [preverseHeading length] > 0) { [ret setPreVerseHeading:preverseHeading]; } } } - [moduleLock unlock]; + [self.moduleLock unlock]; } return ret; } - (NSString *)versification { - NSString *versification = [configEntries objectForKey:SWMOD_CONFENTRY_VERSIFICATION]; + NSString *versification = self.configEntries[SWMOD_CONFENTRY_VERSIFICATION]; if(versification == nil) { versification = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_VERSIFICATION]; if(versification != nil) { - [configEntries setObject:versification forKey:SWMOD_CONFENTRY_VERSIFICATION]; + self.configEntries[SWMOD_CONFENTRY_VERSIFICATION] = versification; } } // if still nil, use KJV versification if(versification == nil) { versification = @"KJV"; - [configEntries setObject:versification forKey:SWMOD_CONFENTRY_VERSIFICATION]; + self.configEntries[SWMOD_CONFENTRY_VERSIFICATION] = versification; } return versification; @@ -386,7 +368,7 @@ NSLock *bibleLock = nil; #pragma mark - SwordModuleAccess - (SwordKey *)createKey { - sword::VerseKey *vk = (sword::VerseKey *)swModule->CreateKey(); + sword::VerseKey *vk = (sword::VerseKey *)swModule->createKey(); SwordVerseKey *newKey = [SwordVerseKey verseKeyWithSWVerseKey:vk makeCopy:YES]; delete vk; @@ -403,9 +385,9 @@ NSLock *bibleLock = nil; - (long)entryCount { swModule->setPosition(sword::TOP); - long verseLowIndex = swModule->Index(); + long verseLowIndex = swModule->getIndex(); swModule->setPosition(sword::BOTTOM); - long verseHighIndex = swModule->Index(); + long verseHighIndex = swModule->getIndex(); return verseHighIndex - verseLowIndex; } @@ -435,7 +417,6 @@ NSLock *bibleLock = nil; SwordListKey *lk = [SwordListKey listKeyWithRef:aReference v11n:[self versification]]; [lk setPosition:SWPOS_TOP]; - [lk setPersist:NO]; SwordVerseKey *vk = [SwordVerseKey verseKeyWithRef:[lk keyText] v11n:[self versification]]; while(![lk error]) { // set current key to vk @@ -466,16 +447,16 @@ NSLock *bibleLock = nil; - (void)writeEntry:(SwordModuleTextEntry *)anEntry { const char *data = [[anEntry text] UTF8String]; - int dLen = strlen(data); + size_t dLen = strlen(data); - [moduleLock lock]; + [self.moduleLock lock]; [self setKeyString:[anEntry key]]; if(![self error]) { swModule->setEntry(data, dLen); // save text to module at current position } else { ALog(@"error at positioning module!"); } - [moduleLock unlock]; + [self.moduleLock unlock]; } @end diff --git a/bindings/objc/src/SwordBibleBook.h b/bindings/objc/src/SwordBibleBook.h index af48bb4..9e77df9 100644 --- a/bindings/objc/src/SwordBibleBook.h +++ b/bindings/objc/src/SwordBibleBook.h @@ -8,11 +8,12 @@ #import <Foundation/Foundation.h> +@class SwordBibleChapter; + #ifdef __cplusplus #include <versificationmgr.h> #include <versekey.h> #include <localemgr.h> -class sword::VersificationMgr::Book; #endif @interface SwordBibleBook : NSObject { @@ -22,16 +23,16 @@ class sword::VersificationMgr::Book; NSString *localizedName; int number; - char numberInTestament; - char testament; + int numberInTestament; + int testament; NSArray *chapters; } @property (readwrite) int number; -@property (readwrite) char numberInTestament; -@property (readwrite) char testament; -@property (retain, readwrite) NSString *localizedName; -@property (retain, readwrite) NSArray *chapters; +@property (readwrite) int numberInTestament; +@property (readwrite) int testament; +@property (strong, readwrite) NSString *localizedName; +@property (strong, readwrite) NSArray *chapters; #ifdef __cplusplus - (id)initWithBook:(sword::VersificationMgr::Book *)aBook; diff --git a/bindings/objc/src/SwordBibleBook.mm b/bindings/objc/src/SwordBibleBook.mm index eeb956b..931963c 100644 --- a/bindings/objc/src/SwordBibleBook.mm +++ b/bindings/objc/src/SwordBibleBook.mm @@ -37,26 +37,30 @@ swBook = aBook; sword::VerseKey vk = sword::VerseKey(aBook->getOSISName()); - [self setTestament:vk.Testament()]; - [self setNumberInTestament:vk.Book()]; + [self setTestament:vk.getTestament()]; + [self setNumberInTestament:vk.getBook()]; // get system localeMgr to be able to translate the english bookName sword::LocaleMgr *lmgr = sword::LocaleMgr::getSystemLocaleMgr(); - self.localizedName = [NSString stringWithUTF8String:lmgr->translate(swBook->getLongName())]; + const char *translated = lmgr->translate(swBook->getLongName()); + self.localizedName = [NSString stringWithUTF8String:translated]; + + // in case we don't have ICU support this still works. + if(self.localizedName == nil) { + self.localizedName = [NSString stringWithCString:translated encoding:NSISOLatin1StringEncoding]; + } + if(self.localizedName == nil) { + DLog(@"Unable to get this bookname: %s", translated); + } } return self; } -- (void)finalize { - [super finalize]; -} - (void)dealloc { - [self setLocalizedName:nil]; [self setChapters:nil]; - - [super dealloc]; + [self setLocalizedName:nil]; } - (NSString *)name { @@ -76,8 +80,6 @@ } - (void)setChapters:(NSArray *)anArray { - [anArray retain]; - [chapters release]; chapters = anArray; } @@ -85,7 +87,7 @@ if(chapters == nil) { NSMutableArray *temp = [NSMutableArray array]; for(int i = 0;i < swBook->getChapterMax();i++) { - [temp addObject:[[[SwordBibleChapter alloc] initWithBook:self andChapter:i+1] autorelease]]; + [temp addObject:[[SwordBibleChapter alloc] initWithBook:self andChapter:i+1]]; } [self setChapters:[NSArray arrayWithArray:temp]]; } @@ -106,7 +108,7 @@ /** we implement this for sorting */ - (NSComparisonResult)compare:(SwordBibleBook *)b { - return [[NSNumber numberWithInt:number] compare:[NSNumber numberWithInt:[b number]]]; + return [@(number) compare:@([b number])]; } @end diff --git a/bindings/objc/src/SwordBibleChapter.h b/bindings/objc/src/SwordBibleChapter.h index 11e4cff..a8a27a9 100644 --- a/bindings/objc/src/SwordBibleChapter.h +++ b/bindings/objc/src/SwordBibleChapter.h @@ -12,12 +12,12 @@ @interface SwordBibleChapter : NSObject { /** the back reference */ - SwordBibleBook *book; + SwordBibleBook *__unsafe_unretained book; int number; } @property (readwrite) int number; -@property (readwrite, assign) SwordBibleBook *book; +@property (readwrite, unsafe_unretained) SwordBibleBook *book; - (id)initWithBook:(SwordBibleBook *)aBook andChapter:(int)aNumber; diff --git a/bindings/objc/src/SwordBibleChapter.m b/bindings/objc/src/SwordBibleChapter.m index 8855227..e4086a1 100644 --- a/bindings/objc/src/SwordBibleChapter.m +++ b/bindings/objc/src/SwordBibleChapter.m @@ -24,12 +24,6 @@ return self; } -- (void)finalize { - [super finalize]; -} -- (void)dealloc { - [super dealloc]; -} @end diff --git a/bindings/objc/src/SwordBibleTextEntry.h b/bindings/objc/src/SwordBibleTextEntry.h index 42969cd..1d326a0 100644 --- a/bindings/objc/src/SwordBibleTextEntry.h +++ b/bindings/objc/src/SwordBibleTextEntry.h @@ -13,7 +13,7 @@ NSString *preVerseHeading; } -@property (readwrite, retain) NSString *preVerseHeading; +@property (readwrite, strong) NSString *preVerseHeading; + (id)textEntryForKey:(NSString *)aKey andText:(NSString *)aText; - (id)initWithKey:(NSString *)aKey andText:(NSString *)aText; diff --git a/bindings/objc/src/SwordBibleTextEntry.m b/bindings/objc/src/SwordBibleTextEntry.m index 115a33c..b5a4a51 100644 --- a/bindings/objc/src/SwordBibleTextEntry.m +++ b/bindings/objc/src/SwordBibleTextEntry.m @@ -13,7 +13,7 @@ @synthesize preVerseHeading; + (id)textEntryForKey:(NSString *)aKey andText:(NSString *)aText { - return [[[SwordBibleTextEntry alloc] initWithKey:aKey andText:aText] autorelease]; + return [[SwordBibleTextEntry alloc] initWithKey:aKey andText:aText]; } - (id)initWithKey:(NSString *)aKey andText:(NSString *)aText { @@ -21,18 +21,11 @@ if(self) { self.key = aKey; self.text = aText; + self.preVerseHeading = @""; } return self; } -- (void)finalize { - [super finalize]; -} -- (void)dealloc { - [self setPreVerseHeading:nil]; - - [super dealloc]; -} @end diff --git a/bindings/objc/src/SwordBook.h b/bindings/objc/src/SwordBook.h index b0c520a..50740f3 100644 --- a/bindings/objc/src/SwordBook.h +++ b/bindings/objc/src/SwordBook.h @@ -26,7 +26,7 @@ NSMutableDictionary *contents; } -@property(readwrite, retain) NSMutableDictionary *contents; +@property(readwrite, strong) NSMutableDictionary *contents; /** return the tree content for the given treeKey diff --git a/bindings/objc/src/SwordBook.mm b/bindings/objc/src/SwordBook.mm index bcee1e4..c11b800 100644 --- a/bindings/objc/src/SwordBook.mm +++ b/bindings/objc/src/SwordBook.mm @@ -24,17 +24,8 @@ @synthesize contents; -- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager { - self = [super initWithName:aName swordManager:aManager]; - if(self) { - [self setContents:[NSMutableDictionary dictionary]]; - } - - return self; -} - - (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager { - self = [super initWithSWModule:aModule swordManager:aManager]; + self = [super initWithSWModule:aModule]; if(self) { [self setContents:[NSMutableDictionary dictionary]]; } @@ -42,30 +33,20 @@ return self; } -- (void)finalize { - [super finalize]; -} - -- (void)dealloc { - [self setContents:nil]; - - [super dealloc]; -} - - (SwordModuleTreeEntry *)treeEntryForKey:(NSString *)treeKey { SwordModuleTreeEntry * ret; - [moduleLock lock]; + [self.moduleLock lock]; if(treeKey == nil) { - ret = [contents objectForKey:@"root"]; + ret = contents[@"root"]; if(ret == nil) { sword::TreeKeyIdx *tk = dynamic_cast<sword::TreeKeyIdx*>((sword::SWKey *)*(swModule)); ret = [self _treeEntryForKey:tk]; // add to content - [contents setObject:ret forKey:@"root"]; + contents[@"root"] = ret; } } else { - ret = [contents objectForKey:treeKey]; + ret = contents[treeKey]; if(ret == nil) { const char *keyStr = [treeKey UTF8String]; if(![self isUnicode]) { @@ -77,16 +58,16 @@ sword::TreeKeyIdx *key = dynamic_cast<sword::TreeKeyIdx*>((sword::SWKey *)*(swModule)); ret = [self _treeEntryForKey:key]; // add to content - [contents setObject:ret forKey:treeKey]; + contents[treeKey] = ret; } } - [moduleLock unlock]; + [self.moduleLock unlock]; return ret; } - (SwordModuleTreeEntry *)_treeEntryForKey:(sword::TreeKeyIdx *)treeKey { - SwordModuleTreeEntry *ret = [[[SwordModuleTreeEntry alloc] init] autorelease]; + SwordModuleTreeEntry *ret = [[SwordModuleTreeEntry alloc] init]; char *treeNodeName = (char *)treeKey->getText(); NSString *nName; diff --git a/bindings/objc/src/SwordCommentary.h b/bindings/objc/src/SwordCommentary.h index feaf619..95fd93d 100644 --- a/bindings/objc/src/SwordCommentary.h +++ b/bindings/objc/src/SwordCommentary.h @@ -16,8 +16,6 @@ #ifdef __cplusplus #include <rawfiles.h> -class sword::RawFiles; -class sword::SWConfig; #endif diff --git a/bindings/objc/src/SwordCommentary.mm b/bindings/objc/src/SwordCommentary.mm index 3b81738..93a01d0 100644 --- a/bindings/objc/src/SwordCommentary.mm +++ b/bindings/objc/src/SwordCommentary.mm @@ -69,12 +69,6 @@ return [super init]; } -- (void)finalize { - [super finalize]; -} -- (void)dealloc { - [super dealloc]; -} @end diff --git a/bindings/objc/src/SwordDictionary.mm b/bindings/objc/src/SwordDictionary.mm index 4924d00..13d5967 100644 --- a/bindings/objc/src/SwordDictionary.mm +++ b/bindings/objc/src/SwordDictionary.mm @@ -15,7 +15,7 @@ @interface SwordDictionary (/* Private, class continuation */) /** private property */ -@property(readwrite, retain) NSMutableArray *keys; +@property(readwrite, strong) NSMutableArray *keys; @end @interface SwordDictionary (PrivateAPI) @@ -40,17 +40,17 @@ if([keys count] == 0) { NSMutableArray *arr = [NSMutableArray array]; - [moduleLock lock]; + [self.moduleLock lock]; swModule->setSkipConsecutiveLinks(true); *swModule = sword::TOP; swModule->getRawEntry(); while(![self error]) { - char *cStrKeyText = (char *)swModule->KeyText(); + char *cStrKeyText = (char *)swModule->getKeyText(); if(cStrKeyText) { NSString *keyText = [NSString stringWithUTF8String:cStrKeyText]; if(!keyText) { - keyText = [NSString stringWithCString:swModule->KeyText() encoding:NSISOLatin1StringEncoding]; + keyText = [NSString stringWithCString:swModule->getKeyText() encoding:NSISOLatin1StringEncoding]; if(!keyText) { ALog(@"Unable to create NSString instance from string: %s", cStrKeyText); } @@ -66,7 +66,7 @@ (*swModule)++; } - [moduleLock unlock]; + [self.moduleLock unlock]; self.keys = arr; [self writeToCache]; @@ -96,18 +96,9 @@ @synthesize keys; -- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager { - self = [super initWithName:aName swordManager:aManager]; - if(self) { - self.keys = nil; - } - - return self; -} - /** init with given SWModule */ - (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager { - self = [super initWithSWModule:aModule swordManager:aManager]; + self = [super initWithSWModule:aModule]; if(self) { self.keys = nil; } @@ -115,15 +106,7 @@ return self; } -- (void)finalize { - [super finalize]; -} -- (void)dealloc { - [self setKeys:nil]; - - [super dealloc]; -} - (NSArray *)allKeys { NSArray *ret = self.keys; @@ -141,14 +124,14 @@ - (NSString *)entryForKey:(NSString *)aKey { NSString *ret = nil; - [moduleLock lock]; + [self.moduleLock lock]; [self setKeyString:aKey]; if([self error]) { ALog(@"Error on setting key!"); } else { ret = [self strippedText]; } - [moduleLock unlock]; + [self.moduleLock unlock]; return ret; } @@ -160,13 +143,13 @@ - (id)attributeValueForParsedLinkData:(NSDictionary *)data withTextRenderType:(TextPullType)textType { id ret = nil; - NSString *attrType = [data objectForKey:ATTRTYPE_TYPE]; + NSString *attrType = data[ATTRTYPE_TYPE]; if([attrType isEqualToString:@"scriptRef"] || [attrType isEqualToString:@"scripRef"] || [attrType isEqualToString:@"Greek"] || [attrType isEqualToString:@"Hebrew"] || [attrType hasPrefix:@"strongMorph"] || [attrType hasPrefix:@"robinson"]) { - NSString *key = [data objectForKey:ATTRTYPE_VALUE]; + NSString *key = data[ATTRTYPE_VALUE]; ret = [self strippedTextEntriesForRef:key]; } diff --git a/bindings/objc/src/SwordFilter.mm b/bindings/objc/src/SwordFilter.mm index 7d609bc..450e986 100644 --- a/bindings/objc/src/SwordFilter.mm +++ b/bindings/objc/src/SwordFilter.mm @@ -30,9 +30,6 @@ return self; } -- (void)dealloc { - [super dealloc]; -} - (sword::SWFilter *)swFilter { return swFilter; @@ -42,7 +39,7 @@ @implementation SwordOsisHtmlRefFilter + (SwordOsisHtmlRefFilter *)filter { - return [[[SwordOsisHtmlRefFilter alloc] init] autorelease]; + return [[SwordOsisHtmlRefFilter alloc] init]; } - (id)init { @@ -52,7 +49,7 @@ @implementation SwordOsisXHtmlFilter + (SwordOsisXHtmlFilter *)filter { - return [[[SwordOsisXHtmlFilter alloc] init] autorelease]; + return [[SwordOsisXHtmlFilter alloc] init]; } - (id)init { @@ -62,7 +59,7 @@ @implementation SwordOsisPlainFilter + (SwordOsisPlainFilter *)filter { - return [[[SwordOsisPlainFilter alloc] init] autorelease]; + return [[SwordOsisPlainFilter alloc] init]; } - (id)init { @@ -72,7 +69,7 @@ @implementation SwordThmlHtmlFilter + (SwordThmlHtmlFilter *)filter { - return [[[SwordThmlHtmlFilter alloc] init] autorelease]; + return [[SwordThmlHtmlFilter alloc] init]; } - (id)init { @@ -82,7 +79,7 @@ @implementation SwordThmlPlainFilter + (SwordThmlPlainFilter *)filter { - return [[[SwordThmlPlainFilter alloc] init] autorelease]; + return [[SwordThmlPlainFilter alloc] init]; } - (id)init { @@ -92,7 +89,7 @@ @implementation SwordGbfHtmlFilter + (SwordGbfHtmlFilter *)filter { - return [[[SwordGbfHtmlFilter alloc] init] autorelease]; + return [[SwordGbfHtmlFilter alloc] init]; } - (id)init { @@ -102,7 +99,7 @@ @implementation SwordGbfPlainFilter + (SwordGbfPlainFilter *)filter { - return [[[SwordGbfPlainFilter alloc] init] autorelease]; + return [[SwordGbfPlainFilter alloc] init]; } - (id)init { @@ -112,7 +109,7 @@ @implementation SwordTeiHtmlFilter + (SwordTeiHtmlFilter *)filter { - return [[[SwordTeiHtmlFilter alloc] init] autorelease]; + return [[SwordTeiHtmlFilter alloc] init]; } - (id)init { @@ -122,7 +119,7 @@ @implementation SwordTeiXHtmlFilter + (SwordTeiXHtmlFilter *)filter { - return [[[SwordTeiXHtmlFilter alloc] init] autorelease]; + return [[SwordTeiXHtmlFilter alloc] init]; } - (id)init { @@ -132,7 +129,7 @@ @implementation SwordTeiPlainFilter + (SwordTeiPlainFilter *)filter { - return [[[SwordTeiPlainFilter alloc] init] autorelease]; + return [[SwordTeiPlainFilter alloc] init]; } - (id)init { diff --git a/bindings/objc/src/SwordInstallSource.h b/bindings/objc/src/SwordInstallSource.h index 1b1bdf3..ca19e2f 100644 --- a/bindings/objc/src/SwordInstallSource.h +++ b/bindings/objc/src/SwordInstallSource.h @@ -12,7 +12,6 @@ #ifdef __cplusplus #include <swmgr.h> #include <installmgr.h> -class sword::SWModule; #endif @class SwordManager; @@ -25,11 +24,6 @@ class sword::SWModule; #ifdef __cplusplus sword::InstallSource *swInstallSource; #endif - - BOOL temporarySource; - - /** the sword manager for this source */ - SwordManager *swordManager; } // init @@ -60,7 +54,7 @@ class sword::SWModule; withInstallController:(SwordInstallSourceManager *)sim; /** List of available InstallSources */ -- (NSArray *)listModules; +- (NSDictionary *)allModules; /** List of modules for given type */ - (NSArray *)listModulesForType:(ModuleType)aType; @@ -68,9 +62,8 @@ class sword::SWModule; /** list module types */ - (NSArray *)listModuleTypes; -/** Returns the SwordManager attached to this SwordInstallSourceController */ +/** Returns the SwordManager attached to this SwordInstallSource */ - (SwordManager *)swordManager; -- (void)setSwordManager:(SwordManager *)swManager; #ifdef __cplusplus - (sword::InstallSource *)installSource; diff --git a/bindings/objc/src/SwordInstallSource.mm b/bindings/objc/src/SwordInstallSource.mm index b1f71d3..6870b74 100644 --- a/bindings/objc/src/SwordInstallSource.mm +++ b/bindings/objc/src/SwordInstallSource.mm @@ -12,6 +12,8 @@ @interface SwordInstallSource () +@property (nonatomic) BOOL deleteSwInstallSource; + @end @implementation SwordInstallSource @@ -20,16 +22,8 @@ - (id)init { self = [super init]; if(self) { - temporarySource = NO; - - // at first we have no sword manager - [self setSwordManager:nil]; - - // init InstallMgr swInstallSource = new sword::InstallSource("", ""); - if(swInstallSource == nil) { - ALog(@"Could not init sword install source!"); - } + self.deleteSwInstallSource = YES; } return self; @@ -38,8 +32,7 @@ - (id)initWithType:(NSString *)aType { self = [self init]; if(self) { - // set type - swInstallSource->type = [aType cStringUsingEncoding:NSUTF8StringEncoding]; + swInstallSource->type = [aType UTF8String]; } return self; @@ -49,72 +42,55 @@ - (id)initWithSource:(sword::InstallSource *)is { self = [super init]; if(self) { - temporarySource = YES; - - // at first we have no sword manager - [self setSwordManager:nil]; - swInstallSource = is; + self.deleteSwInstallSource = NO; } return self; } -- (void)finalize { - if(temporarySource == NO) { - //LogL(LOG_DEBUG, @"[SwordInstallSource -finalize] deleting swInstallSource"); - //delete swInstallSource; - } - - [super finalize]; -} - - (void)dealloc { - [swordManager release]; - [super dealloc]; -} - -- (void)setSwordManager:(SwordManager *)swManager { - [swManager retain]; - [swordManager release]; - swordManager = swManager; + ALog(@""); + if(swInstallSource != NULL && self.deleteSwInstallSource) { + ALog(@"Deleting InstallSource"); + delete swInstallSource; + } } -// accessors - (NSString *)caption { const char *str = swInstallSource->caption; - return [[[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding] autorelease]; + return [[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding]; } - (void)setCaption:(NSString *)aCaption { - swInstallSource->caption = [aCaption cStringUsingEncoding:NSUTF8StringEncoding]; + swInstallSource->caption = [aCaption UTF8String]; } - (NSString *)type { const char *str = swInstallSource->type; - return [[[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding] autorelease]; + return [[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding]; } - (void)setType:(NSString *)aType { - swInstallSource->type = [aType cStringUsingEncoding:NSUTF8StringEncoding]; + swInstallSource->type = [aType UTF8String]; } - (NSString *)source { const char *str = swInstallSource->source; - return [[[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding] autorelease]; + return [[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding]; } - (void)setSource:(NSString *)aSource { - swInstallSource->source = [aSource cStringUsingEncoding:NSUTF8StringEncoding]; + swInstallSource->source = [aSource UTF8String]; } - (NSString *)directory { const char *str = swInstallSource->directory; - return [[[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding] autorelease]; + return [[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding]; } - (void)setDirectory:(NSString *)aDir { - swInstallSource->directory = [aDir cStringUsingEncoding:NSUTF8StringEncoding]; + swInstallSource->directory = [aDir UTF8String]; } - (BOOL)isLocalSource { @@ -133,60 +109,49 @@ } /** list all modules of this source */ -- (NSArray *)listModules { - NSArray *ret = [NSArray array]; - +- (NSDictionary *)allModules { SwordManager *sm = [self swordManager]; if(sm) { - ret = [sm listModules]; + return [sm allModules]; } else { ALog(@"Have nil SwordManager"); } - - return ret; + return nil; } - (NSArray *)listModulesForType:(ModuleType)aType { - NSArray *ret = [NSArray array]; - SwordManager *sm = [self swordManager]; if(sm) { - ret = [sm modulesForType:aType]; + return [sm modulesForType:aType]; } else { ALog(@"Have nil SwordManager"); - } - - return ret; + } + return nil; } /** list module types */ - (NSArray *)listModuleTypes { - NSArray *ret = [SwordManager moduleTypes]; - return ret; + return [SwordManager moduleTypes]; } -// get associated SwordManager - (SwordManager *)swordManager { - - if(swordManager == nil) { + // create SwordManager from the SWMgr of this source + sword::SWMgr *mgr; + if([self isLocalSource]) { + // create SwordManager from new SWMgr of path + mgr = new sword::SWMgr([[self directory] UTF8String], true, NULL, false, false); + } else { // create SwordManager from the SWMgr of this source - sword::SWMgr *mgr; - if([[self source] isEqualToString:@"localhost"]) { - // create SwordManager from new SWMgr of path - mgr = new sword::SWMgr([[self directory] UTF8String], true, NULL, false, false); - } else { - // create SwordManager from the SWMgr of this source - mgr = swInstallSource->getMgr(); - } - - if(mgr == nil) { - ALog(@"Have a nil SWMgr!"); - } else { - swordManager = [[SwordManager alloc] initWithSWMgr:mgr]; - } + mgr = swInstallSource->getMgr(); + } + + if(mgr == nil) { + ALog(@"Have a nil SWMgr!"); + return nil; + + } else { + return [[SwordManager alloc] initWithSWMgr:mgr]; } - - return swordManager; } /** low level API */ diff --git a/bindings/objc/src/SwordInstallSourceManager.h b/bindings/objc/src/SwordInstallSourceManager.h index ee22c48..9f8922e 100755 --- a/bindings/objc/src/SwordInstallSourceManager.h +++ b/bindings/objc/src/SwordInstallSourceManager.h @@ -13,8 +13,6 @@ #include <installmgr.h> #include <swconfig.h> #include <multimapwdef.h> -class sword::SWModule; -class sword::InstallMgr; using sword::SWModule; using sword::InstallMgr; #endif @@ -37,44 +35,39 @@ typedef enum _ModuleStatusConst { #ifdef __cplusplus sword::InstallMgr *swInstallMgr; #endif - - BOOL createPath; - - NSString *configPath; } -// ------------------- getter / setter ------------------- -@property (retain, readwrite) NSString *configPath; -@property (retain, readwrite) NSString *configFilePath; -@property (retain, readwrite) NSMutableArray *installSourceList; +// ------------------- properties ------------------- /** Dictionary of InstallSources. Key: Caption */ -@property (retain, readwrite) NSMutableDictionary *installSources; +@property (strong, readonly) NSDictionary *installSources; +@property (strong, nonatomic) NSString *ftpUser; +@property (strong, nonatomic) NSString *ftpPassword; +@property (strong, readwrite) NSString *configPath; +@property (readwrite) BOOL createConfigPath; // -------------------- methods -------------------- // initialization -+ (SwordInstallSourceManager *)defaultController; -+ (SwordInstallSourceManager *)defaultControllerWithPath:(NSString *)aPath; -+ (SwordInstallSourceManager *)controllerWithPath:(NSString *)aPath; ++ (SwordInstallSourceManager *)defaultManager; /** -base path of the module installation + base path of the module installation */ -- (id)init; - (id)initWithPath:(NSString *)aPath createPath:(BOOL)create; -/** re-init after adding or removing new modules */ -- (void)reinitialize; +/** marks this manager as the default one / singleton */ +- (void)useAsDefaultManager; + +/** init after adding or removing new modules */ +- (void)initManager; // installation/unInstallation - (int)installModule:(SwordModule *)aModule fromSource:(SwordInstallSource *)is withManager:(SwordManager *)manager; - (int)uninstallModule:(SwordModule *)aModule fromManager:(SwordManager *)swManager; // add/remove install sources -- (void)addInstallSource:(SwordInstallSource *)is; -- (void)addInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit; -- (void)removeInstallSource:(SwordInstallSource *)is; -- (void)removeInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit; +- (void)addInstallSource:(SwordInstallSource *)is reload:(BOOL)doReload; +- (void)removeInstallSource:(SwordInstallSource *)is reload:(BOOL)doReload; - (void)updateInstallSource:(SwordInstallSource *)is; - (int)refreshMasterRemoteInstallSourceList; @@ -83,7 +76,7 @@ base path of the module installation - (void)setUserDisclaimerConfirmed:(BOOL)flag; // list modules in sources -- (NSArray *)listModulesForSource:(SwordInstallSource *)is; +- (NSDictionary *)listModulesForSource:(SwordInstallSource *)is; // remote source list - (int)refreshInstallSource:(SwordInstallSource *)is; diff --git a/bindings/objc/src/SwordInstallSourceManager.mm b/bindings/objc/src/SwordInstallSourceManager.mm index 98d6cac..ecdae3a 100755 --- a/bindings/objc/src/SwordInstallSourceManager.mm +++ b/bindings/objc/src/SwordInstallSourceManager.mm @@ -19,73 +19,20 @@ typedef sword::multimapwithdefault<sword::SWBuf, sword::SWBuf, std::less <sword: #define INSTALLSOURCE_SECTION_TYPE_FTP "FTPSource" #define INSTALLSOURCE_SECTION_TYPE_HTTP "HTTPSource" -@implementation SwordInstallSourceManager -@dynamic configPath; +@interface SwordInstallSourceManager () -// ------------------- getter / setter ------------------- -- (NSString *)configPath { - return configPath; -} +@property (strong, readwrite) NSDictionary *installSources; -- (void)setConfigPath:(NSString *)value { - DLog(@""); - - if(configPath != value) { - [configPath release]; - configPath = [value copy]; - - if(value == nil) { - return; - } - - - // check for existence - NSFileManager *fm = [NSFileManager defaultManager]; - BOOL isDir; - if(([fm fileExistsAtPath:configPath] == NO) && createPath == YES) { - // create path - [fm createDirectoryAtPath:configPath withIntermediateDirectories:NO attributes:nil error:NULL]; - } - - if(([fm fileExistsAtPath:configPath isDirectory:&isDir] == YES) && (isDir)) { - // set configFilePath - [self setConfigFilePath:[configPath stringByAppendingPathComponent:@"InstallMgr.conf"]]; - - // check config - if([fm fileExistsAtPath:self.configFilePath] == NO) { - // create config entry - sword::SWConfig config([self.configFilePath cStringUsingEncoding:NSUTF8StringEncoding]); - config["General"]["PassiveFTP"] = "true"; - config.Save(); - - // create default Install source - SwordInstallSource *is = [[[SwordInstallSource alloc] initWithType:INSTALLSOURCE_TYPE_FTP] autorelease]; - [is setCaption:@"CrossWire"]; - [is setSource:@"ftp.crosswire.org"]; - [is setDirectory:@"/pub/sword/raw"]; - - // addInstallSource will reinitialize - [self addInstallSource:is withReinitialize:NO]; - - } - // init installMgr - [self reinitialize]; - - // sync with master install source list - //[self refreshMasterRemoteInstallSourceList]; +@end - } else { - ALog(@"Config path does not exist: %@", configPath); - } - } -} +@implementation SwordInstallSourceManager // -------------------- methods -------------------- +static SwordInstallSourceManager *singleton = nil; // initialization -+ (SwordInstallSourceManager *)defaultController { - static SwordInstallSourceManager *singleton = nil; ++ (SwordInstallSourceManager *)defaultManager { if(singleton == nil) { singleton = [[SwordInstallSourceManager alloc] init]; } @@ -93,27 +40,17 @@ typedef sword::multimapwithdefault<sword::SWBuf, sword::SWBuf, std::less <sword: return singleton; } -+ (SwordInstallSourceManager *)defaultControllerWithPath:(NSString *)aPath { - SwordInstallSourceManager *m = [SwordInstallSourceManager defaultController]; - [m setConfigPath:aPath]; - return m; -} - -+ (SwordInstallSourceManager *)controllerWithPath:(NSString *)aPath { - return [[[SwordInstallSourceManager alloc] initWithPath:aPath createPath:YES] autorelease]; -} - /** base path of the module installation */ - (id)init { self = [super init]; if(self) { - createPath = NO; + [self setCreateConfigPath:NO]; [self setConfigPath:nil]; - [self setConfigFilePath:nil]; - [self setInstallSources:[NSMutableDictionary dictionary]]; - [self setInstallSourceList:[NSMutableArray array]]; + [self setInstallSources:[NSDictionary dictionary]]; + [self setFtpUser:@"ftp"]; + [self setFtpPassword:@"ObjCSword@crosswire.org"]; } return self; @@ -125,103 +62,168 @@ base path of the module installation - (id)initWithPath:(NSString *)aPath createPath:(BOOL)create { self = [self init]; if(self) { - createPath = create; + [self setCreateConfigPath:create]; [self setConfigPath:aPath]; } return self; } -/** re-init after adding or removing new modules */ -- (void)reinitialize { - sword::SWConfig config([self.configFilePath UTF8String]); - config.Load(); +- (void)useAsDefaultManager { + singleton = self; +} - // init installMgr - BOOL disclaimerConfirmed = NO; +- (void)dealloc { + DLog(@""); if(swInstallMgr != nil) { + DLog(@"deleting InstallMgr"); + delete swInstallMgr; + } +} + +/** init after adding or removing new modules */ +- (void)initManager { + [self setupConfig]; + + // safe disclaimer flag + BOOL disclaimerConfirmed = NO; + if(swInstallMgr != NULL) { disclaimerConfirmed = [self userDisclaimerConfirmed]; } - swInstallMgr = new sword::InstallMgr([configPath UTF8String]); - if(swInstallMgr == nil) { - ALog(@"Could not initialize InstallMgr!"); + + if(swInstallMgr == NULL) { + DLog(@"Initializing swInstallMgr"); + swInstallMgr = [self newDefaultInstallMgr]; + if(swInstallMgr == nil) { + ALog(@"Could not initialize InstallMgr!"); + + } else { + [self setUserDisclaimerConfirmed:disclaimerConfirmed]; + + if(![self existsDefaultInstallSource]) { + [self addDefaultInstallSource]; + [self readInstallMgrConf]; + } + + [self setupInstallSources]; + } + } else { - [self setUserDisclaimerConfirmed:disclaimerConfirmed]; - - // empty all lists - [self.installSources removeAllObjects]; - [self.installSourceList removeAllObjects]; - - // init install sources - for(InstallSourceMap::iterator it = swInstallMgr->sources.begin(); it != swInstallMgr->sources.end(); it++) { - sword::InstallSource *sis = it->second; - SwordInstallSource *is = [[[SwordInstallSource alloc] initWithSource:sis] autorelease]; - - [self.installSources setObject:is forKey:[is caption]]; - // also add to list - [self.installSourceList addObject:is]; + ALog(@"Re-initializing swInstallMgr"); + [self reloadManager]; + } +} + +- (void)reloadManager { + [self readInstallMgrConf]; + [self setupInstallSources]; +} + +- (sword::InstallMgr *)newDefaultInstallMgr { + ALog(@"Creating InstallMgr with: %@, %i, %@, %@", [self configPath], 0, [self ftpUser], [self ftpPassword]); + return new sword::InstallMgr( + [[self configPath] UTF8String], + 0, + sword::SWBuf([[self ftpUser] UTF8String]), + sword::SWBuf([[self ftpPassword] UTF8String])); +} + +- (BOOL)existsDefaultInstallSource { + sword::InstallMgr mgr = sword::InstallMgr([[self configPath] UTF8String]); + + for(InstallSourceMap::iterator it = mgr.sources.begin(); it != mgr.sources.end(); it++) { + sword::InstallSource *sis = it->second; + + if([[NSString stringWithCString:sis->caption.c_str() encoding:NSUTF8StringEncoding] isEqualToString:@"CrossWire"]) { + return YES; } } + return NO; } -- (void)finalize { - if(swInstallMgr != nil) { - delete swInstallMgr; +- (void)addDefaultInstallSource { + SwordInstallSource *is = [[SwordInstallSource alloc] initWithType:INSTALLSOURCE_TYPE_FTP]; + [is setCaption:@"CrossWire"]; + [is setSource:@"ftp.crosswire.org"]; + [is setDirectory:@"/pub/sword/raw"]; + + [self addInstallSource:is reload:NO]; +} + +- (void)setupConfig { + if([self configPath] == nil) { + ALog(@"No config path configured!"); + return; } - [super finalize]; + // check for existence + NSFileManager *fm = [NSFileManager defaultManager]; + BOOL isDir; + ALog(@"Checking for config path at: %@", [self configPath]); + if(![fm fileExistsAtPath:[self configPath]] && [self createConfigPath]) { + ALog(@"Config dir doesn't exist, creating it..."); + [fm createDirectoryAtPath:[self configPath] withIntermediateDirectories:NO attributes:nil error:NULL]; + ALog(@"Config dir doesn't exist, creating it...done"); + } + + if([fm fileExistsAtPath:[self configPath] isDirectory:&isDir] && (isDir)) { + // check config + if(![fm fileExistsAtPath:[self createInstallMgrConfPath]]) { + // create config entry + sword::SWConfig config([[self createInstallMgrConfPath] UTF8String]); + config["General"]["PassiveFTP"] = "true"; + config.Save(); + } + + } else { + ALog(@"Config path does not exist: %@", [self configPath]); + } } -- (void)dealloc { - if(swInstallMgr != nil) { - delete swInstallMgr; +- (void)setupInstallSources { + NSMutableDictionary *dict = [NSMutableDictionary dictionary]; + for(InstallSourceMap::iterator it = swInstallMgr->sources.begin(); it != swInstallMgr->sources.end(); it++) { + sword::InstallSource *sis = it->second; + SwordInstallSource *is = [[SwordInstallSource alloc] initWithSource:sis]; + + ALog(@"Adding install source: %@", [is caption]); + dict[[is caption]] = is; } - - [self setConfigPath:nil]; - [self setInstallSources:nil]; - [self setInstallSourceList:nil]; - [self setConfigFilePath:nil]; - - [super dealloc]; + + [self setInstallSources:dict]; } -- (void)addInstallSource:(SwordInstallSource *)is { - [self addInstallSource:is withReinitialize:YES]; +- (NSString *)createInstallMgrConfPath { + return [[self configPath] stringByAppendingPathComponent:@"InstallMgr.conf"]; } -// add/remove install sources -- (void)addInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit { - - // save at once - sword::SWConfig config([self.configFilePath cStringUsingEncoding:NSUTF8StringEncoding]); +- (void)addInstallSource:(SwordInstallSource *)is reload:(BOOL)doReload { + ALog(@"Adding install source: %@", [is caption]); + + // modify conf file + sword::SWConfig config([[self createInstallMgrConfPath] UTF8String]); if([[is type] isEqualToString:INSTALLSOURCE_TYPE_FTP]) { config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_FTP, [[is configEntry] UTF8String])); } else { config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_HTTP, [[is configEntry] UTF8String])); } config.Save(); - - if(reinit) - [self reinitialize]; -} -- (void)removeInstallSource:(SwordInstallSource *)is { - [self removeInstallSource:is withReinitialize:NO]; + if(doReload) [self reloadManager]; } -- (void)removeInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit { - - // remove source - [self.installSources removeObjectForKey:[is caption]]; - [self.installSourceList removeObject:is]; - - // save at once - sword::SWConfig config([self.configFilePath cStringUsingEncoding:NSUTF8StringEncoding]); +- (void)removeInstallSource:(SwordInstallSource *)is reload:(BOOL)doReload { + ALog(@"Removing install source: %@", [is caption]); + NSMutableDictionary *dict = [[self installSources] mutableCopy]; + [dict removeObjectForKey:[is caption]]; + + // modify conf file + sword::SWConfig config([[self createInstallMgrConfPath] UTF8String]); config["Sources"].erase(INSTALLSOURCE_SECTION_TYPE_HTTP); config["Sources"].erase(INSTALLSOURCE_SECTION_TYPE_FTP); - + // build up new - for(SwordInstallSource *sis in self.installSources) { + for(SwordInstallSource *sis in [dict allValues]) { if([[sis type] isEqualToString:INSTALLSOURCE_TYPE_FTP]) { config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_FTP, [[sis configEntry] UTF8String])); } else { @@ -229,63 +231,65 @@ base path of the module installation } } config.Save(); - - if(reinit) - [self reinitialize]; + + if(doReload) [self reloadManager]; } - (void)updateInstallSource:(SwordInstallSource *)is { + ALog(@"Updating install source [remove|add]: %@", [is caption]); + // hold a ref to the is + SwordInstallSource *save = is; // first remove, then add again - [self removeInstallSource:is withReinitialize:NO]; - [self addInstallSource:is]; + [self removeInstallSource:save reload:NO]; + [self addInstallSource:save reload:NO]; + save = nil; + + [self reloadManager]; } -// installation/unInstallation - (int)installModule:(SwordModule *)aModule fromSource:(SwordInstallSource *)is withManager:(SwordManager *)manager { - + ALog(@"Installing module: %@, from source: %@", [aModule name], [is caption]); int stat; - if([[is source] isEqualToString:@"localhost"]) { + if([is isLocalSource]) { stat = swInstallMgr->installModule([manager swManager], [[is directory] UTF8String], [[aModule name] UTF8String]); } else { stat = swInstallMgr->installModule([manager swManager], 0, [[aModule name] UTF8String], [is installSource]); } - return stat; } +- (int)uninstallModule:(SwordModule *)aModule fromManager:(SwordManager *)swManager { + ALog(@"Removing module: %@", [aModule name]); + return swInstallMgr->removeModule([swManager swManager], [[aModule name] UTF8String]); +} + - (int)refreshMasterRemoteInstallSourceList { + ALog(@"Refreshing remote install sources from master repo."); int stat = swInstallMgr->refreshRemoteSourceConfiguration(); if(stat) { ALog(@"Unable to refresh with master install source!"); + } else { + [self reloadManager]; } return stat; } -/** - uninstalls a module from a SwordManager - */ -- (int)uninstallModule:(SwordModule *)aModule fromManager:(SwordManager *)swManager { - int stat = swInstallMgr->removeModule([swManager swManager], [[aModule name] UTF8String]); - - return stat; -} - // list modules in sources -- (NSArray *)listModulesForSource:(SwordInstallSource *)is { - return [is listModules]; +- (NSDictionary *)listModulesForSource:(SwordInstallSource *)is { + return [is allModules]; } /** refresh modules of this source refreshing the install source is necessary before installation of */ - (int)refreshInstallSource:(SwordInstallSource *)is { + ALog(@"Refreshing install source:%@", [is caption]); int ret = 1; - if(is == nil) { ALog(@"Install source is nil"); } else { - if([[is source] isEqualToString:@"localhost"] == NO) { + if(![[is source] isEqualToString:@"localhost"]) { ret = swInstallMgr->refreshRemoteSource([is installSource]); } } @@ -294,12 +298,10 @@ base path of the module installation } /** - returns an array of Modules with status set, nil on error + returns an array of Modules with status set */ - (NSArray *)moduleStatusInInstallSource:(SwordInstallSource *)is baseManager:(SwordManager *)baseMgr { - - NSArray *ret = nil; - + ALog(@"Retrieving module status for install source:%@", [is caption]); // get modules map NSMutableArray *ar = [NSMutableArray array]; std::map<sword::SWModule *, int> modStats = swInstallMgr->getModuleStatus(*[baseMgr swManager], *[[is swordManager] swManager]); @@ -309,16 +311,12 @@ base path of the module installation module = it->first; status = it->second; - SwordModule *mod = [[[SwordModule alloc] initWithSWModule:module] autorelease]; + SwordModule *mod = [[SwordModule alloc] initWithSWModule:module]; [mod setStatus:status]; [ar addObject:mod]; } - - if(ar) { - ret = [NSArray arrayWithArray:ar]; - } - - return ret; + + return [NSArray arrayWithArray:ar]; } - (BOOL)userDisclaimerConfirmed { @@ -329,6 +327,10 @@ base path of the module installation swInstallMgr->setUserDisclaimerConfirmed(flag); } +- (void)readInstallMgrConf { + swInstallMgr->readInstallConf(); +} + /** low level access */ - (sword::InstallMgr *)installMgr { return swInstallMgr; diff --git a/bindings/objc/src/SwordKey.mm b/bindings/objc/src/SwordKey.mm index 5254443..fc0449d 100644 --- a/bindings/objc/src/SwordKey.mm +++ b/bindings/objc/src/SwordKey.mm @@ -12,19 +12,19 @@ @implementation SwordKey + (SwordKey *)swordKey { - return [[[SwordKey alloc] init] autorelease]; + return [[SwordKey alloc] init]; } + (SwordKey *)swordKeyWithRef:(NSString *)aRef { - return [[[SwordKey alloc] initWithRef:aRef] autorelease]; + return [[SwordKey alloc] initWithRef:aRef]; } + (SwordKey *)swordKeyWithSWKey:(sword::SWKey *)aSk { - return [[[SwordKey alloc] initWithSWKey:aSk] autorelease]; + return [[SwordKey alloc] initWithSWKey:aSk]; } + (SwordKey *)swordKeyWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy { - return [[[SwordKey alloc] initWithSWKey:aSk makeCopy:copy] autorelease]; + return [[SwordKey alloc] initWithSWKey:aSk makeCopy:copy]; } - (id)init { @@ -40,8 +40,9 @@ if(self) { if(copy) { if(aSk) { - sk = aSk->clone(); - created = YES; + sk = aSk->clone(); + sk->setPersist(true); + created = YES; } else { created = NO; } @@ -49,7 +50,7 @@ sk = aSk; created = NO; } - } + } return self; } @@ -63,20 +64,11 @@ return self; } -- (void)finalize { - if(created) { - delete sk; - } - - [super finalize]; -} - (void)dealloc { if(created) { delete sk; } - - [super dealloc]; } - (SwordKey *)clone { @@ -86,15 +78,15 @@ #pragma mark - Methods - (void)setPersist:(BOOL)flag { - sk->Persist((int)flag); + sk->setPersist(flag); } - (BOOL)persist { - return (BOOL)sk->Persist(); + return (BOOL)sk->isPersist(); } - (int)error { - return sk->Error(); + return sk->popError(); } - (void)setPosition:(int)aPosition { diff --git a/bindings/objc/src/SwordListKey.mm b/bindings/objc/src/SwordListKey.mm index 07aa8f8..dfe0150 100644 --- a/bindings/objc/src/SwordListKey.mm +++ b/bindings/objc/src/SwordListKey.mm @@ -11,23 +11,23 @@ @implementation SwordListKey + (SwordListKey *)listKeyWithRef:(NSString *)aRef { - return [[[SwordListKey alloc] initWithRef:aRef] autorelease]; + return [[SwordListKey alloc] initWithRef:aRef]; } + (SwordListKey *)listKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme { - return [[[SwordListKey alloc] initWithRef:aRef v11n:scheme] autorelease]; + return [[SwordListKey alloc] initWithRef:aRef v11n:scheme]; } + (SwordListKey *)listKeyWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme { - return [[[SwordListKey alloc] initWithRef:aRef headings:headings v11n:scheme] autorelease]; + return [[SwordListKey alloc] initWithRef:aRef headings:headings v11n:scheme]; } + (SwordListKey *)listKeyWithSWListKey:(sword::ListKey *)aLk { - return [[[SwordListKey alloc] initWithSWListKey:aLk] autorelease]; + return [[SwordListKey alloc] initWithSWListKey:aLk]; } + (SwordListKey *)listKeyWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy { - return [[[SwordListKey alloc] initWithSWListKey:aLk makeCopy:copy] autorelease]; + return [[SwordListKey alloc] initWithSWListKey:aLk makeCopy:copy]; } - (id)init { @@ -52,49 +52,40 @@ - (SwordListKey *)initWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme { sword::VerseKey vk; - vk.Headings((char)headings); + vk.setIntros((char)headings); if(scheme) { vk.setVersificationSystem([scheme UTF8String]); } - sword::ListKey listKey = vk.ParseVerseList([aRef UTF8String], "gen", true); + sword::ListKey listKey = vk.parseVerseList([aRef UTF8String], "gen", true); sword::ListKey *lk = new sword::ListKey(listKey); - return (SwordListKey *) [super initWithSWKey:lk]; -} + lk->setPersist(true); -- (void)finalize { - [super finalize]; -} - -- (void)dealloc { - [super dealloc]; + return (SwordListKey *) [super initWithSWKey:lk]; } - (NSInteger)numberOfVerses { NSInteger ret = 0; - if(sk) { - for(*sk = sword::TOP; !sk->Error(); *sk++) ret++; + for(*sk = sword::TOP; !sk->popError(); *sk++) ret++; } - return ret; } - (void)parse { - } - (void)parseWithHeaders { } - (VerseEnumerator *)verseEnumerator { - return [[[VerseEnumerator alloc] initWithListKey:self] autorelease]; + return [[VerseEnumerator alloc] initWithListKey:self]; } - (BOOL)containsKey:(SwordVerseKey *)aVerseKey { BOOL ret = NO; if(sk) { *sk = [[aVerseKey osisRef] UTF8String]; - ret = !sk->Error(); + ret = !sk->popError(); } return ret; } diff --git a/bindings/objc/src/SwordLocaleManager.h b/bindings/objc/src/SwordLocaleManager.h index dd67a13..2cfbe63 100644 --- a/bindings/objc/src/SwordLocaleManager.h +++ b/bindings/objc/src/SwordLocaleManager.h @@ -25,4 +25,9 @@ */ - (void)initLocaleWithLocaledPath:(NSString *)aPath; +/** + Retrieves the configured default locale name + */ +- (NSString *)getDefaultLocaleName; + @end diff --git a/bindings/objc/src/SwordLocaleManager.mm b/bindings/objc/src/SwordLocaleManager.mm index 18e4eba..1d8d647 100644 --- a/bindings/objc/src/SwordLocaleManager.mm +++ b/bindings/objc/src/SwordLocaleManager.mm @@ -49,10 +49,10 @@ sword::SWBuf locale; for(it = localeList.begin(); it != localeList.end(); ++it) { locale = *it; - NSString *swLoc = [NSString stringWithCString:locale.c_str() encoding:NSUTF8StringEncoding]; - if([swLoc hasPrefix:loc]) { + NSString *swLoc = [NSString stringWithUTF8String:locale.c_str()]; + if([loc hasPrefix:swLoc]) { haveLocale = YES; - lang = loc; + lang = swLoc; break; } } @@ -63,4 +63,12 @@ } } +- (NSString *)getDefaultLocaleName { + sword::LocaleMgr *lManager = sword::LocaleMgr::getSystemLocaleMgr(); + + const char *localeName = lManager->getDefaultLocaleName(); + if(localeName == NULL) return nil; + else return [NSString stringWithUTF8String:localeName]; +} + @end diff --git a/bindings/objc/src/SwordManager.h b/bindings/objc/src/SwordManager.h index daf8ece..33439f1 100644 --- a/bindings/objc/src/SwordManager.h +++ b/bindings/objc/src/SwordManager.h @@ -18,7 +18,6 @@ #include <swmgr.h> // C++ Sword API #include <localemgr.h> #include <versekey.h> -class sword::SWModule; #endif /** the major types as returned in -[SwordModule -typeString] */ @@ -106,21 +105,13 @@ class sword::SWModule; #ifdef __cplusplus sword::SWMgr *swManager; - SwordFilter *plainFilter, *thmlFilter, *gbfFilter, *osisFilter, *teiFilter; - SwordFilter *thmlStripFilter, *gbfStripFilter, *osisStripFilter, *teiStripFilter; #endif - NSDictionary *modules; - NSString *modulesPath; - NSLock *managerLock; - BOOL temporaryManager; } // ------------------- getter / setter ------------------- -@property (retain, readwrite) NSDictionary *modules; -@property (retain, readwrite) NSString *modulesPath; -@property (retain, readwrite) NSLock *managerLock; -@property (readwrite) BOOL temporaryManager; +@property (strong, readwrite) NSString *modulesPath; +@property (strong, readwrite) NSLock *managerLock; // --------------------- methods ----------------------- @@ -143,6 +134,9 @@ class sword::SWModule; */ + (NSArray *)moduleTypes; +/** uses the current instance as default manager */ +- (void)useAsDefaultManager; + /** Initializes this manager for the given module path. */ @@ -154,10 +148,12 @@ class sword::SWModule; - (void)addModulesPath:(NSString*)path; /** - re-init - reloads all modules, filters and such - This will be triggered if new module had been installed in the module installer. + Loads all modules, filters and such */ -- (void)reInit; +- (void)initManager; + +/** should be called to reload all modules and such */ +- (void)reloadManager; /** Set a cipher key for the given module to make it unlocked and in order to render it's text. @@ -174,6 +170,9 @@ class sword::SWModule; */ - (BOOL)globalOption:(NSString *)option; +/** the number of modules */ +- (NSInteger)numberOfModules; + /** List of module names known by this manager */ @@ -182,7 +181,7 @@ class sword::SWModule; /** List of modules known by this manager */ -- (NSArray *)listModules; +- (NSDictionary *)allModules; /** Module list sorted by name diff --git a/bindings/objc/src/SwordManager.mm b/bindings/objc/src/SwordManager.mm index c2962fb..af5b721 100644 --- a/bindings/objc/src/SwordManager.mm +++ b/bindings/objc/src/SwordManager.mm @@ -13,131 +13,38 @@ #import <ObjCSword/ObjCSword.h> #import "Notifications.h" -#import "FilterProviderFactory.h" -#import "DefaultFilterProvider.h" #include "encfiltmgr.h" -#import "SwordFilter.h" using std::string; using std::list; -@interface SwordManager (PrivateAPI) +@interface SwordManager () + +@property (strong, readwrite) NSDictionary *modules; +@property (readwrite) BOOL deleteSWMgr; -- (void)refreshModules; - (void)addFiltersToModule:(SwordModule *)mod; @end -@implementation SwordManager (PrivateAPI) - -- (void)refreshModules { - NSMutableDictionary *dict = [NSMutableDictionary dictionary]; - - // loop over modules - sword::SWModule *mod; - for(sword::ModMap::iterator it = swManager->Modules.begin(); it != swManager->Modules.end(); it++) { - mod = it->second; - - if(mod) { - // temporary instance - SwordModule *swMod = [SwordModule moduleForSWModule:mod]; - NSString *type = [swMod typeString]; - - ModuleType aType = [SwordModule moduleTypeForModuleTypeString:type]; - SwordModule *sm = [SwordModule moduleForType:aType swModule:mod swordManager:self]; - [dict setObject:sm forKey:[[sm name] lowercaseString]]; - - [self addFiltersToModule:sm]; - } - } - - // set modules - self.modules = dict; -} - -- (void)addFiltersToModule:(SwordModule *)mod { - // prepare display filters - - id<FilterProvider> filterProvider = [[FilterProviderFactory providerFactory] get]; - - switch([mod swModule]->Markup()) { - case sword::FMT_GBF: - if(!gbfFilter) { - gbfFilter = [filterProvider newGbfRenderFilter]; - } - if(!gbfStripFilter) { - gbfStripFilter = [filterProvider newGbfPlainFilter]; - } - [mod addRenderFilter:gbfFilter]; - [mod addStripFilter:gbfStripFilter]; - break; - case sword::FMT_THML: - if(!thmlFilter) { - thmlFilter = [filterProvider newThmlRenderFilter]; - } - if(!thmlStripFilter) { - thmlStripFilter = [filterProvider newThmlPlainFilter]; - } - [mod addRenderFilter:thmlFilter]; - [mod addStripFilter:thmlStripFilter]; - break; - case sword::FMT_OSIS: - if(!osisFilter) { - osisFilter = [filterProvider newOsisRenderFilter]; - } - if(!osisStripFilter) { - osisStripFilter = [filterProvider newOsisPlainFilter]; - } - [mod addRenderFilter:osisFilter]; - [mod addStripFilter:osisStripFilter]; - break; - case sword::FMT_TEI: - if(!teiFilter) { - teiFilter = [filterProvider newTeiRenderFilter]; - } - if(!teiStripFilter) { - teiStripFilter = [filterProvider newTeiPlainFilter]; - } - [mod addRenderFilter:teiFilter]; - [mod addStripFilter:teiStripFilter]; - break; - case sword::FMT_PLAIN: - default: - if(!plainFilter) { - plainFilter = [filterProvider newHtmlPlainFilter]; - } - [mod addRenderFilter:plainFilter]; - break; - } -} - -@end @implementation SwordManager -@synthesize modules; -@synthesize modulesPath; -@synthesize managerLock; -@synthesize temporaryManager; - # pragma mark - class methods +static SwordManager *instance = nil; + + (NSArray *)moduleTypes { - return [NSArray arrayWithObjects: - SWMOD_TYPES_BIBLES, - SWMOD_TYPES_COMMENTARIES, - SWMOD_TYPES_DICTIONARIES, - SWMOD_TYPES_GENBOOKS, nil]; + return @[SWMOD_TYPES_BIBLES, SWMOD_TYPES_COMMENTARIES, SWMOD_TYPES_DICTIONARIES, SWMOD_TYPES_GENBOOKS]; } + (SwordManager *)managerWithPath:(NSString *)path { - SwordManager *manager = [[[SwordManager alloc] initWithPath:path] autorelease]; + SwordManager *manager = [[SwordManager alloc] initWithPath:path]; return manager; } + (SwordManager *)defaultManager { - static SwordManager *instance = nil; if(instance == nil) { // use default path instance = [[SwordManager alloc] initWithPath:[[Configuration config] defaultModulePath]]; @@ -146,24 +53,25 @@ using std::list; return instance; } -- (id)initWithPath:(NSString *)path { +- (void)useAsDefaultManager { + instance = self; +} +- (id)initWithPath:(NSString *)path { if((self = [super init])) { - // this is our main swManager - temporaryManager = NO; - + ALog(@"Init with path:%@", path); + self.deleteSWMgr = YES; self.modulesPath = path; + self.managerLock = (id) [[NSRecursiveLock alloc] init]; - self.modules = [NSDictionary dictionary]; - self.managerLock = (NSLock *)[[[NSRecursiveLock alloc] init] autorelease]; - - [self reInit]; + [self initManager]; + // all global options off sword::StringList options = swManager->getGlobalOptions(); sword::StringList::iterator it; for(it = options.begin(); it != options.end(); it++) { [self setGlobalOption:[NSString stringWithCString:it->c_str() encoding:NSUTF8StringEncoding] value:SW_OFF]; - } + } } return self; @@ -172,62 +80,44 @@ using std::list; - (id)initWithSWMgr:(sword::SWMgr *)aSWMgr { self = [super init]; if(self) { + ALog(@"Init with temporary SWMgr"); swManager = aSWMgr; - // this is a temporary swManager - temporaryManager = YES; - - self.modules = [NSDictionary dictionary]; - self.managerLock = [(NSLock *)[[NSRecursiveLock alloc] init] autorelease]; + self.deleteSWMgr = NO; + self.managerLock = (id) [[NSRecursiveLock alloc] init]; - [self refreshModules]; + [self applyFilters]; } return self; } -- (void)finalize { - if(!temporaryManager) { - delete swManager; - } - - [super finalize]; -} - (void)dealloc { - if(!temporaryManager) { + DLog(@""); + if(self.deleteSWMgr) { + // only delete swManager is we created it + // if it came from someplace else then we're not responsible + ALog(@"Deleting SWMgr!"); delete swManager; } - [self setModules:nil]; - [self setModulesPath:nil]; - [self setManagerLock:nil]; - - [gbfFilter release]; - [gbfStripFilter release]; - [thmlFilter release]; - [thmlStripFilter release]; - [osisFilter release]; - [osisStripFilter release]; - [teiFilter release]; - [teiStripFilter release]; - [plainFilter release]; - [super dealloc]; } -- (void)reInit { - [managerLock lock]; - if(modulesPath && [modulesPath length] > 0) { +- (void)initManager { + DLog(@""); + [self.managerLock lock]; + if(self.modulesPath && [self.modulesPath length] > 0) { - // modulePath is the main sw manager - swManager = new sword::SWMgr([modulesPath UTF8String], true, new sword::EncodingFilterMgr(sword::ENC_UTF8)); + NSFileManager *fm = [NSFileManager defaultManager]; + if(![fm fileExistsAtPath:self.modulesPath]) { + [self createModuleFolderTemplate]; + } + + swManager = new sword::SWMgr([self.modulesPath UTF8String], true, new sword::EncodingFilterMgr(sword::ENC_UTF8)); if(!swManager) { ALog(@"Cannot create SWMgr instance for default module path!"); } else { - NSFileManager *fm = [NSFileManager defaultManager]; - NSArray *subDirs = [fm contentsOfDirectoryAtPath:modulesPath error:NULL]; - // for all sub directories add module - BOOL directory; - NSString *fullSubDir; + NSArray *subDirs = [fm contentsOfDirectoryAtPath:self.modulesPath error:NULL]; NSString *subDir; for(subDir in subDirs) { // as long as it's not hidden @@ -235,10 +125,11 @@ using std::list; ![subDir isEqualToString:@"InstallMgr"] && ![subDir isEqualToString:@"mods.d"] && ![subDir isEqualToString:@"modules"]) { - fullSubDir = [modulesPath stringByAppendingPathComponent:subDir]; + NSString *fullSubDir = [self.modulesPath stringByAppendingPathComponent:subDir]; fullSubDir = [fullSubDir stringByStandardizingPath]; //if its a directory + BOOL directory; if([fm fileExistsAtPath:fullSubDir isDirectory:&directory]) { if(directory) { DLog(@"Augmenting folder: %@", fullSubDir); @@ -249,78 +140,125 @@ using std::list; } } - // clear some data - [self refreshModules]; - - SendNotifyModulesChanged(NULL); + [self applyFilters]; } } - [managerLock unlock]; + [self.managerLock unlock]; } -- (void)addModulesPath:(NSString *)path { - [managerLock lock]; - if(swManager == nil) { - swManager = new sword::SWMgr([path UTF8String], true, new sword::EncodingFilterMgr(sword::ENC_UTF8)); - } else { - swManager->augmentModules([path UTF8String]); +- (void)reloadManager { + if(swManager != NULL) { + + swManager->Load(); + [self applyFilters]; } +} + +- (void)createModuleFolderTemplate { + NSFileManager *fm = [NSFileManager defaultManager]; + [fm createDirectoryAtPath:self.modulesPath withIntermediateDirectories:NO attributes:nil error:NULL]; + [fm createDirectoryAtPath:[self.modulesPath stringByAppendingPathComponent:@"mods.d"] withIntermediateDirectories:NO attributes:nil error:NULL]; + [fm createDirectoryAtPath:[self.modulesPath stringByAppendingPathComponent:@"modules"] withIntermediateDirectories:NO attributes:nil error:NULL]; +} + +- (void)addModulesPath:(NSString *)path { + [self.managerLock lock]; + swManager->augmentModules([path UTF8String]); - [self refreshModules]; - [managerLock unlock]; - - SendNotifyModulesChanged(NULL); + [self applyFilters]; + [self.managerLock unlock]; } -- (SwordModule *)moduleWithName:(NSString *)name { - - SwordModule *ret = [modules objectForKey:[name lowercaseString]]; - if(ret == nil) { - sword::SWModule *mod = [self getSWModuleWithName:name]; - if(mod == NULL) { - ALog(@"No module by that name: %@!", name); - } else { - // temporary instance - SwordModule *swMod = [SwordModule moduleForSWModule:mod]; - NSString *type = [swMod typeString]; - - ModuleType aType = [SwordModule moduleTypeForModuleTypeString:type]; - ret = [SwordModule moduleForType:aType swModule:mod swordManager:self]; +- (void)applyFilters { + for(SwordModule *mod in [[self allModules] allValues]) { + [self addFiltersToModule:mod]; + } +} - if(ret != nil) { - NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:modules]; - [dict setObject:ret forKey:[name lowercaseString]]; - self.modules = dict; - } - } +- (void)addFiltersToModule:(SwordModule *)mod { + // prepare display filters + + id<FilterProvider> filterProvider = [[FilterProviderFactory providerFactory] get]; + + switch([mod swModule]->getMarkup()) { + case sword::FMT_GBF: + [mod addRenderFilter:[filterProvider newGbfRenderFilter]]; + [mod addStripFilter:[filterProvider newGbfPlainFilter]]; + break; + case sword::FMT_THML: + [mod addRenderFilter:[filterProvider newThmlRenderFilter]]; + [mod addStripFilter:[filterProvider newThmlPlainFilter]]; + break; + case sword::FMT_OSIS: + [mod addRenderFilter:[filterProvider newOsisRenderFilter]]; + [mod addStripFilter:[filterProvider newOsisPlainFilter]]; + break; + case sword::FMT_TEI: + [mod addRenderFilter:[filterProvider newTeiRenderFilter]]; + [mod addStripFilter:[filterProvider newTeiPlainFilter]]; + break; + case sword::FMT_PLAIN: + default: + [mod addRenderFilter:[filterProvider newOsisPlainFilter]]; + break; } +} + +- (SwordModule *)moduleWithName:(NSString *)name { - return ret; + sword::SWModule *mod = [self getSWModuleWithName:name]; + if(mod == NULL) { + ALog(@"No module by that name: %@!", name); + return nil; + + } else { + // temporary instance + NSString *type = [NSString stringWithUTF8String:mod->getType()]; + + ModuleType aType = [SwordModule moduleTypeForModuleTypeString:type]; + return [SwordModule moduleForType:aType swModule:mod]; + } } - (void)setCipherKey:(NSString *)key forModuleNamed:(NSString *)name { - [managerLock lock]; swManager->setCipherKey([name UTF8String], [key UTF8String]); - [managerLock unlock]; } #pragma mark - module access - (void)setGlobalOption:(NSString *)option value:(NSString *)value { - [managerLock lock]; + [self.managerLock lock]; swManager->setGlobalOption([option UTF8String], [value UTF8String]); - [managerLock unlock]; + [self.managerLock unlock]; } - (BOOL)globalOption:(NSString *)option { return [[NSString stringWithUTF8String:swManager->getGlobalOption([option UTF8String])] isEqualToString:SW_ON]; } -- (NSArray *)listModules { - return [modules allValues]; +- (NSInteger)numberOfModules { + return swManager->Modules.size(); } + +- (NSDictionary *)allModules { + NSMutableDictionary *dict = [NSMutableDictionary dictionary]; + sword::SWModule *mod; + for(sword::ModMap::iterator it = swManager->Modules.begin(); it != swManager->Modules.end(); it++) { + mod = it->second; + + if(mod) { + NSString *type = [NSString stringWithUTF8String:mod->getType()]; + + ModuleType aType = [SwordModule moduleTypeForModuleTypeString:type]; + SwordModule *swMod = [SwordModule moduleForType:aType swModule:mod]; + [dict setObject:swMod forKey:[swMod name]]; + } + } + return [NSDictionary dictionaryWithDictionary:dict]; +} + - (NSArray *)moduleNames { - return [modules allKeys]; + return [[self allModules] allKeys]; } - (NSArray *)sortedModuleNames { @@ -329,14 +267,14 @@ using std::list; - (NSArray *)modulesForFeature:(NSString *)feature { NSMutableArray *ret = [NSMutableArray array]; - for(SwordModule *mod in [modules allValues]) { + for(SwordModule *mod in [[self allModules] allValues]) { if([mod hasFeature:feature]) { [ret addObject:mod]; } } // sort - NSArray *sortDescriptors = [NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES] autorelease]]; + NSArray *sortDescriptors = @[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES]]; [ret sortUsingDescriptors:sortDescriptors]; return [NSArray arrayWithArray:ret]; @@ -344,14 +282,14 @@ using std::list; - (NSArray *)modulesForType:(ModuleType)type { NSMutableArray *ret = [NSMutableArray array]; - for(SwordModule *mod in [modules allValues]) { + for(SwordModule *mod in [[self allModules] allValues]) { if([mod type] == type || type == All) { [ret addObject:mod]; } } // sort - NSArray *sortDescriptors = [NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES] autorelease]]; + NSArray *sortDescriptors = @[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES]]; [ret sortUsingDescriptors:sortDescriptors]; return [NSArray arrayWithArray:ret]; @@ -359,14 +297,13 @@ using std::list; - (NSArray *)modulesForCategory:(ModuleCategory)cat { NSMutableArray *ret = [NSMutableArray array]; - for(SwordModule *mod in [modules allValues]) { + for(SwordModule *mod in [[self allModules] allValues]) { if([mod category] == cat) { [ret addObject:mod]; } } - // sort - NSArray *sortDescriptors = [NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES] autorelease]]; + NSArray *sortDescriptors = @[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES]]; [ret sortUsingDescriptors:sortDescriptors]; return [NSArray arrayWithArray:ret]; @@ -379,13 +316,7 @@ using std::list; } - (sword::SWModule *)getSWModuleWithName:(NSString *)moduleName { - sword::SWModule *module; - - [managerLock lock]; - module = swManager->Modules[[moduleName UTF8String]]; - [managerLock unlock]; - - return module; + return swManager->Modules[[moduleName UTF8String]]; } @end diff --git a/bindings/objc/src/SwordModule+Index.mm b/bindings/objc/src/SwordModule+Index.mm index 91dfa06..a19dc60 100644 --- a/bindings/objc/src/SwordModule+Index.mm +++ b/bindings/objc/src/SwordModule+Index.mm @@ -36,12 +36,11 @@ results.sort(); NSMutableArray *retArray = [NSMutableArray array]; - if(results.Count() > 0) { - while(!results.Error()) { + if(results.getCount() > 0) { + while(!results.popError()) { NSString *keyString = [NSString stringWithUTF8String:results.getText()]; SwordModuleTextEntry *entry = [SwordModuleTextEntry textEntryForKey:keyString andText:nil]; [retArray addObject:entry]; - [entry release]; results++; } } diff --git a/bindings/objc/src/SwordModule.h b/bindings/objc/src/SwordModule.h index 9f1e0ad..4660b5f 100644 --- a/bindings/objc/src/SwordModule.h +++ b/bindings/objc/src/SwordModule.h @@ -30,8 +30,7 @@ #define SWPOS_TOP 1 -@class SwordManager, SwordModuleTextEntry, SwordKey; -@class SwordFilter; +@class SwordManager, SwordModuleTextEntry, SwordKey, SwordFilter; typedef enum { TextTypeStripped = 1, @@ -65,21 +64,8 @@ typedef enum { @interface SwordModule : NSObject { - NSMutableDictionary *configEntries; - ModuleType type; ModuleCategory category; - int status; - SwordManager *swManager; - NSRecursiveLock *moduleLock; - NSLock *indexLock; - - /** we store the name separately */ - NSString *typeString; - NSString *name; - NSString *descr; - NSString *lang; - /** yes, we have a delegate to report any action to */ id delegate; @@ -91,15 +77,10 @@ typedef enum { // ------------- properties --------------- @property (readwrite) ModuleType type; @property (readwrite) int status; -@property (retain, readwrite) NSRecursiveLock *moduleLock; -@property (retain, readwrite) NSLock *indexLock; -@property (retain, readwrite) SwordManager *swManager; - -// swmodule properties -@property (retain, readonly) NSString *name; -@property (retain, readonly) NSString *typeString; -@property (retain, readonly) NSString *descr; -@property (retain, readonly) NSString *lang; +@property (strong, readwrite) SwordManager *swManager; +@property (strong, readwrite) NSLock *indexLock; +@property (strong, readwrite) NSRecursiveLock *moduleLock; +@property (strong, readwrite) NSMutableDictionary *configEntries; #ifdef __cplusplus @@ -107,12 +88,11 @@ typedef enum { Convenience initializer */ + (id)moduleForSWModule:(sword::SWModule *)aModule; -+ (id)moduleForSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager; /** Factory method that creates the correct module type instance for the given type */ -+ (id)moduleForType:(ModuleType)aType swModule:(sword::SWModule *)swModule swordManager:(SwordManager *)aManager; ++ (id)moduleForType:(ModuleType)aType swModule:(sword::SWModule *)swModule; /** Initialize this module with an the SWModule. @@ -121,12 +101,6 @@ typedef enum { - (id)initWithSWModule:(sword::SWModule *)aModule; /** - Initialize this module with an the SWModule and a SwordManager instance. - This initializer should normally not need to be used. - */ -- (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager; - -/** Retrieve the underlying SWModule instance */ - (sword::SWModule *)swModule; @@ -149,12 +123,6 @@ typedef enum { // ------------- instance methods --------------- -/** - Initializes module with a given name and SwordManager. - The SwordManager is needed because the underlying SWModule is retrieved from SwordManager. - */ -- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager; - /** Adds a render filter to this module */ - (void)addRenderFilter:(SwordFilter *)aFilter; @@ -166,8 +134,16 @@ typedef enum { */ - (NSInteger)error; -// --------------- Conf entries -------------- +/** module name */ +- (NSString *)name; +/** module description */ +- (NSString *)descr; +/** module language */ +- (NSString *)lang; +/** module type string */ +- (NSString *)typeString; +// --------------- Conf entries -------------- /** Module category as string */ @@ -226,13 +202,6 @@ typedef enum { */ - (NSString *)configFileEntryForConfigKey:(NSString *)entryKey; -// ------------------ module unlocking ------------------ - -/** - Unlock this module with a cipher key, if it is encrypted. - */ -- (BOOL)unlock:(NSString *)unlockKey; - // ------------------ module access semaphores ----------------- /** @@ -303,19 +272,11 @@ typedef enum { - (NSString *)entryAttributeValueFootnoteOfType:(NSString *)fnType indexValue:(NSString *)index forKey:(SwordKey *)aKey; - (NSArray *)entryAttributeValuesLemma; +- (NSArray *)entryAttributeValuesLemmaNormalized; // ----------------- Module text access ---------------------- /** - Retrieves a text entry for a given key. - Type can be: "rendered" or "stripped" - */ -- (SwordModuleTextEntry *)textEntryForKey:(SwordKey *)aKey textType:(TextPullType)aType; -/** - Convenience method with a key-string - */ -- (SwordModuleTextEntry *)textEntryForKeyString:(NSString *)aKeyString textType:(TextPullType)aType; -/** Pulls all text entries for the given reference @return Array of SwordModuleTextEntry */ @@ -354,6 +315,9 @@ typedef enum { */ - (NSArray *)renderedTextEntriesForRef:(NSString *)reference; +- (SwordModuleTextEntry *)renderedTextEntryForRef:(NSString *)reference; +- (SwordModuleTextEntry *)strippedTextEntryForRef:(NSString *)reference; + /** number of entries abstract method, should be overriden by subclasses diff --git a/bindings/objc/src/SwordModule.mm b/bindings/objc/src/SwordModule.mm index 12e2ad8..484877f 100644 --- a/bindings/objc/src/SwordModule.mm +++ b/bindings/objc/src/SwordModule.mm @@ -18,56 +18,30 @@ #import "SwordVerseKey.h" #import "SwordBible.h" #import "SwordCommentary.h" -#import "SwordDictionary.h" -#import "SwordBook.h" -#import "SwordFilter.h" +#import "SwordUtil.h" @interface SwordModule () -@property (retain, readwrite) NSString *name; -@property (retain, readwrite) NSString *typeString; -@property (retain, readwrite) NSString *descr; -@property (retain, readwrite) NSString *lang; -@property(readwrite, retain) NSMutableDictionary *configEntries; - -- (void)mainInit; - @end @implementation SwordModule -@synthesize configEntries; -@synthesize type; -@synthesize status; -@synthesize moduleLock; -@synthesize indexLock; -@synthesize swManager; -@synthesize name; -@synthesize typeString; -@synthesize descr; -@synthesize lang; - - + (id)moduleForSWModule:(sword::SWModule *)aModule { - return [[[SwordModule alloc] initWithSWModule:aModule] autorelease]; -} - -+ (id)moduleForSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager { - return [[[SwordModule alloc] initWithSWModule:aModule swordManager:aManager] autorelease]; + return [[SwordModule alloc] initWithSWModule:aModule]; } -+ (id)moduleForType:(ModuleType)aType swModule:(sword::SWModule *)swModule swordManager:(SwordManager *)aManager { ++ (id)moduleForType:(ModuleType)aType swModule:(sword::SWModule *)swModule { SwordModule *sm; if(aType == Bible) { - sm = [[[SwordBible alloc] initWithSWModule:swModule swordManager:aManager] autorelease]; + sm = [[SwordBible alloc] initWithSWModule:swModule]; } else if(aType == Commentary) { - sm = [[[SwordCommentary alloc] initWithSWModule:swModule swordManager:aManager] autorelease]; + sm = [[SwordCommentary alloc] initWithSWModule:swModule]; } else if(aType == Dictionary) { - sm = [[[SwordDictionary alloc] initWithSWModule:swModule swordManager:aManager] autorelease]; + sm = [[SwordDictionary alloc] initWithSWModule:swModule]; } else if(aType == Genbook) { - sm = [[[SwordBook alloc] initWithSWModule:swModule swordManager:aManager] autorelease]; + sm = [[SwordBook alloc] initWithSWModule:swModule]; } else { - sm = [[[SwordModule alloc] initWithSWModule:swModule swordManager:aManager] autorelease]; + sm = [[SwordModule alloc] initWithSWModule:swModule]; } return sm; @@ -123,38 +97,17 @@ - (void)mainInit { category = Unset; - self.name = [self retrieveName]; - self.typeString = [self retrieveType]; - self.descr = [self retrieveDescr]; - self.lang = [self retrieveLang]; - - self.type = [SwordModule moduleTypeForModuleTypeString:self.typeString]; - self.moduleLock = [[[NSRecursiveLock alloc] init] autorelease]; - self.indexLock = [[[NSLock alloc] init] autorelease]; - self.configEntries = [NSMutableDictionary dictionary]; -} -- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager { - self = [super init]; - if(self) { - swModule = [aManager getSWModuleWithName:aName]; - self.swManager = aManager; - - [self mainInit]; - } - - return self; + self.type = [SwordModule moduleTypeForModuleTypeString:[self typeString]]; + self.moduleLock = [[NSRecursiveLock alloc] init]; + self.indexLock = [[NSLock alloc] init]; + self.configEntries = [NSMutableDictionary dictionary]; } - (id)initWithSWModule:(sword::SWModule *)aModule { - return [self initWithSWModule:aModule swordManager:nil]; -} - -- (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager { self = [super init]; if(self) { swModule = aModule; - self.swManager = aManager; [self mainInit]; } @@ -162,91 +115,75 @@ return self; } -- (void)finalize { - [super finalize]; -} - -- (void)dealloc { - [self setConfigEntries:nil]; - [self setSwManager:nil]; - [self setModuleLock:nil]; - [self setIndexLock:nil]; - [self setName:nil]; - [self setDescr:nil]; - [self setTypeString:nil]; - [self setLang:nil]; - - [super dealloc]; -} - #pragma mark - Filters - (void)addRenderFilter:(SwordFilter *)aFilter { - swModule->AddRenderFilter([aFilter swFilter]); + swModule->removeRenderFilter([aFilter swFilter]); + swModule->addRenderFilter([aFilter swFilter]); } - (void)addStripFilter:(SwordFilter *)aFilter { - swModule->AddStripFilter([aFilter swFilter]); + swModule->addStripFilter([aFilter swFilter]); } #pragma mark - Module access semaphores - (void)lockModuleAccess { - [moduleLock lock]; + [self.moduleLock lock]; } - (void)unlockModuleAccess { - [moduleLock unlock]; + [self.moduleLock unlock]; } -#pragma mark - Conf entries - -- (NSAttributedString *)fullAboutText { - return [[[NSAttributedString alloc] initWithString:@""] autorelease]; -} - -- (NSInteger)error { - return swModule->Error(); -} - -- (NSString *)retrieveName { - NSString *str = [NSString stringWithCString:swModule->Name() encoding:NSUTF8StringEncoding]; +- (NSString *)name { + NSString *str = [NSString stringWithCString:swModule->getName() encoding:NSUTF8StringEncoding]; if(!str) { - str = [NSString stringWithCString:swModule->Name() encoding:NSISOLatin1StringEncoding]; + str = [NSString stringWithCString:swModule->getName() encoding:NSISOLatin1StringEncoding]; } return str; } -- (NSString *)retrieveDescr { - NSString *str = [NSString stringWithCString:swModule->Description() encoding:NSUTF8StringEncoding]; +- (NSString *)descr { + NSString *str = [NSString stringWithCString:swModule->getDescription() encoding:NSUTF8StringEncoding]; if(!str) { - str = [NSString stringWithCString:swModule->Description() encoding:NSISOLatin1StringEncoding]; + str = [NSString stringWithCString:swModule->getDescription() encoding:NSISOLatin1StringEncoding]; } return str; } -- (NSString *)retrieveLang { - NSString *str = [NSString stringWithCString:swModule->Lang() encoding:NSUTF8StringEncoding]; +- (NSString *)lang { + NSString *str = [NSString stringWithCString:swModule->getLanguage() encoding:NSUTF8StringEncoding]; if(!str) { - str = [NSString stringWithCString:swModule->Lang() encoding:NSISOLatin1StringEncoding]; + str = [NSString stringWithCString:swModule->getLanguage() encoding:NSISOLatin1StringEncoding]; } return str; } -- (NSString *)retrieveType { - NSString *str = [NSString stringWithCString:swModule->Type() encoding:NSUTF8StringEncoding]; +- (NSString *)typeString { + NSString *str = [NSString stringWithCString:swModule->getType() encoding:NSUTF8StringEncoding]; if(!str) { - str = [NSString stringWithCString:swModule->Type() encoding:NSISOLatin1StringEncoding]; + str = [NSString stringWithCString:swModule->getType() encoding:NSISOLatin1StringEncoding]; } return str; } +- (NSAttributedString *)fullAboutText { + return [[NSAttributedString alloc] initWithString:@""]; +} + +- (NSInteger)error { + return swModule->popError(); +} + +#pragma mark - Conf entries + - (NSString *)categoryString { - NSString *cat = [configEntries objectForKey:SWMOD_CONFENTRY_CATEGORY]; + NSString *cat = self.configEntries[SWMOD_CONFENTRY_CATEGORY]; if(cat == nil) { cat = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_CATEGORY]; if(cat != nil) { - [configEntries setObject:cat forKey:SWMOD_CONFENTRY_CATEGORY]; + self.configEntries[SWMOD_CONFENTRY_CATEGORY] = cat; } } @@ -261,11 +198,11 @@ } - (NSString *)cipherKey { - NSString *cipherKey = [configEntries objectForKey:SWMOD_CONFENTRY_CIPHERKEY]; + NSString *cipherKey = self.configEntries[SWMOD_CONFENTRY_CIPHERKEY]; if(cipherKey == nil) { cipherKey = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_CIPHERKEY]; if(cipherKey != nil) { - [configEntries setObject:cipherKey forKey:SWMOD_CONFENTRY_CIPHERKEY]; + self.configEntries[SWMOD_CONFENTRY_CIPHERKEY] = cipherKey; } } @@ -273,11 +210,11 @@ } - (NSString *)version { - NSString *version = [configEntries objectForKey:SWMOD_CONFENTRY_VERSION]; + NSString *version = self.configEntries[SWMOD_CONFENTRY_VERSION]; if(version == nil) { version = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_VERSION]; if(version != nil) { - [configEntries setObject:version forKey:SWMOD_CONFENTRY_VERSION]; + self.configEntries[SWMOD_CONFENTRY_VERSION] = version; } } @@ -285,11 +222,11 @@ } - (NSString *)minVersion { - NSString *minVersion = [configEntries objectForKey:SWMOD_CONFENTRY_MINVERSION]; + NSString *minVersion = self.configEntries[SWMOD_CONFENTRY_MINVERSION]; if(minVersion == nil) { minVersion = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_MINVERSION]; if(minVersion != nil) { - [configEntries setObject:minVersion forKey:SWMOD_CONFENTRY_MINVERSION]; + self.configEntries[SWMOD_CONFENTRY_MINVERSION] = minVersion; } } @@ -298,7 +235,7 @@ /** this might be RTF string but the return value will be converted to UTF8 */ - (NSString *)aboutText { - NSMutableString *aboutText = [configEntries objectForKey:SWMOD_CONFENTRY_ABOUT]; + NSMutableString *aboutText = self.configEntries[SWMOD_CONFENTRY_ABOUT]; if(aboutText == nil) { aboutText = [NSMutableString stringWithString:[self configFileEntryForConfigKey:SWMOD_CONFENTRY_ABOUT]]; if(aboutText != nil) { @@ -311,7 +248,7 @@ [aboutText replaceOccurrencesOfString:@"\\pard" withString:@"" options:0 range:NSMakeRange(0, [aboutText length])]; [aboutText replaceOccurrencesOfString:@"\\par" withString:@"\n" options:0 range:NSMakeRange(0, [aboutText length])]; - NSMutableString *retStr = [[@"" mutableCopy] autorelease]; + NSMutableString *retStr = [@"" mutableCopy]; for(NSUInteger i=0; i<[aboutText length]; i++) { unichar c = [aboutText characterAtIndex:i]; @@ -321,7 +258,7 @@ //we have an unicode character! @try { NSInteger unicodeChar = 0; - NSMutableString *unicodeCharString = [[@"" mutableCopy] autorelease]; + NSMutableString *unicodeCharString = [@"" mutableCopy]; int j = 0; BOOL negative = NO; if ([aboutText characterAtIndex:(i+2)] == '-') { @@ -336,7 +273,7 @@ unicodeChar = [unicodeCharString integerValue]; if (negative) unicodeChar = 65536 - unicodeChar; i += j+2; - [retStr appendFormat:@"%C", unicodeChar]; + [retStr appendFormat:@"%C", (unichar)unicodeChar]; } @catch (NSException * e) { [retStr appendFormat:@"%C", c]; @@ -354,7 +291,7 @@ } else { aboutText = [NSMutableString string]; } - [configEntries setObject:aboutText forKey:SWMOD_CONFENTRY_ABOUT]; + self.configEntries[SWMOD_CONFENTRY_ABOUT] = aboutText; } return aboutText; @@ -367,11 +304,11 @@ - (BOOL)isEditable { BOOL ret = NO; - NSString *editable = [configEntries objectForKey:SWMOD_CONFENTRY_EDITABLE]; + NSString *editable = self.configEntries[SWMOD_CONFENTRY_EDITABLE]; if(editable == nil) { editable = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_EDITABLE]; if(editable != nil) { - [configEntries setObject:editable forKey:SWMOD_CONFENTRY_EDITABLE]; + self.configEntries[SWMOD_CONFENTRY_EDITABLE] = editable; } } @@ -386,11 +323,11 @@ - (BOOL)isRTL { BOOL ret = NO; - NSString *direction = [configEntries objectForKey:SWMOD_CONFENTRY_DIRECTION]; + NSString *direction = self.configEntries[SWMOD_CONFENTRY_DIRECTION]; if(direction == nil) { direction = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_DIRECTION]; if(direction != nil) { - [configEntries setObject:direction forKey:SWMOD_CONFENTRY_DIRECTION]; + self.configEntries[SWMOD_CONFENTRY_DIRECTION] = direction; } } @@ -423,7 +360,7 @@ if(key != nil) { // check user defaults, that's where we store the entered keys NSDictionary *cipherKeys = [[NSUserDefaults standardUserDefaults] objectForKey:DefaultsModuleCipherKeysKey]; - if([key length] == 0 && [[cipherKeys allKeys] containsObject:[self name]] == NO) { + if([key length] == 0 && ![[cipherKeys allKeys] containsObject:[self name]]) { locked = YES; } } @@ -455,7 +392,7 @@ - (NSString *)configFileEntryForConfigKey:(NSString *)entryKey { NSString *result = nil; - [moduleLock lock]; + [self.moduleLock lock]; const char *entryStr = swModule->getConfigEntry([entryKey UTF8String]); if(entryStr) { result = [NSString stringWithUTF8String:entryStr]; @@ -463,29 +400,11 @@ result = [NSString stringWithCString:entryStr encoding:NSISOLatin1StringEncoding]; } } - [moduleLock unlock]; + [self.moduleLock unlock]; return result; } -#pragma mark - Module unlocking - -- (BOOL)unlock:(NSString *)unlockKey { - - if (![self isEncrypted]) { - return NO; - } - - NSMutableDictionary *cipherKeys = [NSMutableDictionary dictionaryWithDictionary: - [[NSUserDefaults standardUserDefaults] objectForKey:DefaultsModuleCipherKeysKey]]; - [cipherKeys setObject:unlockKey forKey:[self name]]; - [[NSUserDefaults standardUserDefaults] setObject:cipherKeys forKey:DefaultsModuleCipherKeysKey]; - - [swManager setCipherKey:unlockKey forModuleNamed:[self name]]; - - return YES; -} - #pragma mark - Module positioning - (void)incKeyPosition { @@ -501,11 +420,12 @@ } - (void)setSwordKey:(SwordKey *)aKey { + swModule->getKey()->setPersist(true); swModule->setKey([aKey swKey]); } - (SwordKey *)createKey { - sword::SWKey *sk = swModule->CreateKey(); + sword::SWKey *sk = swModule->createKey(); SwordKey *newKey = [SwordKey swordKeyWithSWKey:sk makeCopy:YES]; delete sk; @@ -529,25 +449,25 @@ - (id)attributeValueForParsedLinkData:(NSDictionary *)data withTextRenderType:(TextPullType)textType { id ret = nil; - NSString *passage = [data objectForKey:ATTRTYPE_PASSAGE]; + NSString *passage = data[ATTRTYPE_PASSAGE]; if(passage) { passage = [[passage stringByReplacingOccurrencesOfString:@"+" withString:@" "] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; } - NSString *attrType = [data objectForKey:ATTRTYPE_TYPE]; + NSString *attrType = data[ATTRTYPE_TYPE]; if([attrType isEqualToString:@"n"]) { NSString *footnoteText = [self entryAttributeValueFootnoteOfType:attrType - indexValue:[data objectForKey:ATTRTYPE_VALUE] + indexValue:data[ATTRTYPE_VALUE] forKey:[SwordKey swordKeyWithRef:passage]]; ret = footnoteText; } else if([attrType isEqualToString:@"x"] || [attrType isEqualToString:@"scriptRef"] || [attrType isEqualToString:@"scripRef"]) { NSString *key = @""; if([attrType isEqualToString:@"x"]) { key = [self entryAttributeValueFootnoteOfType:attrType - indexValue:[data objectForKey:ATTRTYPE_VALUE] + indexValue:data[ATTRTYPE_VALUE] forKey:[SwordKey swordKeyWithRef:passage]]; } else { - key = [[[data objectForKey:ATTRTYPE_VALUE] stringByReplacingOccurrencesOfString:@"+" - withString:@" "] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + key = [[data[ATTRTYPE_VALUE] stringByReplacingOccurrencesOfString:@"+" + withString:@" "] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; } if(textType == TextTypeRendered) { ret = [self renderedTextEntriesForRef:key]; @@ -560,7 +480,7 @@ } - (void)setProcessEntryAttributes:(BOOL)flag { - swModule->processEntryAttributes(flag); + swModule->setProcessEntryAttributes(flag); } - (BOOL)processEntryAttributes { @@ -586,7 +506,9 @@ - (NSArray *)entryAttributeValuesLemma { NSMutableArray *array = [NSMutableArray array]; - // parse entry attributes and look for Lemma (String's numbers) + swModule->stripText(); // force processing of key, if it hasn't been done already + + // parse entry attributes and look for Lemma (Strong's numbers) sword::AttributeTypeList::iterator words; sword::AttributeList::iterator word; sword::AttributeValue::iterator strongVal; @@ -611,21 +533,28 @@ return [NSArray arrayWithArray:array]; } +- (NSArray *)entryAttributeValuesLemmaNormalized { + NSArray *lemmas = [self entryAttributeValuesLemma]; + // post process all codes and mormalize the number + // Hebrew keys should have 5 number digits + return [SwordUtil padStrongsNumbers:lemmas]; +} + - (NSString *)entryAttributeValuePreverseForKey:(SwordKey *)aKey { - [moduleLock lock]; + [self.moduleLock lock]; [self setSwordKey:aKey]; - swModule->RenderText(); // force processing of key + swModule->renderText(); // force processing of key NSString *value = [self entryAttributeValuePreverse]; - [moduleLock unlock]; + [self.moduleLock unlock]; return value; } - (NSString *)entryAttributeValueFootnoteOfType:(NSString *)fnType indexValue:(NSString *)index forKey:(SwordKey *)aKey { - [moduleLock lock]; + [self.moduleLock lock]; [self setSwordKey:aKey]; - swModule->RenderText(); // force processing of key + swModule->renderText(); // force processing of key NSString *value = [self entryAttributeValueFootnoteOfType:fnType indexValue:index]; - [moduleLock unlock]; + [self.moduleLock unlock]; return value; } @@ -638,36 +567,36 @@ - (NSString *)renderedText { NSString *ret = @""; - ret = [NSString stringWithUTF8String:swModule->RenderText()]; + ret = [NSString stringWithUTF8String:swModule->renderText()]; if(!ret) { - ret = [NSString stringWithCString:swModule->RenderText() encoding:NSISOLatin1StringEncoding]; + ret = [NSString stringWithCString:swModule->renderText() encoding:NSISOLatin1StringEncoding]; } return ret; } - (NSString *)renderedTextFromString:(NSString *)aString { NSString *ret = @""; - ret = [NSString stringWithUTF8String:swModule->RenderText([aString UTF8String])]; + ret = [NSString stringWithUTF8String:swModule->renderText([aString UTF8String])]; if(!ret) { - ret = [NSString stringWithCString:swModule->RenderText([aString UTF8String]) encoding:NSISOLatin1StringEncoding]; + ret = [NSString stringWithCString:swModule->renderText([aString UTF8String]) encoding:NSISOLatin1StringEncoding]; } return ret; } - (NSString *)strippedText { NSString *ret = @""; - ret = [NSString stringWithUTF8String:swModule->StripText()]; + ret = [NSString stringWithUTF8String:swModule->stripText()]; if(!ret) { - ret = [NSString stringWithCString:swModule->StripText() encoding:NSISOLatin1StringEncoding]; + ret = [NSString stringWithCString:swModule->stripText() encoding:NSISOLatin1StringEncoding]; } return ret; } - (NSString *)strippedTextFromString:(NSString *)aString { NSString *ret = @""; - ret = [NSString stringWithUTF8String:swModule->RenderText([aString UTF8String])]; + ret = [NSString stringWithUTF8String:swModule->renderText([aString UTF8String])]; if(!ret) { - ret = [NSString stringWithCString:swModule->RenderText([aString UTF8String]) encoding:NSISOLatin1StringEncoding]; + ret = [NSString stringWithCString:swModule->renderText([aString UTF8String]) encoding:NSISOLatin1StringEncoding]; } return ret; } @@ -680,11 +609,35 @@ return [self textEntriesForReference:reference textType:TextTypeRendered]; } +- (NSArray *)textEntriesForReference:(NSString *)aReference textType:(TextPullType)textType { + NSArray *ret = nil; + + SwordModuleTextEntry *entry = [self textEntryForKey:[SwordKey swordKeyWithRef:aReference] + textType:textType]; + if(entry) { + ret = @[entry]; + } + + return ret; +} + +- (SwordModuleTextEntry *)renderedTextEntryForRef:(NSString *)reference { + return [self textEntryForKeyString:reference textType:TextTypeRendered]; +} + +- (SwordModuleTextEntry *)strippedTextEntryForRef:(NSString *)reference { + return [self textEntryForKeyString:reference textType:TextTypeStripped]; +} + +- (SwordModuleTextEntry *)textEntryForKeyString:(NSString *)aKeyString textType:(TextPullType)aType { + return [self textEntryForKey:[SwordKey swordKeyWithRef:aKeyString] textType:aType]; +} + - (SwordModuleTextEntry *)textEntryForKey:(SwordKey *)aKey textType:(TextPullType)aType { SwordModuleTextEntry *ret = nil; if(aKey) { - [moduleLock lock]; + [self.moduleLock lock]; [self setSwordKey:aKey]; if(![self error]) { NSString *txt = @""; @@ -700,28 +653,12 @@ ALog(@"Nil key"); } } - [moduleLock unlock]; + [self.moduleLock unlock]; } return ret; } -- (SwordModuleTextEntry *)textEntryForKeyString:(NSString *)aKeyString textType:(TextPullType)aType { - return [self textEntryForKey:[SwordKey swordKeyWithRef:aKeyString] textType:aType]; -} - -- (NSArray *)textEntriesForReference:(NSString *)aReference textType:(TextPullType)textType { - NSArray *ret = nil; - - SwordModuleTextEntry *entry = [self textEntryForKey:[SwordKey swordKeyWithRef:aReference] - textType:textType]; - if(entry) { - ret = [NSArray arrayWithObject:entry]; - } - - return ret; -} - - (void)writeEntry:(SwordModuleTextEntry *)anEntry {} - (long)entryCount { diff --git a/bindings/objc/src/SwordModuleTextEntry.h b/bindings/objc/src/SwordModuleTextEntry.h index 7759be4..f9664fe 100644 --- a/bindings/objc/src/SwordModuleTextEntry.h +++ b/bindings/objc/src/SwordModuleTextEntry.h @@ -15,8 +15,8 @@ NSString *text; } -@property (readwrite, retain) NSString *key; -@property (readwrite, retain) NSString *text; +@property (readwrite, strong) NSString *key; +@property (readwrite, strong) NSString *text; + (id)textEntryForKey:(NSString *)aKey andText:(NSString *)aText; - (id)initWithKey:(NSString *)aKey andText:(NSString *)aText; diff --git a/bindings/objc/src/SwordModuleTextEntry.m b/bindings/objc/src/SwordModuleTextEntry.m index 3dec05d..0d5e3e0 100644 --- a/bindings/objc/src/SwordModuleTextEntry.m +++ b/bindings/objc/src/SwordModuleTextEntry.m @@ -15,7 +15,7 @@ @synthesize text; + (id)textEntryForKey:(NSString *)aKey andText:(NSString *)aText { - return [[[SwordModuleTextEntry alloc] initWithKey:aKey andText:aText] autorelease]; + return [[SwordModuleTextEntry alloc] initWithKey:aKey andText:aText]; } - (id)initWithKey:(NSString *)aKey andText:(NSString *)aText { @@ -28,15 +28,6 @@ return self; } -- (void)finalize { - [super finalize]; -} -- (void)dealloc { - [self setKey:nil]; - [self setText:nil]; - - [super dealloc]; -} @end diff --git a/bindings/objc/src/SwordModuleTreeEntry.h b/bindings/objc/src/SwordModuleTreeEntry.h index cd27cbe..7c75498 100644 --- a/bindings/objc/src/SwordModuleTreeEntry.h +++ b/bindings/objc/src/SwordModuleTreeEntry.h @@ -14,8 +14,8 @@ NSArray *content; } -@property (retain, readwrite) NSString *key; -@property (retain, readwrite) NSArray *content; +@property (strong, readwrite) NSString *key; +@property (strong, readwrite) NSArray *content; - (id)initWithKey:(NSString *)aKey content:(NSArray *)aContent; diff --git a/bindings/objc/src/SwordModuleTreeEntry.m b/bindings/objc/src/SwordModuleTreeEntry.m index fea0b16..9fbba84 100644 --- a/bindings/objc/src/SwordModuleTreeEntry.m +++ b/bindings/objc/src/SwordModuleTreeEntry.m @@ -24,15 +24,6 @@ return self; } -- (void)finalize { - [super finalize]; -} -- (void)dealloc { - [self setKey:nil]; - [self setContent:nil]; - - [super dealloc]; -} @end diff --git a/bindings/objc/src/SwordUtil.h b/bindings/objc/src/SwordUtil.h index 92779bf..512670c 100644 --- a/bindings/objc/src/SwordUtil.h +++ b/bindings/objc/src/SwordUtil.h @@ -17,4 +17,23 @@ */ + (NSDictionary *)dictionaryFromUrl:(NSURL *)aURL; +/** + Pads an array of unpadded Strong's numbers to 5 digits. + I.e. H0430 => H00430, G11 => G00011 + */ ++ (NSArray *)padStrongsNumbers:(NSArray *)unpaddedNumbers; + +/** + Pads a single unpadded Strong's numbers to 5 digits. + I.e. H0430 => H00430, G11 => G00011 + Since an unpadded number can be combined with multiple numbers concatenated by space we'll return an array here. + */ ++ (NSArray *)padStrongsNumber:(NSString *)unpaddedNumber; + +/** + * Pads a string on the left until 5 digits is reached + */ ++ (NSString *)leftPadStrongsFormat:(NSString *)unpadded; + + @end diff --git a/bindings/objc/src/SwordUtil.m b/bindings/objc/src/SwordUtil.m index 9f53870..abf11b2 100644 --- a/bindings/objc/src/SwordUtil.m +++ b/bindings/objc/src/SwordUtil.m @@ -17,12 +17,11 @@ NSString *scheme = [aURL scheme]; if([scheme isEqualToString:@"sword"]) { // in this case host is the module and path the reference - [ret setObject:[aURL host] forKey:ATTRTYPE_MODULE]; - [ret setObject:[[[aURL path] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] - stringByReplacingOccurrencesOfString:@"/" withString:@""] - forKey:ATTRTYPE_VALUE]; - [ret setObject:@"scriptRef" forKey:ATTRTYPE_TYPE]; - [ret setObject:@"showRef" forKey:ATTRTYPE_ACTION]; + ret[ATTRTYPE_MODULE] = [aURL host]; + ret[ATTRTYPE_VALUE] = [[[aURL path] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] + stringByReplacingOccurrencesOfString:@"/" withString:@""]; + ret[ATTRTYPE_TYPE] = @"scriptRef"; + ret[ATTRTYPE_ACTION] = @"showRef"; } else if([scheme isEqualToString:@"applewebdata"]) { // in this case NSString *path = [aURL path]; @@ -36,29 +35,73 @@ NSString *action = @""; for(NSString *entry in data) { if([entry hasPrefix:@"type="]) { - type = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; + type = [entry componentsSeparatedByString:@"="][1]; } else if([entry hasPrefix:@"module="]) { - module = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; + module = [entry componentsSeparatedByString:@"="][1]; } else if([entry hasPrefix:@"passage="]) { - passage = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; + passage = [entry componentsSeparatedByString:@"="][1]; } else if([entry hasPrefix:@"action="]) { - action = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; + action = [entry componentsSeparatedByString:@"="][1]; } else if([entry hasPrefix:@"value="]) { - value = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; + value = [entry componentsSeparatedByString:@"="][1]; } else { ALog(@"Unknown parameter: %@", entry); } } - [ret setObject:[module stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_MODULE]; - [ret setObject:[passage stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_PASSAGE]; - [ret setObject:[value stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_VALUE]; - [ret setObject:[action stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_ACTION]; - [ret setObject:[type stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_TYPE]; + ret[ATTRTYPE_MODULE] = [module stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + ret[ATTRTYPE_PASSAGE] = [passage stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + ret[ATTRTYPE_VALUE] = [value stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + ret[ATTRTYPE_ACTION] = [action stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + ret[ATTRTYPE_TYPE] = [type stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; } } return ret; } ++ (NSArray *)padStrongsNumbers:(NSArray *)unpaddedNumbers { + NSMutableArray *buf = [NSMutableArray array]; + for(NSString *lemma in unpaddedNumbers) { + [buf addObjectsFromArray:[self padStrongsNumber:lemma]]; + } + return [NSArray arrayWithArray:buf]; +} + ++ (NSArray *)padStrongsNumber:(NSString *)unpaddedNumber { + NSMutableArray *buf = [NSMutableArray array]; + // Hebrew + NSString *prefix = nil; + if([unpaddedNumber hasPrefix:@"H"]) { + prefix = @"H"; + } + if([unpaddedNumber hasPrefix:@"G"]) { + prefix = @"G"; + } + + if(prefix != nil) { + // lemma may contain more codes concatenated by space + NSArray *keys = [unpaddedNumber componentsSeparatedByString:@" "]; + for(__strong NSString *key in keys) { + // trim + key = [key stringByReplacingOccurrencesOfString:@" " withString:@""]; + NSArray *keyComps = [key componentsSeparatedByString:prefix]; + if(keyComps.count == 2) { + NSString *keyValue = [self leftPadStrongsFormat:keyComps[1]]; + // add to result array + [buf addObject:[NSString stringWithFormat:@"%@%@", prefix, keyValue]]; + } + } + } else { + [buf addObject:unpaddedNumber]; + } + + return [NSArray arrayWithArray:buf]; +} + ++ (NSString *)leftPadStrongsFormat:(NSString *)unpadded { + int number = [unpadded intValue]; + return [NSString stringWithFormat:@"%005i", number]; +} + @end
\ No newline at end of file diff --git a/bindings/objc/src/SwordVerseKey.h b/bindings/objc/src/SwordVerseKey.h index a72911b..a3235f3 100644 --- a/bindings/objc/src/SwordVerseKey.h +++ b/bindings/objc/src/SwordVerseKey.h @@ -33,7 +33,7 @@ - (SwordVerseKey *)initWithRef:(NSString *)aRef; - (SwordVerseKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme; -- (int)index; +- (long)index; - (int)testament; - (void)setTestament:(char)val; - (int)book; @@ -41,7 +41,7 @@ - (int)chapter; - (void)setChapter:(int)val; - (int)verse; -- (void)setVerse:(int)val; +- (void)setVerse:(long)val; - (BOOL)headings; - (void)setHeadings:(BOOL)flag; - (BOOL)autoNormalize; diff --git a/bindings/objc/src/SwordVerseKey.mm b/bindings/objc/src/SwordVerseKey.mm index ca15f17..c745a9b 100644 --- a/bindings/objc/src/SwordVerseKey.mm +++ b/bindings/objc/src/SwordVerseKey.mm @@ -12,27 +12,27 @@ @implementation SwordVerseKey + (SwordVerseKey *)verseKey { - return [[[SwordVerseKey alloc] init] autorelease]; + return [[SwordVerseKey alloc] init]; } + (SwordVerseKey *)verseKeyWithVersification:(NSString *)scheme { - return [[[SwordVerseKey alloc] initWithVersification:scheme] autorelease]; + return [[SwordVerseKey alloc] initWithVersification:scheme]; } + (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef { - return [[[SwordVerseKey alloc] initWithRef:aRef] autorelease]; + return [[SwordVerseKey alloc] initWithRef:aRef]; } + (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme { - return [[[SwordVerseKey alloc] initWithRef:aRef v11n:scheme] autorelease]; + return [[SwordVerseKey alloc] initWithRef:aRef v11n:scheme]; } + (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk { - return [[[SwordVerseKey alloc] initWithSWVerseKey:aVk] autorelease]; + return [[SwordVerseKey alloc] initWithSWVerseKey:aVk]; } + (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy { - return [[[SwordVerseKey alloc] initWithSWVerseKey:aVk makeCopy:copy] autorelease]; + return [[SwordVerseKey alloc] initWithSWVerseKey:aVk makeCopy:copy]; } - (id)init { @@ -60,48 +60,46 @@ } - (SwordVerseKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme { - sword::VerseKey *vk = new sword::VerseKey(); - self = [super initWithSWKey:vk]; + sword::VerseKey vk; + self = [super initWithSWKey:&vk makeCopy:YES]; if(self) { created = YES; if(scheme) { [self setVersification:scheme]; } - + if(aRef) { [self setKeyText:aRef]; - } - } + } + } return self; } -- (void)finalize { - [super finalize]; -} -- (void)dealloc { - [super dealloc]; -} - (SwordKey *)clone { return [SwordVerseKey verseKeyWithSWVerseKey:(sword::VerseKey *)sk]; } +- (long)index { + return ((sword::VerseKey *)sk)->getIndex(); +} + - (BOOL)headings { - return (BOOL)((sword::VerseKey *)sk)->Headings(); + return (BOOL)((sword::VerseKey *)sk)->isIntros(); } - (void)setHeadings:(BOOL)flag { - ((sword::VerseKey *)sk)->Headings(flag); + ((sword::VerseKey *)sk)->setIntros(flag); } - (BOOL)autoNormalize { - return (BOOL)((sword::VerseKey *)sk)->AutoNormalize(); + return (BOOL)((sword::VerseKey *)sk)->isAutoNormalize(); } - (void)setAutoNormalize:(BOOL)flag { - ((sword::VerseKey *)sk)->AutoNormalize(flag); + ((sword::VerseKey *)sk)->setAutoNormalize(flag); } - (int)testament { @@ -132,8 +130,8 @@ ((sword::VerseKey *)sk)->setChapter(val); } -- (void)setVerse:(int)val { - ((sword::VerseKey *)sk)->setVerse(val); +- (void)setVerse:(long)val { + ((sword::VerseKey *)sk)->setVerse((int)val); } - (NSString *)bookName { diff --git a/bindings/objc/src/SwordVerseManager.h b/bindings/objc/src/SwordVerseManager.h index c9667c5..776d672 100644 --- a/bindings/objc/src/SwordVerseManager.h +++ b/bindings/objc/src/SwordVerseManager.h @@ -10,7 +10,6 @@ #ifdef __cplusplus #include <versificationmgr.h> -class sword::VersificationMgr::Book; #endif #define SW_VERSIFICATION_KJV @"KJV" diff --git a/bindings/objc/src/SwordVerseManager.mm b/bindings/objc/src/SwordVerseManager.mm index 72f26fc..9c661dd 100644 --- a/bindings/objc/src/SwordVerseManager.mm +++ b/bindings/objc/src/SwordVerseManager.mm @@ -12,7 +12,7 @@ @interface SwordVerseManager () -@property (retain, readwrite) NSMutableDictionary *booksPerVersification; +@property (strong, readwrite) NSMutableDictionary *booksPerVersification; @end @@ -39,15 +39,7 @@ return self; } -- (void)finalize { - [super finalize]; -} -- (void)dealloc { - [self setBooksPerVersification:nil]; - - [super dealloc]; -} /** convenience method that returns the books for default scheme (KJV) */ - (NSArray *)books { @@ -56,7 +48,7 @@ /** books for a versification scheme */ - (NSArray *)booksForVersification:(NSString *)verseScheme { - NSArray *ret = [booksPerVersification objectForKey:verseScheme]; + NSArray *ret = booksPerVersification[verseScheme]; if(ret == nil) { // hasn't been initialized yet const sword::VersificationMgr::System *system = verseMgr->getVersificationSystem([verseScheme UTF8String]); @@ -65,13 +57,13 @@ for(int i = 0;i < bookCount;i++) { sword::VersificationMgr::Book *book = (sword::VersificationMgr::Book *)system->getBook(i); - SwordBibleBook *bb = [[[SwordBibleBook alloc] initWithBook:book] autorelease]; + SwordBibleBook *bb = [[SwordBibleBook alloc] initWithBook:book]; [bb setNumber:i+1]; // VerseKey-Book() starts at index 1 // add to array [buf addObject:bb]; } - [booksPerVersification setObject:buf forKey:verseScheme]; + booksPerVersification[verseScheme] = buf; ret = buf; } diff --git a/bindings/objc/src/VerseEnumerator.mm b/bindings/objc/src/VerseEnumerator.mm index cd5c665..e7fc44d 100644 --- a/bindings/objc/src/VerseEnumerator.mm +++ b/bindings/objc/src/VerseEnumerator.mm @@ -10,7 +10,7 @@ #import "SwordListKey.h" @interface VerseEnumerator () -@property (retain, readwrite) SwordListKey *listKey; +@property (strong, readwrite) SwordListKey *listKey; @end @implementation VerseEnumerator @@ -26,18 +26,11 @@ return self; } -- (void)finalize { - [super finalize]; -} -- (void)dealloc { - [listKey release]; - [super dealloc]; -} - (NSArray *)allObjects { NSMutableArray *t = [NSMutableArray array]; - for(*[listKey swListKey] = sword::TOP;![listKey swListKey]->Error(); *[listKey swListKey] += 1) { + for(*[listKey swListKey] = sword::TOP;![listKey swListKey]->popError(); *[listKey swListKey] += 1) { [t addObject:[listKey keyText]]; } // position TOP again @@ -48,7 +41,7 @@ - (NSString *)nextObject { NSString *ret = nil; - if(![listKey swListKey]->Error()) { + if(![listKey swListKey]->popError()) { ret = [listKey keyText]; *[listKey swListKey] += 1; } diff --git a/bindings/objc/src/services/Configuration.m b/bindings/objc/src/services/Configuration.m index 67ec709..b48b1e7 100644 --- a/bindings/objc/src/services/Configuration.m +++ b/bindings/objc/src/services/Configuration.m @@ -27,19 +27,10 @@ return [super init]; } -- (void)finalize { - [super finalize]; -} - -- (void)dealloc { - [impl release]; - [super dealloc]; -} - (void)setImpl:(id<Configuration>)configImpl { impl = (Configuration *)configImpl; - [impl retain]; } #pragma mark Configuration implementation diff --git a/bindings/objc/src/services/OSXConfiguration.m b/bindings/objc/src/services/OSXConfiguration.m index 7d53987..3cfcf07 100644 --- a/bindings/objc/src/services/OSXConfiguration.m +++ b/bindings/objc/src/services/OSXConfiguration.m @@ -20,19 +20,43 @@ } - (NSString *)defaultModulePath { - return [@"~/Library/Application Support/Sword" stringByExpandingTildeInPath]; + NSArray *urls = [[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask]; + if(urls.count > 0) { + return [[(NSURL *)urls[0] path] stringByAppendingPathComponent:@"Sword"]; + } + return nil; } - (NSString *)defaultAppSupportPath { - return [@"~/Library/Application Support/MacSword" stringByExpandingTildeInPath]; + NSArray *urls = [[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask]; + if(urls.count > 0) { + NSString *folder = [[(NSURL *)urls[0] path] stringByAppendingPathComponent:@"ObjCSword"]; + if(![[NSFileManager defaultManager] fileExistsAtPath:folder]) { + [[NSFileManager defaultManager] createDirectoryAtPath:folder withIntermediateDirectories:NO attributes:nil error:NULL]; + } + return folder; + } + return nil; } - (NSString *)tempFolder { - return [@"~/Library/Caches/ObjCSword" stringByExpandingTildeInPath]; + NSArray *urls = [[NSFileManager defaultManager] URLsForDirectory:NSCachesDirectory inDomains:NSUserDomainMask]; + if(urls.count > 0) { + NSString *folder = [[(NSURL *)urls[0] path] stringByAppendingPathComponent:@"ObjCSword"]; + if(![[NSFileManager defaultManager] fileExistsAtPath:folder]) { + [[NSFileManager defaultManager] createDirectoryAtPath:folder withIntermediateDirectories:NO attributes:nil error:NULL]; + } + return folder; + } + return nil; } - (NSString *)logFile { - return [@"~/Library/Logs/ObjCSword.log" stringByExpandingTildeInPath]; + NSArray *urls = [[NSFileManager defaultManager] URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]; + if(urls.count > 0) { + return [[[(NSURL *)urls[0] path] stringByAppendingPathComponent:@"Logs"] stringByAppendingPathComponent:@"ObjCSword.log"]; + } + return nil; } @end diff --git a/bindings/objc/sword/Info.plist b/bindings/objc/sword/Info.plist new file mode 100644 index 0000000..1007fd9 --- /dev/null +++ b/bindings/objc/sword/Info.plist @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>$(DEVELOPMENT_LANGUAGE)</string> + <key>CFBundleExecutable</key> + <string>$(EXECUTABLE_NAME)</string> + <key>CFBundleIdentifier</key> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>$(PRODUCT_NAME)</string> + <key>CFBundlePackageType</key> + <string>FMWK</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CFBundleVersion</key> + <string>$(CURRENT_PROJECT_VERSION)</string> + <key>NSPrincipalClass</key> + <string></string> +</dict> +</plist> diff --git a/bindings/objc/sword/SWORD.h b/bindings/objc/sword/SWORD.h new file mode 100644 index 0000000..ed64f79 --- /dev/null +++ b/bindings/objc/sword/SWORD.h @@ -0,0 +1,12 @@ +// +// SWORD.h +// SWORD +// +// Created by scribe on 11/14/17. +// + +#import <Foundation/Foundation.h> + +//@interface SWORD : NSObject + +//@end diff --git a/bindings/objc/sword/sword.m b/bindings/objc/sword/sword.m new file mode 100644 index 0000000..30c0096 --- /dev/null +++ b/bindings/objc/sword/sword.m @@ -0,0 +1,12 @@ +// +// SWORD.m +// SWORD +// +// Created by scribe on 11/14/17. +// + +#import "SWORD.h" + +//@implementation SWORD + +//@end diff --git a/bindings/objc/test/SwordBibleTest.swift b/bindings/objc/test/SwordBibleTest.swift new file mode 100644 index 0000000..e5af36b --- /dev/null +++ b/bindings/objc/test/SwordBibleTest.swift @@ -0,0 +1,28 @@ +// +// SwordBibleTest.swift +// ObjCSword +// +// Created by Manfred Bergmann on 04.10.14. +// +// + +import Foundation +import XCTest + +class SwordBibleTest: XCTestCase { + + var mgr: SwordManager? + + override func setUp() { + super.setUp() + + Configuration.config(withImpl: OSXConfiguration()) + FilterProviderFactory().initWithImpl(DefaultFilterProvider()) + mgr = SwordManager(path:Configuration.config().defaultModulePath()) + } + + func testGetBible() { + let bibleMod = mgr?.module(withName: "GerNeUe") + XCTAssertNotNil(bibleMod); + } +} diff --git a/bindings/objc/test/SwordInstallSourceManagerTest.m b/bindings/objc/test/SwordInstallSourceManagerTest.m new file mode 100644 index 0000000..81f0fb2 --- /dev/null +++ b/bindings/objc/test/SwordInstallSourceManagerTest.m @@ -0,0 +1,253 @@ +// +// SwordInstallSourceManagerTest.m +// ObjCSword +// +// Created by Manfred Bergmann on 12.04.15. +// +// + +#import <XCTest/XCTest.h> +#import "SwordInstallSourceManager.h" +#import "SwordInstallSource.h" +#import "SwordManager.h" +#import "TestGlobals.h" + +@interface SwordInstallSourceManagerTest : XCTestCase + +@end + +@implementation SwordInstallSourceManagerTest + +NSString *testConfigPath = @"/tmp/testmodinst"; +NSString *testModuleManagerPath = @"/tmp/testmodmgr"; +NSString *localInstallSourcePath = @"/Users/mbergmann/Development/MySources/crosswire/Eloquent_MacOS/trunk/sword_src/sword-trunk/bindings/objc/LocalTestInstallSource"; + +- (void)setUp { + NSFileManager *fm = [NSFileManager defaultManager]; + [fm removeItemAtPath:testConfigPath error:NULL]; + [fm removeItemAtPath:testModuleManagerPath error:NULL]; + + [super setUp]; +} + +- (void)tearDown { + [super tearDown]; +} + +- (void)testObjectCreate { + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:@"" createPath:YES]; + XCTAssertTrue(mgr != nil, @""); +} + +- (void)testLocalInstallSource { + SwordInstallSource *is = [[SwordInstallSource alloc] init]; + [is setSource:@"localhost"]; + [is setDirectory:localInstallSourcePath]; + [is setCaption:@"LocalTest"]; + + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + [mgr addInstallSource:is reload:YES]; + + NSDictionary *mods = [mgr listModulesForSource:is]; + XCTAssertTrue([mods count] == 1); + XCTAssertTrue([[((SwordModule *) [mods allValues][0]) name] isEqualToString:@"KJV"]); +} + +- (void)testLocalInstallSourceStatusNew { + SwordInstallSource *is = [[SwordInstallSource alloc] init]; + [is setSource:@"localhost"]; + [is setDirectory:localInstallSourcePath]; + [is setCaption:@"LocalTest"]; + + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + [mgr addInstallSource:is reload:YES]; + + SwordManager *swMgr = [SwordManager managerWithPath:testModuleManagerPath]; + NSArray *stats = [mgr moduleStatusInInstallSource:is baseManager:swMgr]; + for(SwordModule *mod in stats) { + NSLog(@"mod.name=%@", [mod name]); + NSLog(@"mod.stat=%i", [mod status]); + } + + XCTAssertTrue([((SwordModule *) stats[0]).name isEqualToString:@"KJV"]); + XCTAssertTrue(((SwordModule *) stats[0]).status == ModStatNew); +} + +- (void)testLocalInstallSourceStatusSame { + SwordInstallSource *is = [[SwordInstallSource alloc] init]; + [is setSource:@"localhost"]; + [is setDirectory:localInstallSourcePath]; + [is setCaption:@"LocalTest"]; + + SwordManager *swMgr = [SwordManager managerWithPath:testModuleManagerPath]; + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + [mgr addInstallSource:is reload:YES]; + + [mgr installModule:[[mgr listModulesForSource:is] allValues][0] fromSource:is withManager:swMgr]; + + [swMgr reloadManager]; + NSArray *stats = [mgr moduleStatusInInstallSource:is baseManager:swMgr]; + for(SwordModule *mod in stats) { + NSLog(@"mod.name=%@", [mod name]); + NSLog(@"mod.stat=%i", [mod status]); + } + + XCTAssertTrue([((SwordModule *) stats[0]).name isEqualToString:@"KJV"]); + XCTAssertTrue(((SwordModule *) stats[0]).status == ModStatSameVersion); +} + +- (void)testInstallModuleFromLocalSource { + SwordInstallSource *is = [[SwordInstallSource alloc] init]; + [is setSource:@"localhost"]; + [is setDirectory:localInstallSourcePath]; + [is setCaption:@"LocalTest"]; + + SwordManager *swMgr = [SwordManager managerWithPath:testModuleManagerPath]; + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + [mgr addInstallSource:is reload:YES]; + + int stat = [mgr installModule:[[mgr listModulesForSource:is] allValues][0] fromSource:is withManager:swMgr]; + XCTAssertTrue(stat == 0); +} + +- (void)testInitManagerCheckConfigPath { + // make sure this folder doesn't exist at start + NSFileManager *fm = [NSFileManager defaultManager]; + BOOL isDir; + BOOL existsFolder = [fm fileExistsAtPath:testConfigPath isDirectory:&isDir]; + XCTAssertFalse(existsFolder, @""); + + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + + // make sure the folder was created + existsFolder = [fm fileExistsAtPath:testConfigPath isDirectory:&isDir]; + BOOL existsInstallMgrConf = [fm fileExistsAtPath:[testConfigPath stringByAppendingPathComponent:@"InstallMgr.conf"]]; + + XCTAssertTrue(isDir, @""); + XCTAssertTrue(existsFolder, @""); + XCTAssertTrue(existsInstallMgrConf, @""); +} + +- (void)testHasOneInitialInstallSource { + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + + XCTAssertTrue([[mgr installSources] count] == 1, @""); + XCTAssertTrue([[[[[mgr installSources] allValues] firstObject] caption] isEqualToString:@"CrossWire"], @""); + XCTAssertTrue([[[[[mgr installSources] allValues] firstObject] source] isEqualToString:@"ftp.crosswire.org"], @""); + XCTAssertTrue([[[[[mgr installSources] allValues] firstObject] directory] isEqualToString:@"/pub/sword/raw"], @""); +} + +- (void)testDisclaimerNotApproved { + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + + XCTAssertTrue([[mgr installSources] count] == 1, @""); + + NSInteger stat = [mgr refreshInstallSource:[[mgr installSources] allValues][0]]; + NSLog(@"stat: %li", stat); + XCTAssertTrue(stat == -1); +} + +- (void)testRefreshInstallSource { + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + + XCTAssertTrue([[mgr installSources] count] == 1, @""); + + [mgr setUserDisclaimerConfirmed:YES]; + NSInteger stat = [mgr refreshInstallSource:[[mgr installSources] allValues][0]]; + NSLog(@"stat: %li", stat); + XCTAssertTrue(stat == 0); +} + +- (void)testAddInstallSource { + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + + SwordInstallSource *is = [[SwordInstallSource alloc] initWithType:INSTALLSOURCE_TYPE_FTP]; + [is setCaption:@"test"]; + [is setSource:@"foo.bar.local"]; + [is setDirectory:@"/foobar"]; + + [mgr addInstallSource:is reload:YES]; + + XCTAssertTrue([[mgr installSources] count] == 2, @""); + + XCTAssertTrue([[[mgr installSources][@"test"] caption] isEqualToString:@"test"], @""); + XCTAssertTrue([[[mgr installSources][@"test"] source] isEqualToString:@"foo.bar.local"], @""); + XCTAssertTrue([[[mgr installSources][@"test"] directory] isEqualToString:@"/foobar"], @""); +} + +- (void)testRemoveInstallSource { + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + + // first add + SwordInstallSource *is = [[SwordInstallSource alloc] initWithType:INSTALLSOURCE_TYPE_FTP]; + [is setCaption:@"test"]; + [is setSource:@"foo.bar.local"]; + [is setDirectory:@"/foobar"]; + + [mgr addInstallSource:is reload:YES]; + + XCTAssertTrue([[mgr installSources] count] == 2, @""); + + XCTAssertTrue([[[mgr installSources][@"test"] caption] isEqualToString:@"test"], @""); + XCTAssertTrue([[[mgr installSources][@"test"] source] isEqualToString:@"foo.bar.local"], @""); + XCTAssertTrue([[[mgr installSources][@"test"] directory] isEqualToString:@"/foobar"], @""); + + // then remove + [mgr removeInstallSource:is reload:YES]; + + XCTAssertTrue([[mgr installSources] count] == 1, @""); + is = [[[mgr installSources] allValues] firstObject]; + NSLog(@"IS caption: %@", [is caption]); + XCTAssertTrue([[is caption] isEqualToString:@"CrossWire"], @""); +} + +- (void)testUpdateInstallSource { + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr initManager]; + + // first add + SwordInstallSource *is = [[SwordInstallSource alloc] initWithType:INSTALLSOURCE_TYPE_FTP]; + [is setCaption:@"test"]; + [is setSource:@"foo.bar.local"]; + [is setDirectory:@"/foobar"]; + [mgr addInstallSource:is reload:YES]; + + XCTAssertTrue([[mgr installSources] count] == 2, @""); + XCTAssertTrue([[[mgr installSources][@"test"] caption] isEqualToString:@"test"], @""); + XCTAssertTrue([[[mgr installSources][@"test"] source] isEqualToString:@"foo.bar.local"], @""); + XCTAssertTrue([[[mgr installSources][@"test"] directory] isEqualToString:@"/foobar"], @""); + + SwordInstallSource *update = [mgr installSources][@"test"]; + [update setSource:@"local.bar.foo"]; + + [mgr updateInstallSource:update]; + + XCTAssertTrue([[mgr installSources] count] == 2, @""); + XCTAssertTrue([[[mgr installSources][@"test"] caption] isEqualToString:@"test"], @""); + XCTAssertTrue([[[mgr installSources][@"test"] source] isEqualToString:@"local.bar.foo"], @""); + XCTAssertTrue([[[mgr installSources][@"test"] directory] isEqualToString:@"/foobar"], @""); +} + +- (void)testUseAsDefaultManager { + SwordInstallSourceManager *mgr = [[SwordInstallSourceManager alloc] initWithPath:testConfigPath createPath:YES]; + [mgr useAsDefaultManager]; + + SwordInstallSourceManager *mgr2 = [SwordInstallSourceManager defaultManager]; + XCTAssertEqual(mgr, mgr2); +} + +- (void)testExample { + XCTAssert(YES, @"Pass"); +} + +@end diff --git a/bindings/objc/test/SwordListKeyTest.h b/bindings/objc/test/SwordListKeyTest.h index 4d4ff43..fea4ab6 100644 --- a/bindings/objc/test/SwordListKeyTest.h +++ b/bindings/objc/test/SwordListKeyTest.h @@ -6,9 +6,9 @@ // Copyright 2009 __MyCompanyName__. All rights reserved. // -#import <SenTestingKit/SenTestingKit.h> +#import <XCTest/XCTest.h> -@interface SwordListKeyTest : SenTestCase { +@interface SwordListKeyTest : XCTestCase { } @end diff --git a/bindings/objc/test/SwordListKeyTest.m b/bindings/objc/test/SwordListKeyTest.m index 73d47dc..7b3181c 100644 --- a/bindings/objc/test/SwordListKeyTest.m +++ b/bindings/objc/test/SwordListKeyTest.m @@ -12,32 +12,32 @@ @implementation SwordListKeyTest - (void)testContainsKey { - SwordListKey *lk = [SwordListKey listKeyWithRef:@"Gen 1:1-5"]; + SwordListKey *lk = [SwordListKey listKeyWithRef:@"Gen 1:1-5" v11n:@"KJV"]; SwordVerseKey *vk = [SwordVerseKey verseKeyWithRef:@"Gen 1:3"]; - STAssertTrue([lk containsKey:vk], @""); + XCTAssertTrue([lk containsKey:vk], @""); } /* - (void)testNumberOfVerses { - SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:2-20"]; - STAssertNotNil(lk, @""); - STAssertTrue(([lk numberOfVerses] == 19), @""); + SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:2-20" v11n:@"KJV"]; + XCTAssertNotNil(lk, @""); + XCTAssertTrue(([lk numberOfVerses] == 19), @""); } */ - (void)testVerseEnumeratorAllObjects { - SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:2-20"]; - STAssertNotNil(lk, @""); + SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:2-20" v11n:@"KJV"]; + XCTAssertNotNil(lk, @""); VerseEnumerator *ve = [lk verseEnumerator]; NSArray *verseRefs = [ve allObjects]; - STAssertNotNil(verseRefs, @""); - STAssertTrue(([verseRefs count] == 19), @""); + XCTAssertNotNil(verseRefs, @""); + XCTAssertTrue(([verseRefs count] == 19), @""); } - (void)testVerseEnumeratorNextObject { - SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:2-20"]; - STAssertNotNil(lk, @""); + SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:2-20" v11n:@"KJV"]; + XCTAssertNotNil(lk, @""); VerseEnumerator *ve = [lk verseEnumerator]; int count = 0; @@ -45,7 +45,7 @@ while((ref = [ve nextObject])) { count++; } - STAssertTrue((count == 19), @""); + XCTAssertTrue((count == 19), @""); } @end diff --git a/bindings/objc/test/SwordLocaleManagerTest.swift b/bindings/objc/test/SwordLocaleManagerTest.swift new file mode 100644 index 0000000..7360af3 --- /dev/null +++ b/bindings/objc/test/SwordLocaleManagerTest.swift @@ -0,0 +1,30 @@ +// +// SwordLocaleManagerTest.swift +// ObjCSword +// +// Created by Manfred Bergmann on 02.10.16. +// +// + +import XCTest + +class SwordLocaleManagerTest: XCTestCase { + + override func setUp() { + super.setUp() + } + + override func tearDown() { + super.tearDown() + } + + func testDefaultLocalSetup() { + let locMgr = SwordLocaleManager.default() + locMgr?.initLocale() + + let defaultLocName = locMgr?.getDefaultLocaleName() + print(defaultLocName) + XCTAssert(defaultLocName != nil) + XCTAssert(defaultLocName == "de") + } +} diff --git a/bindings/objc/test/SwordManagerTest.h b/bindings/objc/test/SwordManagerTest.h deleted file mode 100644 index 167d335..0000000 --- a/bindings/objc/test/SwordManagerTest.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// SwordManagerTest.h -// ObjCSword -// -// Created by Manfred Bergmann on 14.06.10. -// Copyright 2010 Software by MABE. All rights reserved. -// - -#import <SenTestingKit/SenTestingKit.h> - - -@interface SwordManagerTest : SenTestCase { - -} - -@end diff --git a/bindings/objc/test/SwordManagerTest.m b/bindings/objc/test/SwordManagerTest.m index d2c93dd..5b48c3e 100644 --- a/bindings/objc/test/SwordManagerTest.m +++ b/bindings/objc/test/SwordManagerTest.m @@ -2,25 +2,89 @@ // SwordManagerTest.m // ObjCSword // -// Created by Manfred Bergmann on 14.06.10. -// Copyright 2010 Software by MABE. All rights reserved. +// Created by Manfred Bergmann on 02.03.16. +// // +#import <XCTest/XCTest.h> #import <ObjCSword/ObjCSword.h> -#import "SwordManagerTest.h" -@implementation SwordManagerTest +@interface SwordManagerTest : XCTestCase + +@end + +@implementation SwordManagerTest { + SwordManager *mgr; +} - (void)setUp { - [Configuration configWithImpl:[[[OSXConfiguration alloc] init] autorelease]]; + [super setUp]; + + [Configuration configWithImpl:[[OSXConfiguration alloc] init]]; + [[FilterProviderFactory providerFactory] initWithImpl:[[DefaultFilterProvider alloc] init]]; + + NSString *modulePath = [[[NSBundle bundleForClass:[self class]] resourcePath] stringByAppendingPathComponent:@"TestModules"]; + + mgr = [SwordManager managerWithPath:modulePath]; +} + +- (void)testAvailableModules { + XCTAssert(mgr != nil); + + NSInteger count = [[mgr allModules] count]; + XCTAssert(count > 0); + NSLog(@"Modules: %lu", count); } -- (void)testSwordManagerInit { - NSString *modPath = [[Configuration config] defaultModulePath]; - NSLog(@"%@", modPath); +- (void)testGetModule { + SwordModule *mod = [mgr moduleWithName:@"KJV"]; + XCTAssert(mod != nil); + XCTAssert([[mod name] isEqualToString:@"KJV"]); +} + +- (void)testReloadWithRenderedKey_String { + SwordModule *mod = [mgr moduleWithName:@"KJV"]; + + [mod setKeyString:@"Gen 1:1"]; + NSString *text = [mod renderedText]; + XCTAssert(text != nil); + XCTAssert(text.length > 0); + NSLog(@"text: %@", text); + + [mgr reloadManager]; + mod = [mgr moduleWithName:@"KJV"]; + XCTAssert(mod != nil); + XCTAssert([[mod name] isEqualToString:@"KJV"]); +} + +- (void)testReloadWithRenderedKey_SwordKey { + SwordModule *mod = [mgr moduleWithName:@"KJV"]; + + SwordKey *key = [SwordKey swordKeyWithRef:@"Gen 1"]; + [mod setSwordKey:key]; + NSString *text = [mod renderedText]; + XCTAssert(text != nil); + XCTAssert(text.length > 0); + NSLog(@"text: %@", text); + + [mgr reloadManager]; + mod = [mgr moduleWithName:@"KJV"]; + XCTAssert(mod != nil); + XCTAssert([[mod name] isEqualToString:@"KJV"]); +} + +- (void)testReloadWithRenderedKey_CustomRender { + SwordModule *mod = [mgr moduleWithName:@"KJV"]; + + NSArray *textEntries = [(SwordBible *)mod renderedTextEntriesForRef:@"Gen 1" context:0]; + XCTAssert(textEntries != nil); + NSLog(@"Entries: %lu", [textEntries count]); + XCTAssert([textEntries count] == 31); - SwordManager *sm = [SwordManager managerWithPath:modPath]; - STAssertTrue([[sm modules] count] > 0, @""); + [mgr reloadManager]; + mod = [mgr moduleWithName:@"KJV"]; + XCTAssert(mod != nil); + XCTAssert([[mod name] isEqualToString:@"KJV"]); } @end diff --git a/bindings/objc/test/SwordManagerTest.swift b/bindings/objc/test/SwordManagerTest.swift new file mode 100644 index 0000000..8500eae --- /dev/null +++ b/bindings/objc/test/SwordManagerTest.swift @@ -0,0 +1,67 @@ +// +// SwordManagerTest.swift +// ObjCSword +// +// Created by Manfred Bergmann on 02.03.16. +// +// + +import XCTest + +class SwordManagerTest: XCTestCase { + + var mgr: SwordManager? + + override func setUp() { + super.setUp() + + let modulesDir = NSBundle(forClass:self.dynamicType).resourcePath!.stringByAppendingString("/TestModules") + NSLog("modulesDir: \(modulesDir)") + + Configuration.configWithImpl(OSXConfiguration()) + FilterProviderFactory().initWithImpl(DefaultFilterProvider()) + mgr = SwordManager(path:modulesDir) + } + + func testAvailableModules() { + XCTAssert(mgr != nil) + XCTAssert(mgr?.modules.count > 0) + NSLog("modules: \(mgr?.modules.count)") + } + + func testGetModule() { + let mod = mgr?.moduleWithName("kjv") + XCTAssert(mod != nil) + XCTAssert(mod?.name() == "KJV") + } + + func testReload() { + var mod = mgr?.moduleWithName("kjv") + + mgr?.reloadManager() + mod = mgr?.moduleWithName("kjv") + + XCTAssert(mod != nil) + XCTAssert(mod?.name() == "KJV") + } + + func testReloadWithKeyString() { + var mod = mgr?.moduleWithName("kjv") + + let te = mod?.renderedTextEntriesForRef("Gen 1") + XCTAssert(te?.count > 0) + NSLog(te![0] as! String) + +// mod?.setKeyString("Gen 1") +// let text = mod?.renderedText() +// XCTAssert(text != nil) +// XCTAssert(text?.lengthOfBytesUsingEncoding(NSUTF8StringEncoding) > 0) +// NSLog(text!) + + mgr?.reloadManager() + mod = mgr?.moduleWithName("kjv") + + XCTAssert(mod != nil) + XCTAssert(mod?.name() == "KJV") + } +} diff --git a/bindings/objc/test/SwordModuleLongRunTest.h b/bindings/objc/test/SwordModuleLongRunTest.h index d415885..5eda8da 100644 --- a/bindings/objc/test/SwordModuleLongRunTest.h +++ b/bindings/objc/test/SwordModuleLongRunTest.h @@ -6,11 +6,11 @@ // Copyright 2008 __MyCompanyName__. All rights reserved. // -#import <SenTestingKit/SenTestingKit.h> +#import <XCTest/XCTest.h> @class SwordModule; -@interface SwordModuleTest : SenTestCase { +@interface SwordModuleLongRunTest : XCTestCase { SwordModule *mod; } diff --git a/bindings/objc/test/SwordModuleLongRunTest.mm b/bindings/objc/test/SwordModuleLongRunTest.mm index 699a18c..d63d4f5 100644 --- a/bindings/objc/test/SwordModuleLongRunTest.mm +++ b/bindings/objc/test/SwordModuleLongRunTest.mm @@ -6,33 +6,20 @@ // Copyright 2008 __MyCompanyName__. All rights reserved. // -#import "SwordModuleTest.h" -#ifdef TARGET_IPHONE_SIMULATOR -#import "SwordManager.h" -#import "Configuration.h" -#import "iOSConfiguration.h" -#import "SwordModule.h" -#import "SwordBibleTextEntry.h" -#import "VerseEnumerator.h" -#import "SwordListKey.h" -#else #import "ObjCSword/ObjCSword.h" -#endif +#import "SwordModuleLongRunTest.h" +#import "SwordModule+Index.h" -@implementation SwordModuleTest +@implementation SwordModuleLongRunTest - (void)setUp { -#ifdef TARGET_IPHONE_SIMULATOR - [[Configuration config] setClass:[iOSConfiguration class]]; -#else - [[Configuration config] setClass:[OSXConfiguration class]]; -#endif - mod = [[SwordManager defaultManager] moduleWithName:@"GerNeUe"]; + [Configuration configWithImpl:[[OSXConfiguration alloc] init]]; + mod = [[SwordManager defaultManager] moduleWithName:@"GerNeUe"]; } - (void)testCreateSearchIndex { SwordModule *sm = [[SwordManager defaultManager] moduleWithName:@"GerSch"]; - STAssertNotNil(sm, @"Module is nil"); + XCTAssertNotNil(sm, @"Module is nil"); NSLog(@"creating clucene search index..."); [sm createSearchIndex]; @@ -77,7 +64,7 @@ [com incKeyPosition]; count++; } - STAssertTrue((count == 1), @""); + XCTAssertTrue((count == 1), @""); } - (void)testCommentarySkipLinksNoPersist { @@ -97,7 +84,7 @@ [lk increment]; count++; } - STAssertTrue((count == 1), @""); + XCTAssertTrue((count == 1), @""); } @end diff --git a/bindings/objc/test/SwordModuleTest.h b/bindings/objc/test/SwordModuleTest.h index 95135fc..0eda60b 100644 --- a/bindings/objc/test/SwordModuleTest.h +++ b/bindings/objc/test/SwordModuleTest.h @@ -6,13 +6,4 @@ // Copyright 2010 Software by MABE. All rights reserved. // -#import <SenTestingKit/SenTestingKit.h> - -@class SwordModule, SwordManager; - -@interface SwordModuleTest : SenTestCase { - SwordManager *mgr; - SwordModule *mod; -} - -@end +#import <XCTest/XCTest.h> diff --git a/bindings/objc/test/SwordModuleTest.m b/bindings/objc/test/SwordModuleTest.m index a308513..2f1a489 100644 --- a/bindings/objc/test/SwordModuleTest.m +++ b/bindings/objc/test/SwordModuleTest.m @@ -6,43 +6,184 @@ // Copyright 2010 Software by MABE. All rights reserved. // -#import <ObjCSword/ObjCSword.h> #import "SwordModuleTest.h" +#import <ObjCSword/ObjCSword.h> + +@class SwordModule, SwordManager; + +@interface SwordModuleTest : XCTestCase { + SwordManager *mgr; + SwordModule *mod; +} + +@end @implementation SwordModuleTest - (void)setUp { - [Configuration configWithImpl:[[[OSXConfiguration alloc] init] autorelease]]; - mgr = [SwordManager managerWithPath:[[Configuration config] defaultModulePath]]; - mod = [mgr moduleWithName:@"GerNeUe"]; + [Configuration configWithImpl:[[OSXConfiguration alloc] init]]; + + [[FilterProviderFactory providerFactory] initWithImpl:[[DefaultFilterProvider alloc] init]]; + + mgr = [SwordManager managerWithPath:[[[NSBundle bundleForClass:[self class]] resourcePath] stringByAppendingPathComponent:@"TestModules"]]; + mod = [mgr moduleWithName:@"KJV"]; } -- (void)testLoopRenderedVerses { - SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"]; - STAssertNotNil(bible, @"Module is nil"); +- (void)testModuleIntroductionGer { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerNeUe"]; - NSArray *verses = [bible renderedTextEntriesForRef:@"Gen"]; - STAssertNotNil(verses, @""); - STAssertTrue([bible numberOfVerseKeysForReference:@"Gen"] == [verses count], @""); + NSString *modIntro = [bible moduleIntroduction]; + NSLog(@"mod intro: %@", modIntro); + XCTAssertNotNil(modIntro); + XCTAssertTrue([@"Im Anfang schuf Gott Himmel und Erde." isEqualToString:modIntro]); } -- (void)testRenderedVerseText { - SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"]; - STAssertNotNil(bible, @"Module is nil"); +/* +- (void)testFirstBookATIntro { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"KJV"]; - SwordModuleTextEntry *text = [bible textEntryForKeyString:@"gen1.1" textType:TextTypeRendered]; - STAssertNotNil(text, @""); - STAssertTrue([[text text] length] > 0, @""); + SwordBibleBook *book = [bible bookList][0]; + NSString *intro = [bible bookIntroductionFor:book]; + NSLog(@"testament: '%i', book '%@' intro: %@", [book testament], [book name], intro); + XCTAssertNotNil(intro); + XCTAssertTrue([intro hasPrefix:@" <!P><br />Das erste Buch der Bibel wird auch Genesis"]); } +*/ -- (void)testCloneModule { - SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"]; - STAssertNotNil(bible, @"Module is nil"); +- (void)testFirstBookATIntroGer { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerNeUe"]; - /* - SwordBible *cloned = (SwordBible *)[bible clone]; - STAssertNotNil(cloned, @"Module is nil"); - */ + SwordBibleBook *book = [bible bookList][0]; + NSString *intro = [bible bookIntroductionFor:book]; + NSLog(@"testament: '%i', book '%@' intro: %@", [book testament], [book name], intro); + XCTAssertNotNil(intro); + XCTAssertTrue([intro hasPrefix:@" <!P><br />Das erste Buch der Bibel wird auch Genesis"]); +} + +/* +- (void)testFirstBookNTIntro { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"KJV"]; + + SwordBibleBook *book = [bible bookWithNamePrefix:@"Mat"]; + NSString *intro = [bible bookIntroductionFor:book]; + NSLog(@"testament: '%i', book '%@' intro: %@", [book testament], [book name], intro); + XCTAssertNotNil(intro); + XCTAssertTrue([intro hasPrefix:@" <!P><br />Um die Zeit der Apostelversammlung herum"]); +} +*/ + +- (void)testJesusWordsInRed { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"KJV"]; + XCTAssertNotNil(bible, @"Module is nil"); + + [mgr setGlobalOption:SW_OPTION_REDLETTERWORDS value:SW_ON]; + SwordBibleTextEntry *text = (SwordBibleTextEntry *) [bible renderedTextEntryForRef:@"Mat 4:4"]; + XCTAssertTrue(text != nil); + NSLog(@"Mat 4:4: %@", [text text]); + XCTAssertTrue([[text text] containsString:@"But he answered and said, <font color=\"red\"> It is written, Man shall not live by bread alone, but by every word that proceedeth out of the mouth of God.</font>"]); +} + +- (void)testStrongsNumberHebrewRetrieval { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"KJV"]; + XCTAssertNotNil(bible, @"Module is nil"); + + [bible setKeyString:@"Gen 1:1"]; + NSArray *strongsNumbers = [bible entryAttributeValuesLemma]; + XCTAssertTrue(strongsNumbers != nil); + XCTAssertTrue([strongsNumbers count] > 0); + NSString *combinedString = [strongsNumbers componentsJoinedByString:@","]; + NSLog(@"%@", combinedString); + XCTAssertTrue([@"H07225,H0430,H0853 H01254,H08064,H0853,H0776" isEqualToString:combinedString]); +} + +- (void)testStrongsNumberHebrewNormalizedRetrieval { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"KJV"]; + XCTAssertNotNil(bible, @"Module is nil"); + + [bible setKeyString:@"Gen 1:1"]; + NSArray *strongsNumbers = [bible entryAttributeValuesLemmaNormalized]; + XCTAssertTrue(strongsNumbers != nil); + XCTAssertTrue([strongsNumbers count] > 0); + NSString *combinedString = [strongsNumbers componentsJoinedByString:@","]; + NSLog(@"%@", combinedString); + XCTAssertTrue([@"H07225,H00430,H00853,H01254,H08064,H00853,H00776" isEqualToString:combinedString]); +} + +- (void)testStrongsNumberGreekRetrieval { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"KJV"]; + XCTAssertNotNil(bible, @"Module is nil"); + + [bible setKeyString:@"Mat 1:1"]; + NSArray *strongsNumbers = [bible entryAttributeValuesLemma]; + XCTAssertTrue(strongsNumbers != nil); + XCTAssertTrue([strongsNumbers count] > 0); + NSString *combinedString = [strongsNumbers componentsJoinedByString:@","]; + NSLog(@"%@", combinedString); + XCTAssertTrue([@"G976,G1078,G2424,G5547,G5207,G1138,G5207,G11" isEqualToString:combinedString]); +} + +- (void)testStrongsNumberGreekNormalizedRetrieval { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"KJV"]; + XCTAssertNotNil(bible, @"Module is nil"); + + [bible setKeyString:@"Mat 1:1"]; + NSArray *strongsNumbers = [bible entryAttributeValuesLemmaNormalized]; + XCTAssertTrue(strongsNumbers != nil); + XCTAssertTrue([strongsNumbers count] > 0); + NSString *combinedString = [strongsNumbers componentsJoinedByString:@","]; + NSLog(@"%@", combinedString); + XCTAssertTrue([@"G00976,G01078,G02424,G05547,G05207,G01138,G05207,G00011" isEqualToString:combinedString]); +} + +- (void)testFirstBookNTIntroGer { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerNeUe"]; + + SwordBibleBook *book = [bible bookWithNamePrefix:@"Mat"]; + NSString *intro = [bible bookIntroductionFor:book]; + NSLog(@"testament: '%i', book '%@' intro: %@", [book testament], [book name], intro); + XCTAssertNotNil(intro); + XCTAssertTrue([intro hasPrefix:@" <!P><br />Um die Zeit der Apostelversammlung herum"]); +} + +- (void)testPreverseHeading { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"KJV"]; + + [mgr setGlobalOption:SW_OPTION_HEADINGS value:SW_ON]; + SwordBibleTextEntry *text = (SwordBibleTextEntry *) [bible renderedTextEntryForRef:@"Numbers 1:47"]; + NSLog(@"Preverse text: %@", [text preVerseHeading]); + XCTAssertTrue([[text preVerseHeading] length] > 0); + XCTAssertTrue([[text preVerseHeading] isEqualToString:@"<title>Die Sonderstellung der Leviten</title>"]); + [mgr setGlobalOption:SW_OPTION_HEADINGS value:SW_OFF]; +} + +- (void)testPreverseHeading2 { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerNeUe"]; + + [mgr setGlobalOption:SW_OPTION_HEADINGS value:SW_ON]; + SwordBibleTextEntry *text = (SwordBibleTextEntry *) [bible renderedTextEntryForRef:@"Numbers 4:21"]; + NSLog(@"Preverse text: %@", [text preVerseHeading]); + XCTAssertTrue([[text preVerseHeading] length] > 0); + XCTAssertTrue([[text preVerseHeading] isEqualToString:@"<title>Die Gerschoniten</title>"]); + [mgr setGlobalOption:SW_OPTION_HEADINGS value:SW_OFF]; +} + +- (void)testLoopRenderedVerses { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"KJV"]; + XCTAssertNotNil(bible, @"Module is nil"); + + NSArray *verses = [bible renderedTextEntriesForRef:@"Gen"]; + XCTAssertNotNil(verses, @""); + XCTAssertTrue([bible numberOfVerseKeysForReference:@"Gen"] == [verses count], @""); +} + +- (void)testRenderedVerseText { + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"KJV"]; + XCTAssertNotNil(bible, @"Module is nil"); + + SwordModuleTextEntry *text = [bible renderedTextEntryForRef:@"gen1.1"]; + XCTAssertNotNil(text, @""); + NSLog(@"text: %@", [text text]); + XCTAssertTrue([[text text] length] > 0, @""); } - (void)testLoopWithModulePos { @@ -129,7 +270,7 @@ [vk setKeyText:[lk keyText]]; long lowVerse = [vk verse] - context; long highVerse = lowVerse + (context * 2); - [vk setVerse:lowVerse]; + [vk setVerse:(int)lowVerse]; [mod setSwordKey:vk]; for(;lowVerse <= highVerse;lowVerse++) { ref = [vk keyText]; @@ -149,13 +290,20 @@ } } -- (void)testStrippedTextForRef { - SwordVerseKey *vk = [SwordVerseKey verseKeyWithRef:@"1Mo 1:2"]; +- (void)testVersePositioning { + SwordVerseKey *vk = [SwordVerseKey verseKeyWithRef:@"gen 1:2"]; NSLog(@"start position: %@", [vk keyText]); [vk decrement]; NSLog(@"decrement position: %@", [vk keyText]); + XCTAssertTrue([vk chapter] == 1); + XCTAssertTrue([vk book] == 1); + XCTAssertTrue([vk verse] == 1); + [vk setVerse:[vk verse] + 3]; NSLog(@"verse + 3: %@", [vk keyText]); + XCTAssertTrue([vk chapter] == 1); + XCTAssertTrue([vk book] == 1); + XCTAssertTrue([vk verse] == 4); } @end diff --git a/bindings/objc/test/TestGlobals.h b/bindings/objc/test/TestGlobals.h new file mode 100644 index 0000000..f344c5b --- /dev/null +++ b/bindings/objc/test/TestGlobals.h @@ -0,0 +1,12 @@ +// +// TestGlobals.h +// ObjCSword +// +// Created by Manfred Bergmann on 02.03.16. +// +// + +#ifndef TestGlobals_h +#define TestGlobals_h + +#endif /* TestGlobals_h */ diff --git a/bindings/objc/test/Tests-Bridging-Header.h b/bindings/objc/test/Tests-Bridging-Header.h new file mode 100644 index 0000000..d4dd0a5 --- /dev/null +++ b/bindings/objc/test/Tests-Bridging-Header.h @@ -0,0 +1,6 @@ +// +// Use this file to import your target's public headers that you would like to expose to Swift. +// + +#import <ObjCSword/ObjCSword.h> +#import "TestGlobals.h" diff --git a/bindings/objc/test/Tests-Info.plist b/bindings/objc/test/Tests-Info.plist index c285a47..66a5a8a 100644 --- a/bindings/objc/test/Tests-Info.plist +++ b/bindings/objc/test/Tests-Info.plist @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIdentifier</key> - <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> diff --git a/bindings/swig/deprecations.i b/bindings/swig/deprecations.i index bab0381..fa883a7 100644 --- a/bindings/swig/deprecations.i +++ b/bindings/swig/deprecations.i @@ -10,10 +10,12 @@ %ignore sword::VerseTreeKey::operator const char *; %ignore sword::XMLTag::operator const char *; -%ignore sword::StatusReporter::statusUpdate; %ignore sword::SWDisplay::Display(SWModule&); +%ignore sword::StatusReporter::statusUpdate(double ,double); +%feature("nodirector") sword::StatusReporter::statusUpdate(double ,double); + %ignore sword::SWKey::Error(); %ignore sword::SWKey::Persist() const; %ignore sword::SWKey::Persist(signed char); @@ -60,3 +62,20 @@ %ignore sword::VerseKey::TestamentIndex() const; %ignore sword::VerseKey::UpperBound; %ignore sword::VerseKey::Verse; + +%ignore sword::SWMgr::CreateMods(bool); +%ignore sword::SWMgr::DeleteMods(); +%ignore sword::SWMgr::AddGlobalOptions(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator); +%ignore sword::SWMgr::AddLocalOptions(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator); +%ignore sword::SWMgr::AddEncodingFilters(SWModule *, ConfigEntMap &); +%ignore sword::SWMgr::AddRenderFilters(SWModule *, ConfigEntMap &); +%ignore sword::SWMgr::AddStripFilters(SWModule *, ConfigEntMap &); +%ignore sword::SWMgr::AddStripFilters(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator); +%ignore sword::SWMgr::AddRawFilters(SWModule *, ConfigEntMap &); +%ignore sword::SWMgr::getHomeDir(); +%ignore sword::SWMgr::Load(); + +%ignore sword::SWConfig::Sections; +%ignore sword::SWConfig::filename; +%ignore sword::SWConfig::Load(); +%ignore sword::SWConfig::Save(); diff --git a/bindings/swig/package/Makefile.in b/bindings/swig/package/Makefile.in index 3c056c1..9d9d7ee 100644 --- a/bindings/swig/package/Makefile.in +++ b/bindings/swig/package/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. @@ -81,7 +81,7 @@ host_triplet = @host@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) depcomp README \ - compile config.guess config.sub install-sh missing ltmain.sh + config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -605,16 +605,10 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -656,10 +650,9 @@ distcheck: dist && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff --git a/bindings/swig/package/aclocal.m4 b/bindings/swig/package/aclocal.m4 index cd5e8b9..0c2ed70 100644 --- a/bindings/swig/package/aclocal.m4 +++ b/bindings/swig/package/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -220,21 +220,6 @@ m4_popdef([pkg_default]) m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -247,10 +232,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,7 +251,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -633,12 +618,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -m4_define([AC_PROG_CC], -m4_defn([AC_PROG_CC]) -[_AM_PROG_CC_C_O -]) - # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -747,48 +726,7 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl - -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) - fi -fi]) +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -796,6 +734,7 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -1013,70 +952,6 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_PROG_CC_C_O -# --------------- -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -# to automatically call this. -AC_DEFUN([_AM_PROG_CC_C_O], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -AC_LANG_PUSH([C])dnl -AC_CACHE_CHECK( - [whether $CC understands -c and -o together], - [am_cv_prog_cc_c_o], - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i]) -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -AC_LANG_POP([C])]) - -# For backward compatibility. -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) - # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. diff --git a/bindings/swig/package/compile b/bindings/swig/package/compile deleted file mode 100755 index 531136b..0000000 --- a/bindings/swig/package/compile +++ /dev/null @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey@cygnus.com>. -# -# 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; either version 2, or (at your option) -# any later version. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/bindings/swig/package/config.guess b/bindings/swig/package/config.guess index 1f5c50c..b79252d 100755 --- a/bindings/swig/package/config.guess +++ b/bindings/swig/package/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ;; esac @@ -826,7 +826,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - *:MSYS*:*) + i*:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - or32:Linux:*:* | or1k*:Linux:*:*) + or32:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,26 +1260,16 @@ EOF if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1371,6 +1361,154 @@ EOF exit ;; esac +eval $set_cc_for_build +cat >$dummy.c <<EOF +#ifdef _SEQUENT_ +# include <sys/types.h> +# include <sys/utsname.h> +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include <sys/param.h> + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include <sys/param.h> +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + cat >&2 <<EOF $0: unable to guess system type diff --git a/bindings/swig/package/config.sub b/bindings/swig/package/config.sub index 66c5074..c765b34 100755 --- a/bindings/swig/package/config.sub +++ b/bindings/swig/package/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2014-07-28' +timestamp='2013-04-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -257,7 +257,7 @@ case $basic_machine in | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | c8051 | clipper \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -265,7 +265,6 @@ case $basic_machine in | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -283,10 +282,8 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -298,7 +295,8 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -326,7 +324,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -374,7 +372,7 @@ case $basic_machine in | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -383,7 +381,6 @@ case $basic_machine in | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -403,10 +400,8 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -418,7 +413,6 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ - | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -800,7 +794,7 @@ case $basic_machine in os=-mingw64 ;; mingw32) - basic_machine=i686-pc + basic_machine=i386-pc os=-mingw32 ;; mingw32ce) @@ -828,10 +822,6 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; msdos) basic_machine=i386-pc os=-msdos @@ -840,7 +830,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i686-pc + basic_machine=i386-pc os=-msys ;; mvs) @@ -1377,14 +1367,14 @@ case $os in | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1556,9 +1546,6 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; - c8051-*) - os=-elf - ;; hexagon-*) os=-elf ;; @@ -1602,6 +1589,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff --git a/bindings/swig/package/configure b/bindings/swig/package/configure index 3bf898b..685f159 100755 --- a/bindings/swig/package/configure +++ b/bindings/swig/package/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 2875 . +# From configure.ac Revision: 3063 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for swordbindings 1.6.2. # @@ -2310,7 +2310,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.14' +am__api_version='1.13' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2876,47 +2876,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 - fi -fi # --------------------------------------------------------------------- @@ -3716,65 +3675,6 @@ ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -6764,7 +6664,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6782,10 +6682,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6804,10 +6701,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff --git a/bindings/swig/package/configure.ac b/bindings/swig/package/configure.ac index a8e1806..f7995e3 100644 --- a/bindings/swig/package/configure.ac +++ b/bindings/swig/package/configure.ac @@ -4,7 +4,7 @@ AC_INIT([swordbindings],[1.6.2]) AC_CONFIG_SRCDIR(sword.i) AC_PREREQ(2.59) -AC_REVISION($Revision: 2875 $) +AC_REVISION($Revision: 3063 $) AM_INIT_AUTOMAKE AC_CONFIG_MACRO_DIR([m4]) diff --git a/bindings/swig/package/deprecations.i b/bindings/swig/package/deprecations.i index bab0381..fa883a7 100644 --- a/bindings/swig/package/deprecations.i +++ b/bindings/swig/package/deprecations.i @@ -10,10 +10,12 @@ %ignore sword::VerseTreeKey::operator const char *; %ignore sword::XMLTag::operator const char *; -%ignore sword::StatusReporter::statusUpdate; %ignore sword::SWDisplay::Display(SWModule&); +%ignore sword::StatusReporter::statusUpdate(double ,double); +%feature("nodirector") sword::StatusReporter::statusUpdate(double ,double); + %ignore sword::SWKey::Error(); %ignore sword::SWKey::Persist() const; %ignore sword::SWKey::Persist(signed char); @@ -60,3 +62,20 @@ %ignore sword::VerseKey::TestamentIndex() const; %ignore sword::VerseKey::UpperBound; %ignore sword::VerseKey::Verse; + +%ignore sword::SWMgr::CreateMods(bool); +%ignore sword::SWMgr::DeleteMods(); +%ignore sword::SWMgr::AddGlobalOptions(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator); +%ignore sword::SWMgr::AddLocalOptions(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator); +%ignore sword::SWMgr::AddEncodingFilters(SWModule *, ConfigEntMap &); +%ignore sword::SWMgr::AddRenderFilters(SWModule *, ConfigEntMap &); +%ignore sword::SWMgr::AddStripFilters(SWModule *, ConfigEntMap &); +%ignore sword::SWMgr::AddStripFilters(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator); +%ignore sword::SWMgr::AddRawFilters(SWModule *, ConfigEntMap &); +%ignore sword::SWMgr::getHomeDir(); +%ignore sword::SWMgr::Load(); + +%ignore sword::SWConfig::Sections; +%ignore sword::SWConfig::filename; +%ignore sword::SWConfig::Load(); +%ignore sword::SWConfig::Save(); diff --git a/bindings/swig/package/m4/libtool.m4 b/bindings/swig/package/m4/libtool.m4 index f12cfdf..56666f0 100644 --- a/bindings/swig/package/m4/libtool.m4 +++ b/bindings/swig/package/m4/libtool.m4 @@ -1312,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1326,10 +1326,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1348,10 +1345,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff --git a/bindings/swig/package/missing b/bindings/swig/package/missing index db98974..cdea514 100755 --- a/bindings/swig/package/missing +++ b/bindings/swig/package/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2012-06-26.16; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ give_advice () ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." + echo "the 'automa4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff --git a/bindings/swig/package/rendercallback.h b/bindings/swig/package/rendercallback.h index bfb54fc..b00b973 100755 --- a/bindings/swig/package/rendercallback.h +++ b/bindings/swig/package/rendercallback.h @@ -215,7 +215,7 @@ public: bool osisQToTick; bool inBold; bool inXRefNote; - bool BiblicalText; + bool isBiblicalText; int suspendLevel; SWBuf wordsOfChristStart; SWBuf wordsOfChristEnd; @@ -240,8 +240,8 @@ public sword::BasicFilterUserData { public: SWBuf inscriptRef; - bool SecHead; - bool BiblicalText; + bool inSecHead; + bool isBiblicalText; SWBuf version; XMLTag startTag; diff --git a/bindings/swig/package/swconfig.i b/bindings/swig/package/swconfig.i index b1f6834..4479093 100644 --- a/bindings/swig/package/swconfig.i +++ b/bindings/swig/package/swconfig.i @@ -5,21 +5,21 @@ %ignore sword::SWConfig::operator[]; %ignore sword::SWConfig::operator+=; %ignore sword::SWConfig::sections; -%ignore sword::SWConfig::Sections; +%ignore sword::SWConfig::getSections(); %include "swconfig.h" %extend sword::SWConfig { void set(const char* group, const char* entry, const char* value) { - self->Sections[group][entry] = value; + self->getSection(group)[entry] = value; }; const char* get(const char* group, const char* entry) { - return self->Sections[group][entry].c_str(); + return self->getSection(group)[entry].c_str(); }; PySectionMap /*std::map < sword::SWBuf, std::multimap <sword::SWBuf, sword::SWBuf> > */ *getSections() { - return (PySectionMap* /*std::map < sword::SWBuf, std::multimap < sword::SWBuf, sword::SWBuf > > * */) &self->Sections; + return (PySectionMap* /*std::map < sword::SWBuf, std::multimap < sword::SWBuf, sword::SWBuf > > * */) &self->getSections(); } } diff --git a/bindings/swig/package/sword.i b/bindings/swig/package/sword.i index a963fa1..2991b91 100644 --- a/bindings/swig/package/sword.i +++ b/bindings/swig/package/sword.i @@ -1,13 +1,13 @@ #define SWDLLEXPORT +%include "deprecations.i" + %module "Sword" %module(directors="1") Sword; /* Ignore warnings about Unknown base class */ %warnfilter(401); -%include "deprecations.i" - #ifdef SWIGPYTHON %include "directors.i" #endif diff --git a/bindings/swig/python/CMakeLists.txt b/bindings/swig/python/CMakeLists.txt index f608d50..bbf7561 100644 --- a/bindings/swig/python/CMakeLists.txt +++ b/bindings/swig/python/CMakeLists.txt @@ -44,11 +44,9 @@ ADD_CUSTOM_TARGET(swordswig ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) # Allow user installation to custom directory -IF(SWORD_PYTHON_INSTALL_DIR) - SET(SETUP_ARGS "--home=${SWORD_PYTHON_INSTALL_DIR} --root \$ENV{DESTDIR}") -ELSE(SWORD_PYTHON_INSTALL_DIR) - SET(SETUP_ARGS "--root \$ENV{DESTDIR}") -ENDIF(SWORD_PYTHON_INSTALL_DIR) +IF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "") + SET(SETUP_ARGS "\"--prefix=${SWORD_PYTHON_INSTALL_DIR}\"") +ENDIF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "") CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/install.cmake") diff --git a/bindings/swig/rendercallback.h b/bindings/swig/rendercallback.h index bfb54fc..b00b973 100755 --- a/bindings/swig/rendercallback.h +++ b/bindings/swig/rendercallback.h @@ -215,7 +215,7 @@ public: bool osisQToTick; bool inBold; bool inXRefNote; - bool BiblicalText; + bool isBiblicalText; int suspendLevel; SWBuf wordsOfChristStart; SWBuf wordsOfChristEnd; @@ -240,8 +240,8 @@ public sword::BasicFilterUserData { public: SWBuf inscriptRef; - bool SecHead; - bool BiblicalText; + bool inSecHead; + bool isBiblicalText; SWBuf version; XMLTag startTag; diff --git a/bindings/swig/swconfig.i b/bindings/swig/swconfig.i index b1f6834..4479093 100644 --- a/bindings/swig/swconfig.i +++ b/bindings/swig/swconfig.i @@ -5,21 +5,21 @@ %ignore sword::SWConfig::operator[]; %ignore sword::SWConfig::operator+=; %ignore sword::SWConfig::sections; -%ignore sword::SWConfig::Sections; +%ignore sword::SWConfig::getSections(); %include "swconfig.h" %extend sword::SWConfig { void set(const char* group, const char* entry, const char* value) { - self->Sections[group][entry] = value; + self->getSection(group)[entry] = value; }; const char* get(const char* group, const char* entry) { - return self->Sections[group][entry].c_str(); + return self->getSection(group)[entry].c_str(); }; PySectionMap /*std::map < sword::SWBuf, std::multimap <sword::SWBuf, sword::SWBuf> > */ *getSections() { - return (PySectionMap* /*std::map < sword::SWBuf, std::multimap < sword::SWBuf, sword::SWBuf > > * */) &self->Sections; + return (PySectionMap* /*std::map < sword::SWBuf, std::multimap < sword::SWBuf, sword::SWBuf > > * */) &self->getSections(); } } diff --git a/bindings/swig/sword.i b/bindings/swig/sword.i index a963fa1..2991b91 100644 --- a/bindings/swig/sword.i +++ b/bindings/swig/sword.i @@ -1,13 +1,13 @@ #define SWDLLEXPORT +%include "deprecations.i" + %module "Sword" %module(directors="1") Sword; /* Ignore warnings about Unknown base class */ %warnfilter(401); -%include "deprecations.i" - #ifdef SWIGPYTHON %include "directors.i" #endif diff --git a/bindings/swig/vstudio/SwigSword.csproj b/bindings/swig/vstudio/SwigSword.csproj index 7b40eab..0fb56d1 100644 --- a/bindings/swig/vstudio/SwigSword.csproj +++ b/bindings/swig/vstudio/SwigSword.csproj @@ -1,99 +1,99 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{F594299C-1C3B-461E-B64A-6167735DCA12}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>SwigSword</RootNamespace>
- <AssemblyName>SwigSword</AssemblyName>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="abbrev.cs" />
- <Compile Include="AttributeListMap.cs" />
- <Compile Include="AttributeTypeListMap.cs" />
- <Compile Include="AttributeValueMap.cs" />
- <Compile Include="EncodingFilterMgr.cs" />
- <Compile Include="ListKey.cs" />
- <Compile Include="LocaleMgr.cs" />
- <Compile Include="LZSSCompress.cs" />
- <Compile Include="MarkupFilterMgr.cs" />
- <Compile Include="ModuleMap.cs" />
- <Compile Include="RawCom.cs" />
- <Compile Include="RawGenBook.cs" />
- <Compile Include="RawLD.cs" />
- <Compile Include="RawLD4.cs" />
- <Compile Include="RawText.cs" />
- <Compile Include="sbook.cs" />
- <Compile Include="StringVector.cs" />
- <Compile Include="SWBuf.cs" />
- <Compile Include="SWClass.cs" />
- <Compile Include="SWCom.cs" />
- <Compile Include="SWCompress.cs" />
- <Compile Include="SWConfig.cs" />
- <Compile Include="SWDisplay.cs" />
- <Compile Include="SWFilter.cs" />
- <Compile Include="SWFilterMgr.cs" />
- <Compile Include="SWGenBook.cs" />
- <Compile Include="SWKey.cs" />
- <Compile Include="SWLD.cs" />
- <Compile Include="SWLocale.cs" />
- <Compile Include="SWMgr.cs" />
- <Compile Include="SWModule.cs" />
- <Compile Include="SWObject.cs" />
- <Compile Include="SWOptionFilter.cs" />
- <Compile Include="Sword.cs" />
- <Compile Include="SwordPINVOKE.cs" />
- <Compile Include="SWSearchable.cs" />
- <Compile Include="SWText.cs" />
- <Compile Include="SW_POSITION.cs" />
- <Compile Include="TreeKey.cs" />
- <Compile Include="TreeKeyIdx.cs" />
- <Compile Include="URL.cs" />
- <Compile Include="VerseKey.cs" />
- <Compile Include="VerseTreeKey.cs" />
- <Compile Include="zCom.cs" />
- <Compile Include="ZipCompress.cs" />
- <Compile Include="zLD.cs" />
- <Compile Include="zText.cs" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="Properties\" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{F594299C-1C3B-461E-B64A-6167735DCA12}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>SwigSword</RootNamespace> + <AssemblyName>SwigSword</AssemblyName> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="abbrev.cs" /> + <Compile Include="AttributeListMap.cs" /> + <Compile Include="AttributeTypeListMap.cs" /> + <Compile Include="AttributeValueMap.cs" /> + <Compile Include="EncodingFilterMgr.cs" /> + <Compile Include="ListKey.cs" /> + <Compile Include="LocaleMgr.cs" /> + <Compile Include="LZSSCompress.cs" /> + <Compile Include="MarkupFilterMgr.cs" /> + <Compile Include="ModuleMap.cs" /> + <Compile Include="RawCom.cs" /> + <Compile Include="RawGenBook.cs" /> + <Compile Include="RawLD.cs" /> + <Compile Include="RawLD4.cs" /> + <Compile Include="RawText.cs" /> + <Compile Include="sbook.cs" /> + <Compile Include="StringVector.cs" /> + <Compile Include="SWBuf.cs" /> + <Compile Include="SWClass.cs" /> + <Compile Include="SWCom.cs" /> + <Compile Include="SWCompress.cs" /> + <Compile Include="SWConfig.cs" /> + <Compile Include="SWDisplay.cs" /> + <Compile Include="SWFilter.cs" /> + <Compile Include="SWFilterMgr.cs" /> + <Compile Include="SWGenBook.cs" /> + <Compile Include="SWKey.cs" /> + <Compile Include="SWLD.cs" /> + <Compile Include="SWLocale.cs" /> + <Compile Include="SWMgr.cs" /> + <Compile Include="SWModule.cs" /> + <Compile Include="SWObject.cs" /> + <Compile Include="SWOptionFilter.cs" /> + <Compile Include="Sword.cs" /> + <Compile Include="SwordPINVOKE.cs" /> + <Compile Include="SWSearchable.cs" /> + <Compile Include="SWText.cs" /> + <Compile Include="SW_POSITION.cs" /> + <Compile Include="TreeKey.cs" /> + <Compile Include="TreeKeyIdx.cs" /> + <Compile Include="URL.cs" /> + <Compile Include="VerseKey.cs" /> + <Compile Include="VerseTreeKey.cs" /> + <Compile Include="zCom.cs" /> + <Compile Include="ZipCompress.cs" /> + <Compile Include="zLD.cs" /> + <Compile Include="zText.cs" /> + </ItemGroup> + <ItemGroup> + <Folder Include="Properties\" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> </Target> <Target Name="AfterBuild"> </Target> - -->
- <PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- </PropertyGroup>
+ --> + <PropertyGroup> + <PreBuildEvent> + </PreBuildEvent> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/bindings/swig/vstudio/libsword-csharpbindings.sln b/bindings/swig/vstudio/libsword-csharpbindings.sln index 36cd729..940d4f0 100644 --- a/bindings/swig/vstudio/libsword-csharpbindings.sln +++ b/bindings/swig/vstudio/libsword-csharpbindings.sln @@ -1,36 +1,36 @@ -
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\..\lib\vcppmake\vc8\libsword.vcproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword_csharpsword", "libsword_csharpsword.vcproj", "{0BD1471F-07D9-441C-9210-40A52770F2A1}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug with ICU|Win32 = Debug with ICU|Win32
- Debug|Win32 = Debug|Win32
- Release with ICU|Win32 = Release with ICU|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32
- {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32
- {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 with ICU|Win32.ActiveCfg = Release with ICU|Win32
- {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release with ICU|Win32.Build.0 = Release with ICU|Win32
- {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32
- {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32
- {0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32
- {0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32
- {0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug|Win32.ActiveCfg = Debug|Win32
- {0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug|Win32.Build.0 = Debug|Win32
- {0BD1471F-07D9-441C-9210-40A52770F2A1}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32
- {0BD1471F-07D9-441C-9210-40A52770F2A1}.Release with ICU|Win32.Build.0 = Release with ICU|Win32
- {0BD1471F-07D9-441C-9210-40A52770F2A1}.Release|Win32.ActiveCfg = Release|Win32
- {0BD1471F-07D9-441C-9210-40A52770F2A1}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\..\lib\vcppmake\vc8\libsword.vcproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword_csharpsword", "libsword_csharpsword.vcproj", "{0BD1471F-07D9-441C-9210-40A52770F2A1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug with ICU|Win32 = Debug with ICU|Win32 + Debug|Win32 = Debug|Win32 + Release with ICU|Win32 = Release with ICU|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 + {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 with ICU|Win32.ActiveCfg = Release with ICU|Win32 + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32 + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32 + {0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 + {0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 + {0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug|Win32.Build.0 = Debug|Win32 + {0BD1471F-07D9-441C-9210-40A52770F2A1}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 + {0BD1471F-07D9-441C-9210-40A52770F2A1}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 + {0BD1471F-07D9-441C-9210-40A52770F2A1}.Release|Win32.ActiveCfg = Release|Win32 + {0BD1471F-07D9-441C-9210-40A52770F2A1}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/bindings/swig/vstudio/libsword_csharpsword.vcproj b/bindings/swig/vstudio/libsword_csharpsword.vcproj index 4d69c39..565d7a0 100644 --- a/bindings/swig/vstudio/libsword_csharpsword.vcproj +++ b/bindings/swig/vstudio/libsword_csharpsword.vcproj @@ -1,966 +1,966 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="libsword_csharpsword"
- ProjectGUID="{0BD1471F-07D9-441C-9210-40A52770F2A1}"
- RootNamespace="libsword"
- AssemblyReferenceSearchPaths=""..\..\..\lib\vcppmake\vc8\Release""
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=" swig -csharp -c++ -nodefaultctor -DNDEBUG -DWIN32 -D_LIB -DREGEX_MALLOC -DSWUSINGDLL -dllimport libsword_csharpsword.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i "
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../apps/windoze/CBuilder5/InstallMgr/curl,../../../include,../../../src/utilfuns/win32,../../../apps/windoze/CBuilder5/InstallMgr/curl/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB;REGEX_MALLOC;SWUSINGDLL"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\Release/libsword.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- SuppressStartupBanner="true"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug with ICU|Win32"
- OutputDirectory=".\ICUDebug"
- IntermediateDirectory=".\ICUDebug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=" swig -csharp -c++ -nodefaultctor -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../icu-sword/source/common,../../../../icu-sword/source/i18n,../../../include,../../../src/utilfuns/win32"
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\ICUDebug/libsword.pch"
- AssemblerListingLocation=".\ICUDebug/"
- ObjectFile=".\ICUDebug/"
- ProgramDataBaseFileName=".\ICUDebug/"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libsword.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=" swig -csharp -c++ -nodefaultctor -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../include,../../../src/utilfuns/win32"
- PreprocessorDefinitions="_DEBUG;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\Debug/libsword.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- BrowseInformation="1"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libsword.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release with ICU|Win32"
- OutputDirectory=".\ICURelease"
- IntermediateDirectory=".\ICURelease"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=" swig -csharp -c++ -nodefaultctor -DNDEBUG -DWIN32 -D_LIB -DREGEX_MALLOC -DSWUSINGDLL -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i "
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../icu-sword/include,../../../include,../../../src/utilfuns/win32,../../../apps/windoze/CBuilder5/InstallMgr/curl/include"
- PreprocessorDefinitions="NDEBUG;_ICU_;WIN32;_LIB;REGEX_MALLOC"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\ICURelease/libsword.pch"
- AssemblerListingLocation=".\ICURelease/"
- ObjectFile=".\ICURelease/"
- ProgramDataBaseFileName=".\ICURelease/"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libsword.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- <ProjectReference
- ReferencedProjectIdentifier="{97449E5E-F880-4D22-933A-0D2FC32034D4}"
- RelativePathToProject=".\libsword.vcproj"
- />
- </References>
- <Files>
- <Filter
- Name="Sword Source Files"
- >
- <File
- RelativePath=".\Sword.cxx"
- >
- </File>
- </Filter>
- <Filter
- Name="Sword Header Files"
- >
- <File
- RelativePath="..\..\..\include\apocrypha.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\canon.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\cdsourcemgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\cipherfil.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\defs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\echomod.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\encfiltmgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\entriesblk.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\femain.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\filemgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\flatapi.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\ftpparse.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbffootnotes.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfheadings.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfhtml.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfhtmlhref.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfmorph.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfosis.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfplain.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfredletterwords.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfrtf.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfstrongs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfthml.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\gbfwebif.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\Greek2Greek.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\GreekChars.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\greeklexattribs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\hebrewmcim.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\hrefcom.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\latin1utf16.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\latin1utf8.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\listkey.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\localemgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\lzsscomprs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\markupfiltmgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\multimapwdef.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\nullim.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osisfootnotes.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osisheadings.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osishtmlhref.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osislemma.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osismorph.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osismorphsegmentation.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osisosis.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osisplain.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osisredletterwords.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osisrtf.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osisscripref.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osisstrongs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\osiswebif.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\papyriplain.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rawcom.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rawfiles.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rawgbf.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rawgenbook.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rawld.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rawld4.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rawstr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rawstr4.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rawtext.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rawverse.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\regex.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\remotesourcemgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\roman.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\rtfhtml.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\sapphire.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\scsuutf8.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\stringmgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\strkey.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swbasicfilter.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swbuf.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swcacher.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swcipher.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swcom.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swcomprs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swconfig.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swdisp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swdisprtf.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swdisprtfchap.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swfilter.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swfiltermgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swgenbook.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swinputmeth.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swinstallmgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swkey.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swld.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swlocale.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swlog.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swmacs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swmgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swmodule.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swobject.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swoptfilter.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swremotemgr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swsearchable.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swtext.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swversion.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\swwinlog.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\sysdata.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\tbdisp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\teiplain.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\teirtf.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlfootnotes.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlgbf.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlheadings.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlhtml.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlhtmlhref.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmllemma.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlmorph.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlosis.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlplain.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlrtf.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlscripref.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlstrongs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlvariants.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\thmlwebif.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\treekey.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\treekeyidx.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\unicodertf.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\unixstr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\untgz.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\url.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf16utf8.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8arshaping.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8bidireorder.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8cantillation.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8greekaccents.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8hebrewpoints.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8arabicpoints.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8html.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8latin1.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8nfc.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8nfkd.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8transliterator.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utf8utf16.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utilfuns.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utilstr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\utilxml.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\versekey.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\versetreekey.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\zcom.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\zconf.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\zipcomprs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\zld.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\zlib.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\zstr.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\ztext.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\zverse.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="libsword_csharpsword" + ProjectGUID="{0BD1471F-07D9-441C-9210-40A52770F2A1}" + RootNamespace="libsword" + AssemblyReferenceSearchPaths=""..\..\..\lib\vcppmake\vc8\Release"" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\Release" + IntermediateDirectory=".\Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine=" swig -csharp -c++ -nodefaultctor -DNDEBUG -DWIN32 -D_LIB -DREGEX_MALLOC -DSWUSINGDLL -dllimport libsword_csharpsword.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i " + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../../apps/windoze/CBuilder5/InstallMgr/curl,../../../include,../../../src/utilfuns/win32,../../../apps/windoze/CBuilder5/InstallMgr/curl/include" + PreprocessorDefinitions="NDEBUG;WIN32;_LIB;REGEX_MALLOC;SWUSINGDLL" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\Release/libsword.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" + SuppressStartupBanner="true" + CompileAs="0" + DisableSpecificWarnings="4996" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug with ICU|Win32" + OutputDirectory=".\ICUDebug" + IntermediateDirectory=".\ICUDebug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine=" swig -csharp -c++ -nodefaultctor -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE" + Optimization="0" + AdditionalIncludeDirectories="../../../../icu-sword/source/common,../../../../icu-sword/source/i18n,../../../include,../../../src/utilfuns/win32" + PreprocessorDefinitions="NDEBUG;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\ICUDebug/libsword.pch" + AssemblerListingLocation=".\ICUDebug/" + ObjectFile=".\ICUDebug/" + ProgramDataBaseFileName=".\ICUDebug/" + SuppressStartupBanner="true" + DebugInformationFormat="4" + CompileAs="0" + DisableSpecificWarnings="4996" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libsword.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine=" swig -csharp -c++ -nodefaultctor -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../include,../../../src/utilfuns/win32" + PreprocessorDefinitions="_DEBUG;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\Debug/libsword.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" + BrowseInformation="1" + SuppressStartupBanner="true" + DebugInformationFormat="4" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libsword.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release with ICU|Win32" + OutputDirectory=".\ICURelease" + IntermediateDirectory=".\ICURelease" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine=" swig -csharp -c++ -nodefaultctor -DNDEBUG -DWIN32 -D_LIB -DREGEX_MALLOC -DSWUSINGDLL -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i " + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../../../icu-sword/include,../../../include,../../../src/utilfuns/win32,../../../apps/windoze/CBuilder5/InstallMgr/curl/include" + PreprocessorDefinitions="NDEBUG;_ICU_;WIN32;_LIB;REGEX_MALLOC" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\ICURelease/libsword.pch" + AssemblerListingLocation=".\ICURelease/" + ObjectFile=".\ICURelease/" + ProgramDataBaseFileName=".\ICURelease/" + SuppressStartupBanner="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libsword.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + <ProjectReference + ReferencedProjectIdentifier="{97449E5E-F880-4D22-933A-0D2FC32034D4}" + RelativePathToProject=".\libsword.vcproj" + /> + </References> + <Files> + <Filter + Name="Sword Source Files" + > + <File + RelativePath=".\Sword.cxx" + > + </File> + </Filter> + <Filter + Name="Sword Header Files" + > + <File + RelativePath="..\..\..\include\apocrypha.h" + > + </File> + <File + RelativePath="..\..\..\include\canon.h" + > + </File> + <File + RelativePath="..\..\..\include\cdsourcemgr.h" + > + </File> + <File + RelativePath="..\..\..\include\cipherfil.h" + > + </File> + <File + RelativePath="..\..\..\include\defs.h" + > + </File> + <File + RelativePath="..\..\..\include\echomod.h" + > + </File> + <File + RelativePath="..\..\..\include\encfiltmgr.h" + > + </File> + <File + RelativePath="..\..\..\include\entriesblk.h" + > + </File> + <File + RelativePath="..\..\..\include\femain.h" + > + </File> + <File + RelativePath="..\..\..\include\filemgr.h" + > + </File> + <File + RelativePath="..\..\..\include\flatapi.h" + > + </File> + <File + RelativePath="..\..\..\include\ftpparse.h" + > + </File> + <File + RelativePath="..\..\..\include\gbffootnotes.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfheadings.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfhtml.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfhtmlhref.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfmorph.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfosis.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfplain.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfredletterwords.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfrtf.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfstrongs.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfthml.h" + > + </File> + <File + RelativePath="..\..\..\include\gbfwebif.h" + > + </File> + <File + RelativePath="..\..\..\include\Greek2Greek.h" + > + </File> + <File + RelativePath="..\..\..\include\GreekChars.h" + > + </File> + <File + RelativePath="..\..\..\include\greeklexattribs.h" + > + </File> + <File + RelativePath="..\..\..\include\hebrewmcim.h" + > + </File> + <File + RelativePath="..\..\..\include\hrefcom.h" + > + </File> + <File + RelativePath="..\..\..\include\latin1utf16.h" + > + </File> + <File + RelativePath="..\..\..\include\latin1utf8.h" + > + </File> + <File + RelativePath="..\..\..\include\listkey.h" + > + </File> + <File + RelativePath="..\..\..\include\localemgr.h" + > + </File> + <File + RelativePath="..\..\..\include\lzsscomprs.h" + > + </File> + <File + RelativePath="..\..\..\include\markupfiltmgr.h" + > + </File> + <File + RelativePath="..\..\..\include\multimapwdef.h" + > + </File> + <File + RelativePath="..\..\..\include\nullim.h" + > + </File> + <File + RelativePath="..\..\..\include\osisfootnotes.h" + > + </File> + <File + RelativePath="..\..\..\include\osisheadings.h" + > + </File> + <File + RelativePath="..\..\..\include\osishtmlhref.h" + > + </File> + <File + RelativePath="..\..\..\include\osislemma.h" + > + </File> + <File + RelativePath="..\..\..\include\osismorph.h" + > + </File> + <File + RelativePath="..\..\..\include\osismorphsegmentation.h" + > + </File> + <File + RelativePath="..\..\..\include\osisosis.h" + > + </File> + <File + RelativePath="..\..\..\include\osisplain.h" + > + </File> + <File + RelativePath="..\..\..\include\osisredletterwords.h" + > + </File> + <File + RelativePath="..\..\..\include\osisrtf.h" + > + </File> + <File + RelativePath="..\..\..\include\osisscripref.h" + > + </File> + <File + RelativePath="..\..\..\include\osisstrongs.h" + > + </File> + <File + RelativePath="..\..\..\include\osiswebif.h" + > + </File> + <File + RelativePath="..\..\..\include\papyriplain.h" + > + </File> + <File + RelativePath="..\..\..\include\rawcom.h" + > + </File> + <File + RelativePath="..\..\..\include\rawfiles.h" + > + </File> + <File + RelativePath="..\..\..\include\rawgbf.h" + > + </File> + <File + RelativePath="..\..\..\include\rawgenbook.h" + > + </File> + <File + RelativePath="..\..\..\include\rawld.h" + > + </File> + <File + RelativePath="..\..\..\include\rawld4.h" + > + </File> + <File + RelativePath="..\..\..\include\rawstr.h" + > + </File> + <File + RelativePath="..\..\..\include\rawstr4.h" + > + </File> + <File + RelativePath="..\..\..\include\rawtext.h" + > + </File> + <File + RelativePath="..\..\..\include\rawverse.h" + > + </File> + <File + RelativePath="..\..\..\include\regex.h" + > + </File> + <File + RelativePath="..\..\..\include\remotesourcemgr.h" + > + </File> + <File + RelativePath="..\..\..\include\roman.h" + > + </File> + <File + RelativePath="..\..\..\include\rtfhtml.h" + > + </File> + <File + RelativePath="..\..\..\include\sapphire.h" + > + </File> + <File + RelativePath="..\..\..\include\scsuutf8.h" + > + </File> + <File + RelativePath="..\..\..\include\stringmgr.h" + > + </File> + <File + RelativePath="..\..\..\include\strkey.h" + > + </File> + <File + RelativePath="..\..\..\include\swbasicfilter.h" + > + </File> + <File + RelativePath="..\..\..\include\swbuf.h" + > + </File> + <File + RelativePath="..\..\..\include\swcacher.h" + > + </File> + <File + RelativePath="..\..\..\include\swcipher.h" + > + </File> + <File + RelativePath="..\..\..\include\swcom.h" + > + </File> + <File + RelativePath="..\..\..\include\swcomprs.h" + > + </File> + <File + RelativePath="..\..\..\include\swconfig.h" + > + </File> + <File + RelativePath="..\..\..\include\swdisp.h" + > + </File> + <File + RelativePath="..\..\..\include\swdisprtf.h" + > + </File> + <File + RelativePath="..\..\..\include\swdisprtfchap.h" + > + </File> + <File + RelativePath="..\..\..\include\swfilter.h" + > + </File> + <File + RelativePath="..\..\..\include\swfiltermgr.h" + > + </File> + <File + RelativePath="..\..\..\include\swgenbook.h" + > + </File> + <File + RelativePath="..\..\..\include\swinputmeth.h" + > + </File> + <File + RelativePath="..\..\..\include\swinstallmgr.h" + > + </File> + <File + RelativePath="..\..\..\include\swkey.h" + > + </File> + <File + RelativePath="..\..\..\include\swld.h" + > + </File> + <File + RelativePath="..\..\..\include\swlocale.h" + > + </File> + <File + RelativePath="..\..\..\include\swlog.h" + > + </File> + <File + RelativePath="..\..\..\include\swmacs.h" + > + </File> + <File + RelativePath="..\..\..\include\swmgr.h" + > + </File> + <File + RelativePath="..\..\..\include\swmodule.h" + > + </File> + <File + RelativePath="..\..\..\include\swobject.h" + > + </File> + <File + RelativePath="..\..\..\include\swoptfilter.h" + > + </File> + <File + RelativePath="..\..\..\include\swremotemgr.h" + > + </File> + <File + RelativePath="..\..\..\include\swsearchable.h" + > + </File> + <File + RelativePath="..\..\..\include\swtext.h" + > + </File> + <File + RelativePath="..\..\..\include\swversion.h" + > + </File> + <File + RelativePath="..\..\..\include\swwinlog.h" + > + </File> + <File + RelativePath="..\..\..\include\sysdata.h" + > + </File> + <File + RelativePath="..\..\..\include\tbdisp.h" + > + </File> + <File + RelativePath="..\..\..\include\teiplain.h" + > + </File> + <File + RelativePath="..\..\..\include\teirtf.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlfootnotes.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlgbf.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlheadings.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlhtml.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlhtmlhref.h" + > + </File> + <File + RelativePath="..\..\..\include\thmllemma.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlmorph.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlosis.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlplain.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlrtf.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlscripref.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlstrongs.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlvariants.h" + > + </File> + <File + RelativePath="..\..\..\include\thmlwebif.h" + > + </File> + <File + RelativePath="..\..\..\include\treekey.h" + > + </File> + <File + RelativePath="..\..\..\include\treekeyidx.h" + > + </File> + <File + RelativePath="..\..\..\include\unicodertf.h" + > + </File> + <File + RelativePath="..\..\..\include\unixstr.h" + > + </File> + <File + RelativePath="..\..\..\include\untgz.h" + > + </File> + <File + RelativePath="..\..\..\include\url.h" + > + </File> + <File + RelativePath="..\..\..\include\utf16utf8.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8arshaping.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8bidireorder.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8cantillation.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8greekaccents.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8hebrewpoints.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8arabicpoints.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8html.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8latin1.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8nfc.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8nfkd.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8transliterator.h" + > + </File> + <File + RelativePath="..\..\..\include\utf8utf16.h" + > + </File> + <File + RelativePath="..\..\..\include\utilfuns.h" + > + </File> + <File + RelativePath="..\..\..\include\utilstr.h" + > + </File> + <File + RelativePath="..\..\..\include\utilxml.h" + > + </File> + <File + RelativePath="..\..\..\include\versekey.h" + > + </File> + <File + RelativePath="..\..\..\include\versetreekey.h" + > + </File> + <File + RelativePath="..\..\..\include\zcom.h" + > + </File> + <File + RelativePath="..\..\..\include\zconf.h" + > + </File> + <File + RelativePath="..\..\..\include\zipcomprs.h" + > + </File> + <File + RelativePath="..\..\..\include\zld.h" + > + </File> + <File + RelativePath="..\..\..\include\zlib.h" + > + </File> + <File + RelativePath="..\..\..\include\zstr.h" + > + </File> + <File + RelativePath="..\..\..\include\ztext.h" + > + </File> + <File + RelativePath="..\..\..\include\zverse.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/bindings/usrinst.sh b/bindings/usrinst.sh index f584050..27dbb30 100755 --- a/bindings/usrinst.sh +++ b/bindings/usrinst.sh @@ -2,7 +2,7 @@ #****************************************************************************** # Convenience script specifying most common options to ./configure # -# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ +# $Id: usrinst.sh 3063 2014-03-04 13:04:11Z chrislit $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society diff --git a/cmake/CppcheckTargets.cmake b/cmake/CppcheckTargets.cmake new file mode 100644 index 0000000..b465ba8 --- /dev/null +++ b/cmake/CppcheckTargets.cmake @@ -0,0 +1,231 @@ +# - Run cppcheck on c++ source files as a custom target and a test +# +# include(CppcheckTargets) +# add_cppcheck(<target-name> [UNUSED_FUNCTIONS] [STYLE] [POSSIBLE_ERROR] [FORCE] [FAIL_ON_WARNINGS]) - +# Create a target to check a target's sources with cppcheck and the indicated options +# add_cppcheck_sources(<target-name> [UNUSED_FUNCTIONS] [STYLE] [POSSIBLE_ERROR] [FORCE] [FAIL_ON_WARNINGS]) - +# Create a target to check standalone sources with cppcheck and the indicated options +# +# Requires these CMake modules: +# Findcppcheck +# +# Requires CMake 2.6 or newer (uses the 'function' command) +# +# Original Author: +# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> +# http://academic.cleardefinition.com +# Iowa State University HCI Graduate Program/VRAC +# +# Copyright Iowa State University 2009-2010. +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +if(__add_cppcheck) + return() +endif() +set(__add_cppcheck YES) + +if(NOT CPPCHECK_FOUND) + find_package(cppcheck QUIET) +endif() + +if(CPPCHECK_FOUND) + if(NOT TARGET all_cppcheck) + add_custom_target(all_cppcheck) + set_target_properties(all_cppcheck PROPERTIES EXCLUDE_FROM_ALL TRUE) + endif() +endif() + +function(add_cppcheck_sources _targetname) + if(CPPCHECK_FOUND) + set(_cppcheck_args) + set(_input ${ARGN}) + list(FIND _input UNUSED_FUNCTIONS _unused_func) + if("${_unused_func}" GREATER "-1") + list(APPEND _cppcheck_args ${CPPCHECK_UNUSEDFUNC_ARG}) + list(REMOVE_AT _input ${_unused_func}) + endif() + + list(FIND _input STYLE _style) + if("${_style}" GREATER "-1") + list(APPEND _cppcheck_args ${CPPCHECK_STYLE_ARG}) + list(REMOVE_AT _input ${_style}) + endif() + + list(FIND _input POSSIBLE_ERROR _poss_err) + if("${_poss_err}" GREATER "-1") + list(APPEND _cppcheck_args ${CPPCHECK_POSSIBLEERROR_ARG}) + list(REMOVE_AT _input ${_poss_err}) + endif() + + list(FIND _input FORCE _force) + if("${_force}" GREATER "-1") + list(APPEND _cppcheck_args "--force") + list(REMOVE_AT _input ${_force}) + endif() + + list(FIND _input FAIL_ON_WARNINGS _fail_on_warn) + if("${_fail_on_warn}" GREATER "-1") + list(APPEND + CPPCHECK_FAIL_REGULAR_EXPRESSION + ${CPPCHECK_WARN_REGULAR_EXPRESSION}) + list(REMOVE_AT _input ${_fail_on_warn}) + endif() + + set(_files) + foreach(_source ${_input}) + get_source_file_property(_cppcheck_loc "${_source}" LOCATION) + if(_cppcheck_loc) + # This file has a source file property, carry on. + get_source_file_property(_cppcheck_lang "${_source}" LANGUAGE) + if("${_cppcheck_lang}" MATCHES "CXX") + list(APPEND _files "${_cppcheck_loc}") + endif() + else() + # This file doesn't have source file properties - figure it out. + get_filename_component(_cppcheck_loc "${_source}" ABSOLUTE) + if(EXISTS "${_cppcheck_loc}") + list(APPEND _files "${_cppcheck_loc}") + else() + message(FATAL_ERROR + "Adding CPPCHECK for file target ${_targetname}: " + "File ${_source} does not exist or needs a corrected path location " + "since we think its absolute path is ${_cppcheck_loc}") + endif() + endif() + endforeach() + + if("1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0") + # Older than CMake 2.8.0 + add_test(${_targetname}_cppcheck_test + "${CPPCHECK_EXECUTABLE}" + ${CPPCHECK_TEMPLATE_ARG} + ${_cppcheck_args} + ${_files}) + else() + # CMake 2.8.0 and newer + add_test(NAME + ${_targetname}_cppcheck_test + COMMAND + "${CPPCHECK_EXECUTABLE}" + ${CPPCHECK_TEMPLATE_ARG} + ${_cppcheck_args} + ${_files}) + endif() + + set_tests_properties(${_targetname}_cppcheck_test + PROPERTIES + FAIL_REGULAR_EXPRESSION + "${CPPCHECK_FAIL_REGULAR_EXPRESSION}") + + add_custom_command(TARGET + all_cppcheck + PRE_BUILD + COMMAND + ${CPPCHECK_EXECUTABLE} + ${CPPCHECK_QUIET_ARG} + ${CPPCHECK_TEMPLATE_ARG} + ${_cppcheck_args} + ${_files} + WORKING_DIRECTORY + "${CMAKE_CURRENT_SOURCE_DIR}" + COMMENT + "${_targetname}_cppcheck: Running cppcheck on target ${_targetname}..." + VERBATIM) + endif() +endfunction() + +function(add_cppcheck _name) + if(NOT TARGET ${_name}) + message(FATAL_ERROR + "add_cppcheck given a target name that does not exist: '${_name}' !") + endif() + if(CPPCHECK_FOUND) + set(_cppcheck_args) + + list(FIND ARGN UNUSED_FUNCTIONS _unused_func) + if("${_unused_func}" GREATER "-1") + list(APPEND _cppcheck_args ${CPPCHECK_UNUSEDFUNC_ARG}) + endif() + + list(FIND ARGN STYLE _style) + if("${_style}" GREATER "-1") + list(APPEND _cppcheck_args ${CPPCHECK_STYLE_ARG}) + endif() + + list(FIND ARGN POSSIBLE_ERROR _poss_err) + if("${_poss_err}" GREATER "-1") + list(APPEND _cppcheck_args ${CPPCHECK_POSSIBLEERROR_ARG}) + endif() + + list(FIND ARGN FORCE _force) + if("${_force}" GREATER "-1") + list(APPEND _cppcheck_args "--force") + endif() + + list(FIND _input FAIL_ON_WARNINGS _fail_on_warn) + if("${_fail_on_warn}" GREATER "-1") + list(APPEND + CPPCHECK_FAIL_REGULAR_EXPRESSION + ${CPPCHECK_WARN_REGULAR_EXPRESSION}) + list(REMOVE_AT _input ${_unused_func}) + endif() + + get_target_property(_cppcheck_includes "${_name}" INCLUDE_DIRECTORIES) + set(_includes) + foreach(_include ${_cppcheck_includes}) + list(APPEND _includes "-I${_include}") + endforeach() + + get_target_property(_cppcheck_sources "${_name}" SOURCES) + set(_files) + foreach(_source ${_cppcheck_sources}) + get_source_file_property(_cppcheck_lang "${_source}" LANGUAGE) + get_source_file_property(_cppcheck_loc "${_source}" LOCATION) + if("${_cppcheck_lang}" MATCHES "CXX") + list(APPEND _files "${_cppcheck_loc}") + endif() + endforeach() + + if("1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0") + # Older than CMake 2.8.0 + add_test(${_name}_cppcheck_test + "${CPPCHECK_EXECUTABLE}" + ${CPPCHECK_TEMPLATE_ARG} + ${_cppcheck_args} + ${_files}) + else() + # CMake 2.8.0 and newer + add_test(NAME + ${_name}_cppcheck_test + COMMAND + "${CPPCHECK_EXECUTABLE}" + ${CPPCHECK_TEMPLATE_ARG} + ${_cppcheck_args} + ${_files}) + endif() + + set_tests_properties(${_name}_cppcheck_test + PROPERTIES + FAIL_REGULAR_EXPRESSION + "${CPPCHECK_FAIL_REGULAR_EXPRESSION}") + + add_custom_command(TARGET + all_cppcheck + PRE_BUILD + COMMAND + ${CPPCHECK_EXECUTABLE} + ${CPPCHECK_QUIET_ARG} + ${CPPCHECK_TEMPLATE_ARG} + ${_cppcheck_args} + ${_includes} + ${_files} + WORKING_DIRECTORY + "${CMAKE_CURRENT_SOURCE_DIR}" + COMMENT + "${_name}_cppcheck: Running cppcheck on target ${_name}..." + VERBATIM) + endif() + +endfunction() diff --git a/cmake/FindBZIP2.cmake b/cmake/FindBZIP2.cmake new file mode 100644 index 0000000..3f0c3eb --- /dev/null +++ b/cmake/FindBZIP2.cmake @@ -0,0 +1,28 @@ +# - Try to find BZIP2 +# Once done this will define +# +# BZIP2_FOUND - system has BZIP2 +# BZIP2_INCLUDE_DIR - the BZIP2 include directory +# BZIP2_LIBRARY - Link these to use BZIP2 +# BZIP2_DEFINITIONS - Compiler switches required for using BZIP2 + +# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +IF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARY) + SET(BZIP2_FIND_QUIETLY TRUE) +ENDIF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARY) + +FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h ) + +FIND_LIBRARY(BZIP2_LIBRARY bz2 ) + +# handle the QUIETLY and REQUIRED arguments and set BZIP2_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZIP2 DEFAULT_MSG BZIP2_LIBRARY BZIP2_INCLUDE_DIR) + +MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARY) diff --git a/cmake/FindCLucene.cmake b/cmake/FindCLucene.cmake index 00d2055..386dc75 100644 --- a/cmake/FindCLucene.cmake +++ b/cmake/FindCLucene.cmake @@ -46,6 +46,7 @@ SET(TRIAL_LIBRARY_PATHS /opt/local/lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX} /usr/lib64 + ${LIB_INSTALL_DIR} /sw/lib${LIB_SUFFIX} /usr/pkg/lib${LIB_SUFFIX} ${WIN_CLUCENE_SEARCH_PATH} diff --git a/cmake/FindXZ.cmake b/cmake/FindXZ.cmake new file mode 100644 index 0000000..9654c9e --- /dev/null +++ b/cmake/FindXZ.cmake @@ -0,0 +1,28 @@ +# - Try to find XZ +# Once done this will define +# +# XZ_FOUND - system has XZ +# XZ_INCLUDE_DIR - the XZ include directory +# XZ_LIBRARY - Link these to use XZ +# XZ_DEFINITIONS - Compiler switches required for using XZ + +# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +IF (XZ_INCLUDE_DIR AND XZ_LIBRARY) + SET(XZ_FIND_QUIETLY TRUE) +ENDIF (XZ_INCLUDE_DIR AND XZ_LIBRARY) + +FIND_PATH(XZ_INCLUDE_DIR lzma.h ) + +FIND_LIBRARY(XZ_LIBRARY lzma ) + +# handle the QUIETLY and REQUIRED arguments and set XZ_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(XZ DEFAULT_MSG XZ_LIBRARY XZ_INCLUDE_DIR) + +MARK_AS_ADVANCED(XZ_INCLUDE_DIR XZ_LIBRARY) diff --git a/cmake/Findcppcheck.cmake b/cmake/Findcppcheck.cmake new file mode 100644 index 0000000..2dcf799 --- /dev/null +++ b/cmake/Findcppcheck.cmake @@ -0,0 +1,167 @@ +# - try to find cppcheck tool +# +# Cache Variables: +# CPPCHECK_EXECUTABLE +# +# Non-cache variables you might use in your CMakeLists.txt: +# CPPCHECK_FOUND +# CPPCHECK_POSSIBLEERROR_ARG +# CPPCHECK_UNUSEDFUNC_ARG +# CPPCHECK_STYLE_ARG +# CPPCHECK_QUIET_ARG +# CPPCHECK_INCLUDEPATH_ARG +# CPPCHECK_FAIL_REGULAR_EXPRESSION +# CPPCHECK_WARN_REGULAR_EXPRESSION +# CPPCHECK_MARK_AS_ADVANCED - whether to mark our vars as advanced even +# if we don't find this program. +# +# Requires these CMake modules: +# FindPackageHandleStandardArgs (known included with CMake >=2.6.2) +# +# Original Author: +# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> +# http://academic.cleardefinition.com +# Iowa State University HCI Graduate Program/VRAC +# +# Copyright Iowa State University 2009-2010. +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +file(TO_CMAKE_PATH "${CPPCHECK_ROOT_DIR}" CPPCHECK_ROOT_DIR) +set(CPPCHECK_ROOT_DIR + "${CPPCHECK_ROOT_DIR}" + CACHE + PATH + "Path to search for cppcheck") + +# cppcheck app bundles on Mac OS X are GUI, we want command line only +set(_oldappbundlesetting ${CMAKE_FIND_APPBUNDLE}) +set(CMAKE_FIND_APPBUNDLE NEVER) + +if(CPPCHECK_EXECUTABLE AND NOT EXISTS "${CPPCHECK_EXECUTABLE}") + set(CPPCHECK_EXECUTABLE "notfound" CACHE PATH FORCE "") +endif() + +# If we have a custom path, look there first. +if(CPPCHECK_ROOT_DIR) + find_program(CPPCHECK_EXECUTABLE + NAMES + cppcheck + cli + PATHS + "${CPPCHECK_ROOT_DIR}" + PATH_SUFFIXES + cli + NO_DEFAULT_PATH) +endif() + +find_program(CPPCHECK_EXECUTABLE NAMES cppcheck) + +# Restore original setting for appbundle finding +set(CMAKE_FIND_APPBUNDLE ${_oldappbundlesetting}) + +# Find out where our test file is +get_filename_component(_cppcheckmoddir ${CMAKE_CURRENT_LIST_FILE} PATH) +set(_cppcheckdummyfile "${_cppcheckmoddir}/Findcppcheck.cpp") +if(NOT EXISTS "${_cppcheckdummyfile}") + message(FATAL_ERROR + "Missing file ${_cppcheckdummyfile} - should be alongside Findcppcheck.cmake, can be found at https://github.com/rpavlik/cmake-modules") +endif() + +function(_cppcheck_test_arg _resultvar _arg) + if(NOT CPPCHECK_EXECUTABLE) + set(${_resultvar} NO) + return() + endif() + execute_process(COMMAND + "${CPPCHECK_EXECUTABLE}" + "${_arg}" + "--quiet" + "${_cppcheckdummyfile}" + RESULT_VARIABLE + _cppcheck_result + OUTPUT_QUIET + ERROR_QUIET) + if("${_cppcheck_result}" EQUAL 0) + set(${_resultvar} YES PARENT_SCOPE) + else() + set(${_resultvar} NO PARENT_SCOPE) + endif() +endfunction() + +function(_cppcheck_set_arg_var _argvar _arg) + if("${${_argvar}}" STREQUAL "") + _cppcheck_test_arg(_cppcheck_arg "${_arg}") + if(_cppcheck_arg) + set(${_argvar} "${_arg}" PARENT_SCOPE) + endif() + endif() +endfunction() + +if(CPPCHECK_EXECUTABLE) + + # Check for the two types of command line arguments by just trying them + _cppcheck_set_arg_var(CPPCHECK_STYLE_ARG "--enable=style") + _cppcheck_set_arg_var(CPPCHECK_STYLE_ARG "--style") + if("${CPPCHECK_STYLE_ARG}" STREQUAL "--enable=style") + + _cppcheck_set_arg_var(CPPCHECK_UNUSEDFUNC_ARG + "--enable=unusedFunction") + _cppcheck_set_arg_var(CPPCHECK_INFORMATION_ARG "--enable=information") + _cppcheck_set_arg_var(CPPCHECK_MISSINGINCLUDE_ARG + "--enable=missingInclude") + _cppcheck_set_arg_var(CPPCHECK_POSIX_ARG "--enable=posix") + _cppcheck_set_arg_var(CPPCHECK_POSSIBLEERROR_ARG + "--enable=possibleError") + _cppcheck_set_arg_var(CPPCHECK_POSSIBLEERROR_ARG "--enable=all") + + if(MSVC) + set(CPPCHECK_TEMPLATE_ARG --template vs) + set(CPPCHECK_FAIL_REGULAR_EXPRESSION "[(]error[)]") + set(CPPCHECK_WARN_REGULAR_EXPRESSION "[(]style[)]") + elseif(CMAKE_COMPILER_IS_GNUCXX) + set(CPPCHECK_TEMPLATE_ARG --template gcc) + set(CPPCHECK_FAIL_REGULAR_EXPRESSION " error: ") + set(CPPCHECK_WARN_REGULAR_EXPRESSION " style: ") + else() + set(CPPCHECK_TEMPLATE_ARG --template gcc) + set(CPPCHECK_FAIL_REGULAR_EXPRESSION " error: ") + set(CPPCHECK_WARN_REGULAR_EXPRESSION " style: ") + endif() + elseif("${CPPCHECK_STYLE_ARG}" STREQUAL "--style") + # Old arguments + _cppcheck_set_arg_var(CPPCHECK_UNUSEDFUNC_ARG "--unused-functions") + _cppcheck_set_arg_var(CPPCHECK_POSSIBLEERROR_ARG "--all") + set(CPPCHECK_FAIL_REGULAR_EXPRESSION "error:") + set(CPPCHECK_WARN_REGULAR_EXPRESSION "[(]style[)]") + else() + # No idea - some other issue must be getting in the way + message(STATUS + "WARNING: Can't detect whether CPPCHECK wants new or old-style arguments!") + endif() + + set(CPPCHECK_QUIET_ARG "--quiet") + set(CPPCHECK_INCLUDEPATH_ARG "-I") + +endif() + +set(CPPCHECK_ALL + "${CPPCHECK_EXECUTABLE} ${CPPCHECK_POSSIBLEERROR_ARG} ${CPPCHECK_UNUSEDFUNC_ARG} ${CPPCHECK_STYLE_ARG} ${CPPCHECK_QUIET_ARG} ${CPPCHECK_INCLUDEPATH_ARG} some/include/path") + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(cppcheck + DEFAULT_MSG + CPPCHECK_ALL + CPPCHECK_EXECUTABLE + CPPCHECK_POSSIBLEERROR_ARG + CPPCHECK_UNUSEDFUNC_ARG + CPPCHECK_STYLE_ARG + CPPCHECK_INCLUDEPATH_ARG + CPPCHECK_QUIET_ARG) + +if(CPPCHECK_FOUND OR CPPCHECK_MARK_AS_ADVANCED) + mark_as_advanced(CPPCHECK_ROOT_DIR) +endif() + +mark_as_advanced(CPPCHECK_EXECUTABLE) diff --git a/cmake/Findcppcheck.cpp b/cmake/Findcppcheck.cpp new file mode 100644 index 0000000..84350db --- /dev/null +++ b/cmake/Findcppcheck.cpp @@ -0,0 +1,16 @@ +/** + * \file Findcppcheck.cpp + * \brief Dummy C++ source file used by CMake module Findcppcheck.cmake + * + * \author + * Ryan Pavlik, 2009-2010 + * <rpavlik@iastate.edu> + * http://academic.cleardefinition.com/ + * + */ + + + +int main(int argc, char* argv[]) { + return 0; +} diff --git a/cmake/muxsources.cmake b/cmake/muxsources.cmake index cf60af6..40c42bd 100644 --- a/cmake/muxsources.cmake +++ b/cmake/muxsources.cmake @@ -5,12 +5,14 @@ # # Written by Greg Hellings SET(sword_SOURCES ${sword_base_SOURCES}) + +MESSAGE(STATUS "\n-- CONFIGURING SOURCE LIST") + # Check for if we've found ZLIB # This one is a bit more unique, since we still allow compilation without # a ZLIB at all, and allowing a user to disable it does not bring about use # of some internal fall-back but just leaves the ability to read ZLIB files # out of the library altogether -MESSAGE(STATUS "\n-- CONFIGURING SOURCE LIST") IF(SWORD_NO_ZLIB STREQUAL "Yes") MESSAGE(STATUS "ZLib: excluded by use option") ADD_DEFINITIONS(-DEXCLUDEZLIB) @@ -27,6 +29,32 @@ ELSE(SWORD_NO_ZLIB STREQUAL "Yes") ENDIF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes") ENDIF(SWORD_NO_ZLIB STREQUAL "Yes") +# Check for if we've found bzip2 (libbz2) +IF(BZIP2_FOUND AND NOT SWORD_NO_BZIP2 STREQUAL "Yes") + SET(sword_SOURCES ${sword_SOURCES} ${sword_bzip2_used_SOURCES}) + IF(BZIP2_FOUND) + MESSAGE(STATUS "bzip2: system ${BZIP2_LIBRARY}") + SET(WITH_BZIP2 1) + ENDIF(BZIP2_FOUND) +ELSE(BZIP2_FOUND AND NOT SWORD_NO_BZIP2 STREQUAL "Yes") + MESSAGE(STATUS "bzip2: no") + ADD_DEFINITIONS(-DEXCLUDEBZIP2) + SET(WITH_BZIP2 0) +ENDIF(BZIP2_FOUND AND NOT SWORD_NO_BZIP2 STREQUAL "Yes") + +# Check for if we've found xz (liblzma) +IF(XZ_FOUND AND NOT SWORD_NO_XZ STREQUAL "Yes") + SET(sword_SOURCES ${sword_SOURCES} ${sword_xz_used_SOURCES}) + IF(XZ_FOUND) + MESSAGE(STATUS "xz: system ${XZ_LIBRARY}") + SET(WITH_XZ 1) + ENDIF(XZ_FOUND) +ELSE(XZ_FOUND AND NOT SWORD_NO_XZ STREQUAL "Yes") + MESSAGE(STATUS "xz: no") + ADD_DEFINITIONS(-DEXCLUDEXZ) + SET(WITH_XZ 0) +ENDIF(XZ_FOUND AND NOT SWORD_NO_XZ STREQUAL "Yes") + # Check for if we've found cURL IF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes") MESSAGE(STATUS "cURL: system ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}") diff --git a/cmake/options.cmake b/cmake/options.cmake index 4ca7b19..81981c8 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -22,9 +22,6 @@ macro(_SET_FANCY _var _value _comment) endif() endmacro(_SET_FANCY) -# A list of the options that the library supports -SET(SWORD_PYTHON_INSTALL_DIR "" CACHE STRING "Directory where the Python bindings will be installed. Defaults to default Python path.") - # Installation options IF(APPLE) SET(SWORD_INSTALL_DIR "/opt/local") @@ -34,6 +31,7 @@ ELSE(APPLE) SET(SWORD_INSTALL_DIR "/usr/local") ENDIF(APPLE) +# A list of the options that the library supports _SET_FANCY(CMAKE_INSTALL_PREFIX "${SWORD_INSTALL_DIR}" "Directory into which to install architecture-dependent files. Defaults to ${SWORD_INSTALL_DIR}.") _SET_FANCY(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" "Object code library install directory. Defaults to ${SWORD_INSTALL_DIR}/lib") @@ -46,6 +44,8 @@ _SET_FANCY(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "Directory to insta _SET_FANCY(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" "Directory to install global data files. Defaults to ${SWORD_INSTALL_DIR}/share.") +_SET_FANCY(SWORD_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Directory where the Python bindings will be installed. Defaults to default Python path.") + # Post-processing of variables MACRO(PROCESS_VERSION LEVEL VALUE) SET(SWORD_VERSION_${LEVEL} ${VALUE}) diff --git a/cmake/sources.cmake b/cmake/sources.cmake index 040c81b..29dbaa2 100644 --- a/cmake/sources.cmake +++ b/cmake/sources.cmake @@ -48,6 +48,7 @@ SET(sword_base_module_SOURCES src/modules/comments/rawcom4/rawcom4.cpp src/modules/comments/rawfiles/rawfiles.cpp src/modules/comments/zcom/zcom.cpp + src/modules/comments/zcom4/zcom4.cpp src/modules/common/rawstr.cpp src/modules/common/rawstr4.cpp src/modules/common/swcomprs.cpp @@ -56,6 +57,7 @@ SET(sword_base_module_SOURCES src/modules/common/rawverse4.cpp src/modules/common/swcipher.cpp src/modules/common/zverse.cpp + src/modules/common/zverse4.cpp src/modules/common/zstr.cpp src/modules/common/entriesblk.cpp src/modules/common/sapphire.cpp @@ -74,6 +76,7 @@ SET(sword_base_module_SOURCES src/modules/filters/gbfredletterwords.cpp src/modules/filters/gbfmorph.cpp src/modules/filters/gbfwordjs.cpp + src/modules/filters/gbflatex.cpp src/modules/filters/thmlstrongs.cpp src/modules/filters/thmlfootnotes.cpp @@ -89,11 +92,13 @@ SET(sword_base_module_SOURCES src/modules/filters/thmlhtmlhref.cpp src/modules/filters/thmlwebif.cpp src/modules/filters/thmlwordjs.cpp + src/modules/filters/thmllatex.cpp src/modules/filters/teiplain.cpp src/modules/filters/teirtf.cpp src/modules/filters/teixhtml.cpp src/modules/filters/teihtmlhref.cpp + src/modules/filters/teilatex.cpp src/modules/filters/gbfthml.cpp src/modules/filters/gbfosis.cpp @@ -101,11 +106,11 @@ SET(sword_base_module_SOURCES src/modules/filters/thmlplain.cpp src/modules/filters/osisosis.cpp - src/modules/filters/osisenum.cpp - src/modules/filters/osisglosses.cpp - src/modules/filters/osisxlit.cpp + src/modules/filters/osisenum.cpp + src/modules/filters/osisglosses.cpp + src/modules/filters/osisxlit.cpp src/modules/filters/osisheadings.cpp - src/modules/filters/osisfootnotes.cpp + src/modules/filters/osisfootnotes.cpp src/modules/filters/osishtmlhref.cpp src/modules/filters/osisxhtml.cpp src/modules/filters/osiswebif.cpp @@ -120,6 +125,7 @@ SET(sword_base_module_SOURCES src/modules/filters/osiswordjs.cpp src/modules/filters/osismorphsegmentation.cpp src/modules/filters/osisreferencelinks.cpp + src/modules/filters/osislatex.cpp src/modules/filters/latin1utf8.cpp src/modules/filters/latin1utf16.cpp @@ -129,6 +135,7 @@ SET(sword_base_module_SOURCES src/modules/filters/utf8latin1.cpp src/modules/filters/unicodertf.cpp src/modules/filters/scsuutf8.cpp + src/modules/filters/utf8scsu.cpp src/modules/filters/utf8cantillation.cpp src/modules/filters/utf8hebrewpoints.cpp @@ -153,6 +160,7 @@ SET(sword_base_module_SOURCES src/modules/texts/rawtext/rawtext.cpp src/modules/texts/rawtext4/rawtext4.cpp src/modules/texts/ztext/ztext.cpp + src/modules/texts/ztext4/ztext4.cpp ) SOURCE_GROUP("src\\modules" FILES ${sword_base_module_SOURCES}) @@ -201,8 +209,6 @@ ENDIF(NOT MSVC) # Sources relying on ZLib SET(sword_zlib_used_SOURCES src/modules/common/zipcomprs.cpp - src/modules/common/bz2comprs.cpp - src/modules/common/xzcomprs.cpp src/utilfuns/zlib/untgz.c ) SET(sword_zlib_nofound_SOURCES @@ -223,6 +229,16 @@ SET(sword_zlib_nofound_SOURCES src/utilfuns/zlib/zutil.c ) +# Sources relying on bzip2 (libbz2) +SET(sword_bzip2_used_SOURCES + src/modules/common/bz2comprs.cpp +) + +# Sources relying on xz (liblzma) +SET(sword_xz_used_SOURCES + src/modules/common/xzcomprs.cpp +) + # Sources relying on cURL SET(sword_curl_found_SOURCES src/mgr/curlftpt.cpp @@ -254,6 +270,7 @@ SET(sword_icu_found_SOURCES # Headers SET(SWORD_INSTALL_HEADERS + include/bz2comprs.h include/canon.h include/canon_abbrevs.h include/cipherfil.h @@ -286,8 +303,9 @@ SET(SWORD_INSTALL_HEADERS include/gbfstrongs.h include/gbfwordjs.h include/gbfthml.h - include/greeklexattribs.h + include/gbflatex.h + include/greeklexattribs.h include/hebrewmcim.h include/hrefcom.h include/installmgr.h @@ -313,13 +331,14 @@ SET(SWORD_INSTALL_HEADERS include/osisrtf.h include/osisosis.h include/osisstrongs.h - include/osisfootnotes.h - include/osislemma.h - include/osisredletterwords.h - include/osisscripref.h - include/osiswordjs.h - include/osisvariants.h - include/osisreferencelinks.h + include/osisfootnotes.h + include/osislemma.h + include/osisredletterwords.h + include/osisscripref.h + include/osiswordjs.h + include/osisvariants.h + include/osisreferencelinks.h + include/osislatex.h include/papyriplain.h include/rawcom.h @@ -380,11 +399,13 @@ SET(SWORD_INSTALL_HEADERS include/thmlstrongs.h include/thmlvariants.h include/thmlwordjs.h + include/thmllatex.h include/teiplain.h include/teirtf.h include/teixhtml.h include/teihtmlhref.h + include/teilatex.h include/treekey.h include/treekeyidx.h @@ -402,6 +423,7 @@ SET(SWORD_INSTALL_HEADERS include/utf8latin1.h include/utf8nfc.h include/utf8nfkd.h + include/utf8scsu.h include/utf8transliterator.h include/utf8utf16.h include/utilstr.h @@ -409,13 +431,17 @@ SET(SWORD_INSTALL_HEADERS include/versekey.h include/versetreekey.h + include/xzcomprs.h include/zcom.h + include/zcom4.h include/zconf.h include/zipcomprs.h include/zld.h include/zstr.h include/ztext.h + include/ztext4.h include/zverse.h + include/zverse4.h include/canon_kjva.h include/canon_leningrad.h diff --git a/compile b/compile deleted file mode 100755 index 531136b..0000000 --- a/compile +++ /dev/null @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey@cygnus.com>. -# -# 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; either version 2, or (at your option) -# any later version. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/config.guess b/config.guess index 1f5c50c..b79252d 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ;; esac @@ -826,7 +826,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - *:MSYS*:*) + i*:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - or32:Linux:*:* | or1k*:Linux:*:*) + or32:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,26 +1260,16 @@ EOF if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1371,6 +1361,154 @@ EOF exit ;; esac +eval $set_cc_for_build +cat >$dummy.c <<EOF +#ifdef _SEQUENT_ +# include <sys/types.h> +# include <sys/utsname.h> +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include <sys/param.h> + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include <sys/param.h> +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + cat >&2 <<EOF $0: unable to guess system type @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2014-07-28' +timestamp='2013-04-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -257,7 +257,7 @@ case $basic_machine in | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | c8051 | clipper \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -265,7 +265,6 @@ case $basic_machine in | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -283,10 +282,8 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -298,7 +295,8 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -326,7 +324,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -374,7 +372,7 @@ case $basic_machine in | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -383,7 +381,6 @@ case $basic_machine in | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -403,10 +400,8 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -418,7 +413,6 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ - | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -800,7 +794,7 @@ case $basic_machine in os=-mingw64 ;; mingw32) - basic_machine=i686-pc + basic_machine=i386-pc os=-mingw32 ;; mingw32ce) @@ -828,10 +822,6 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; msdos) basic_machine=i386-pc os=-msdos @@ -840,7 +830,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i686-pc + basic_machine=i386-pc os=-msys ;; mvs) @@ -1377,14 +1367,14 @@ case $os in | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1556,9 +1546,6 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; - c8051-*) - os=-elf - ;; hexagon-*) os=-elf ;; @@ -1602,6 +1589,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision: 1.45 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sword 1.7.4. +# Generated by GNU Autoconf 2.69 for sword 1.8.1. # # Report bugs to <sword-bugs@crosswire.org>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sword' PACKAGE_TARNAME='sword' -PACKAGE_VERSION='1.7.4' -PACKAGE_STRING='sword 1.7.4' +PACKAGE_VERSION='1.8.1' +PACKAGE_STRING='sword 1.8.1' PACKAGE_BUGREPORT='sword-bugs@crosswire.org' PACKAGE_URL='http://crosswire.org/sword' @@ -653,8 +653,12 @@ INTERNALFTPLIB_FALSE INTERNALFTPLIB_TRUE WITHCURLSFTP_FALSE WITHCURLSFTP_TRUE +WITHGAPI_FALSE +WITHGAPI_TRUE WITHCURL_FALSE WITHCURL_TRUE +USEICUREGEX_FALSE +USEICUREGEX_TRUE USECXX11REGEX_FALSE USECXX11REGEX_TRUE INSTCONF_FALSE @@ -669,6 +673,10 @@ HAVE_ICUSWORD_FALSE HAVE_ICUSWORD_TRUE HAVE_ICU_FALSE HAVE_ICU_TRUE +HAVE_XZ_FALSE +HAVE_XZ_TRUE +HAVE_BZIP2_FALSE +HAVE_BZIP2_TRUE HAVE_LIBZ_FALSE HAVE_LIBZ_TRUE ICU_IOLIBS @@ -684,6 +692,8 @@ dir_confdef with_conf with_icusword with_icu +with_xz +with_bzip2 with_zlib SWORD_VERSION_NANO SWORD_VERSION_MICRO @@ -846,6 +856,8 @@ with_sysroot enable_libtool_lock with_clucene with_zlib +with_bzip2 +with_xz with_icu with_icusword with_conf @@ -853,6 +865,9 @@ with_cxx11regex with_curl with_curl_sftp with_internalregex +with_icuregex +with_xapian +with_gapi enable_debug enable_warnings enable_profile @@ -1422,7 +1437,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sword 1.7.4 to adapt to many kinds of systems. +\`configure' configures sword 1.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1493,7 +1508,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sword 1.7.4:";; + short | recursive ) echo "Configuration of sword 1.8.1:";; esac cat <<\_ACEOF @@ -1534,6 +1549,8 @@ Optional Packages: --with-clucene=<path> prefix of CLucene-Core installation. e.g. /usr/local or /usr --with-zlib allow zlib compressed modules (default=yes) + --with-bzip2 allow bzip2 compressed modules (default=no) + --with-xz allow xz compressed modules (default=no) --with-icu use ICU for unicode (default=yes) --with-icusword use custom SWORD ICU (default=no) --with-conf install a new sword.conf (default=yes) @@ -1543,6 +1560,9 @@ Optional Packages: --with-curl_sftp build install manager support using libcurl+sftp (requires --with-curl, default=yes) --with-internalregex Compile using SWORDs internal copy of regex + --with-icuregex use ICU regex engine + --with-xapian use xapian search engine (default=yes) + --with-gapi build SWORD with support for google apis --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional) --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional) @@ -1635,7 +1655,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sword configure 1.7.4 +sword configure 1.8.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2143,7 +2163,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sword $as_me 1.7.4, which was +It was created by sword $as_me 1.8.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2634,7 +2654,7 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- -am__api_version='1.14' +am__api_version='1.13' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3120,7 +3140,7 @@ fi # Define the identity of the package. PACKAGE='sword' - VERSION='1.7.4' + VERSION='1.8.1' cat >>confdefs.h <<_ACEOF @@ -3171,47 +3191,9 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 - fi -fi +# this doesn't work +#AM_INIT_AUTOMAKE([subdir-objects]) ac_config_headers="$ac_config_headers include/config.h" @@ -4025,65 +4007,6 @@ ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -7299,7 +7222,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7317,10 +7240,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7339,10 +7259,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -16220,6 +16137,22 @@ else fi +# Check whether --with-bzip2 was given. +if test "${with_bzip2+set}" = set; then : + withval=$with_bzip2; +else + with_bzip2=no +fi + + +# Check whether --with-xz was given. +if test "${with_xz+set}" = set; then : + withval=$with_xz; +else + with_xz=no +fi + + # Check whether --with-icu was given. if test "${with_icu+set}" = set; then : withval=$with_icu; @@ -16276,6 +16209,28 @@ if test "${with_internalregex+set}" = set; then : fi +# Check whether --with-icuregex was given. +if test "${with_icuregex+set}" = set; then : + withval=$with_icuregex; +fi + + +# Check whether --with-xapian was given. +if test "${with_xapian+set}" = set; then : + withval=$with_xapian; +else + with_xapian=yes +fi + + +# Check whether --with-gapi was given. +if test "${with_gapi+set}" = set; then : + withval=$with_gapi; +else + with_gapi=no +fi + + # --------------------------------------------------------------------- # Enable options @@ -16361,23 +16316,94 @@ fi if test x$enable_debug = xyes; then GCJFLAGS="-g -O0" if test x$ac_cv_prog_cc_g = xyes; then - AM_CFLAGS="-g3 -O0 -Wall -Werror" + AM_CFLAGS="-g3 -O0 -Wall" else - AM_CFLAGS="-O0 -Wall -Werror" + AM_CFLAGS="-O0 -Wall" fi if test x$ac_cv_prog_cxx_g = xyes; then - AM_CXXFLAGS="-g3 -O0 -Wall -Werror -Woverloaded-virtual" + AM_CXXFLAGS="-g3 -O0 -Wall -Woverloaded-virtual" else - AM_CXXFLAGS="-O0 -Wall -Werror -Woverloaded-virtual" + AM_CXXFLAGS="-O0 -Wall -Woverloaded-virtual" fi else - AM_CFLAGS="-O3" - AM_CXXFLAGS="-O3" + my_save_cxxflags="$CXXFLAGS" + CXXFLAGS=-Ofast + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CXX supports -Ofast" >&5 +$as_echo_n "checking whether CXX supports -Ofast... " >&6; } + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + AM_CFLAGS=-Ofast + AM_CXXFLAGS=-Ofast +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + AM_CFLAGS=-O3 + AM_CXXFLAGS=-O3 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXXFLAGS="$my_save_cxxflags" + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + fi AM_CFLAGS="$AM_CFLAGS -fPIC" AM_CXXFLAGS="$AM_CXXFLAGS -fPIC" +#stupid check for old or new g++ compiler param syntax for this compiler option +saved_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -ftemplate-depth=100" +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + +else + CXXFLAGS="$saved_CXXFLAGS -ftemplate-depth-100"; +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + # --------------------------------------------------------------------- # Check libraries # --------------------------------------------------------------------- @@ -16438,8 +16464,122 @@ if test x$with_zlib = xno; then AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEZLIB" fi +if test x$with_bzip2 = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5 +$as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } +if ${ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbz2 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char BZ2_bzBuffToBuffCompress (); +int +main () +{ +return BZ2_bzBuffToBuffCompress (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=yes +else + ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" >&5 +$as_echo "$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" >&6; } +if test "x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBBZ2 1 +_ACEOF + + LIBS="-lbz2 $LIBS" + +else + with_bzip2="no" +fi + +else + with_bzip2="no" +fi + +if test x$with_bzip2 = xno; then + AM_CFLAGS="$AM_CFLAGS -DEXCLUDEBZIP2" + AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEBZIP2" +fi + +if test x$with_xz = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_buffer_encode in -llzma" >&5 +$as_echo_n "checking for lzma_easy_buffer_encode in -llzma... " >&6; } +if ${ac_cv_lib_lzma_lzma_easy_buffer_encode+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llzma $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char lzma_easy_buffer_encode (); +int +main () +{ +return lzma_easy_buffer_encode (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_lzma_lzma_easy_buffer_encode=yes +else + ac_cv_lib_lzma_lzma_easy_buffer_encode=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_easy_buffer_encode" >&5 +$as_echo "$ac_cv_lib_lzma_lzma_easy_buffer_encode" >&6; } +if test "x$ac_cv_lib_lzma_lzma_easy_buffer_encode" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBLZMA 1 +_ACEOF + + LIBS="-llzma $LIBS" + +else + with_xz="no" +fi + +else + with_xz="no" +fi + +if test x$with_xz = xno; then + AM_CFLAGS="$AM_CFLAGS -DEXCLUDEXZ" + AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEXZ" +fi + if test "x$with_internalregex" = "xyes"; then : - have_systemregex="no" + have_systemregex="no, using internal regex" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regexec" >&5 $as_echo_n "checking for library containing regexec... " >&6; } @@ -16496,7 +16636,7 @@ if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" have_systemregex="yes" else - have_systemregex="no" + have_systemregex="no, using internal regex" fi fi @@ -16792,9 +16932,6 @@ AM_CXXFLAGS="$AM_CXXFLAGS -D_ICUSWORD_" AM_CFLAGS="$AM_CFLAGS -D_ICUSWORD_" fi - -AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25" - if test x$enable_warnings = xyes; then AM_CFLAGS="$AM_CFLAGS -Werror" AM_CXXFLAGS="$AM_CXXFLAGS -Werror -Woverloaded-virtual" @@ -16860,7 +16997,7 @@ fi if test "$CURL_CONFIG" = "no" ; then echo "*** The curl-config script installed by curl could not be found" echo "*** compiling without libcurl support" - with_curl=no + with_curl="no, using internal ftplib" with_curl_sftp=no with_internalftplib=yes else @@ -16880,13 +17017,13 @@ fi fi fi else - with_curl=no; + with_curl="no, using internal ftplib" with_curl_sftp=no; with_internalftplib=yes fi if test x$with_cxx11regex = xyes; then - AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11 -ftemplate-depth=100" + AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11" fi # --------------------------------------------------------------------- @@ -16914,6 +17051,79 @@ else fi fi +if test x$with_xapian = xyes; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lxapian" >&5 +$as_echo_n "checking for main in -lxapian... " >&6; } +if ${ac_cv_lib_xapian_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxapian $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_xapian_main=yes +else + ac_cv_lib_xapian_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xapian_main" >&5 +$as_echo "$ac_cv_lib_xapian_main" >&6; } +if test "x$ac_cv_lib_xapian_main" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBXAPIAN 1 +_ACEOF + + LIBS="-lxapian $LIBS" + +else + with_xapian="no" +fi + +else + with_xapian="no" +fi + +if test x$with_icuregex = xyes; then + if test x$with_icu = xno; then + with_icuregex="requested; but using ICU not enabled" + else + AM_CFLAGS="$AM_CFLAGS -DUSEICUREGEX" + AM_CXXFLAGS="$AM_CXXFLAGS -DUSEICUREGEX" + fi +else + with_icuregex="no" +fi + +if test x$with_xapian = xyes; then + AM_CFLAGS="$AM_CFLAGS -DUSEXAPIAN" + AM_CXXFLAGS="$AM_CXXFLAGS -DUSEXAPIAN" + if test x$with_clucene = xno; then + with_clucene="no" + else + with_clucene="$with_clucene; but using XAPIAN instead" + fi +fi + for ac_func in vsnprintf do : ac_fn_cxx_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" @@ -16955,6 +17165,83 @@ if test "$V3" -le 9 ; then V3=00$V3 ; elif test "$V3" -le 99 ; then V3=0$V3 ; fi if test "$V4" -le 9 ; then V4=00$V4 ; elif test "$V4" -le 99 ; then V4=0$V4 ; fi SWORD_VERSION_NUM=$V1$V2$V3$V4 +echo "checking compiler warnings" + + saved_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Wno-address" + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + WARNING_CHECK=-Wno-address +else + WARNING_CHECK=; +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + CXXFLAGS="$saved_CXXFLAGS" + echo "WARNING_CHECK: $WARNING_CHECK" + WARNINGS_OFF="$WARNINGS_OFF $WARNING_CHECK" + + saved_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Wno-nonnull-compare" + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + WARNING_CHECK=-Wno-nonnull-compare +else + WARNING_CHECK=; +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + CXXFLAGS="$saved_CXXFLAGS" + echo "WARNING_CHECK: $WARNING_CHECK" + WARNINGS_OFF="$WARNINGS_OFF $WARNING_CHECK" + + +echo "WARNINGS_OFF: $WARNINGS_OFF" +AM_CXXFLAGS="$AM_CXXFLAGS $WARNINGS_OFF" + + @@ -16992,6 +17279,8 @@ SWORD_VERSION_NUM=$V1$V2$V3$V4 + + # --------------------------------------------------------------------- # Conditional variables # --------------------------------------------------------------------- @@ -17004,6 +17293,22 @@ else HAVE_LIBZ_FALSE= fi + if test x$with_bzip2 = xyes; then + HAVE_BZIP2_TRUE= + HAVE_BZIP2_FALSE='#' +else + HAVE_BZIP2_TRUE='#' + HAVE_BZIP2_FALSE= +fi + + if test x$with_xz = xyes; then + HAVE_XZ_TRUE= + HAVE_XZ_FALSE='#' +else + HAVE_XZ_TRUE='#' + HAVE_XZ_FALSE= +fi + if test x$with_icu = xyes; then HAVE_ICU_TRUE= HAVE_ICU_FALSE='#' @@ -17061,6 +17366,14 @@ else USECXX11REGEX_FALSE= fi + if test x$with_icuregex = xyes; then + USEICUREGEX_TRUE= + USEICUREGEX_FALSE='#' +else + USEICUREGEX_TRUE='#' + USEICUREGEX_FALSE= +fi + if test x$with_curl = xyes; then WITHCURL_TRUE= WITHCURL_FALSE='#' @@ -17069,6 +17382,14 @@ else WITHCURL_FALSE= fi + if test x$with_gapi = xyes; then + WITHGAPI_TRUE= + WITHGAPI_FALSE='#' +else + WITHGAPI_TRUE='#' + WITHGAPI_FALSE= +fi + if test x$with_curl_sftp = xyes; then WITHCURLSFTP_TRUE= WITHCURLSFTP_FALSE='#' @@ -17137,7 +17458,7 @@ fi # --------------------------------------------------------------------- # Final output # --------------------------------------------------------------------- -ac_config_files="$ac_config_files Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile examples/tasks/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec" +ac_config_files="$ac_config_files Makefile lib/Makefile tests/Makefile tests/testsuite/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile examples/tasks/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -17288,6 +17609,14 @@ if test -z "${HAVE_LIBZ_TRUE}" && test -z "${HAVE_LIBZ_FALSE}"; then as_fn_error $? "conditional \"HAVE_LIBZ\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_BZIP2_TRUE}" && test -z "${HAVE_BZIP2_FALSE}"; then + as_fn_error $? "conditional \"HAVE_BZIP2\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_XZ_TRUE}" && test -z "${HAVE_XZ_FALSE}"; then + as_fn_error $? "conditional \"HAVE_XZ\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_ICU_TRUE}" && test -z "${HAVE_ICU_FALSE}"; then as_fn_error $? "conditional \"HAVE_ICU\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17316,10 +17645,18 @@ if test -z "${USECXX11REGEX_TRUE}" && test -z "${USECXX11REGEX_FALSE}"; then as_fn_error $? "conditional \"USECXX11REGEX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USEICUREGEX_TRUE}" && test -z "${USEICUREGEX_FALSE}"; then + as_fn_error $? "conditional \"USEICUREGEX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITHCURL_TRUE}" && test -z "${WITHCURL_FALSE}"; then as_fn_error $? "conditional \"WITHCURL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITHGAPI_TRUE}" && test -z "${WITHGAPI_FALSE}"; then + as_fn_error $? "conditional \"WITHGAPI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITHCURLSFTP_TRUE}" && test -z "${WITHCURLSFTP_FALSE}"; then as_fn_error $? "conditional \"WITHCURLSFTP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17749,7 +18086,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sword $as_me 1.7.4, which was +This file was extended by sword $as_me 1.8.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17816,7 +18153,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sword config.status 1.7.4 +sword config.status 1.8.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18328,6 +18665,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; + "tests/testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES tests/testsuite/Makefile" ;; "tests/cppunit/Makefile") CONFIG_FILES="$CONFIG_FILES tests/cppunit/Makefile" ;; "utilities/Makefile") CONFIG_FILES="$CONFIG_FILES utilities/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; @@ -19867,23 +20205,30 @@ fi echo echo echo "Configuration:" -echo " LIBDIR: $libdir" -echo " DEBUG: $enable_debug" -echo " PROFILE: $enable_profile" -echo " BUILD TESTS: $enable_tests" -echo " BUILD EXAMPLES: $enable_examples" -echo " BUILD UTILITIES: $enable_utilities" -echo " LIBZ: $with_zlib" -echo " ICU: $with_icu" -echo " ICUSWORD: $with_icusword" -echo " CXX11REGEX: $with_cxx11regex" -echo " CURL: $with_curl" -echo " CURL SFTP: $with_curl_sftp" -echo " INTERNAL FTPLIB: $with_internalftplib" -echo " INTERNAL REGEX: $with_internalregex" -echo " CLUCENE: $with_clucene" -echo -echo - +echo "" +echo " Settings:" +echo " LIBDIR: $libdir" +echo " DEBUG: $enable_debug" +echo " PROFILE: $enable_profile" +echo " BUILD TESTS: $enable_tests" +echo " BUILD EXAMPLES: $enable_examples" +echo " BUILD UTILITIES: $enable_utilities" +echo "" +echo " Dependencies for standard use:" +echo " REGEX: $have_systemregex" +echo " ZLIB: $with_zlib" +echo " LIBICU: $with_icu" +echo " LIBCURL: $with_curl" +echo " CLUCENE-CORE: $with_clucene" +echo "" +echo " Optional / Experimental:" +echo " LIBCURL SFTP: $with_curl_sftp" +echo " BZIP2: $with_bzip2" +echo " XZ: $with_xz" +echo " ICUSWORD: $with_icusword" +echo " CXX11-REGEX: $with_cxx11regex" +echo " ICU-REGEX: $with_icuregex" +echo " XAPIAN-CORE: $with_xapian" +echo " GAPI: $with_gapi" diff --git a/configure.ac b/configure.ac index ae12dc5..6ed56f2 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ # Version change: Change line 8 only ! # Change it immediately after a release -AC_INIT(sword, 1.7.4, sword-bugs@crosswire.org, sword, http://crosswire.org/sword) +AC_INIT(sword, 1.8.1, sword-bugs@crosswire.org, sword, http://crosswire.org/sword) AC_CONFIG_SRCDIR(sword.bmp) AC_PREREQ(2.52) AC_REVISION($Revision: 1.45 $) @@ -13,6 +13,9 @@ AC_REVISION($Revision: 1.45 $) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE +# this doesn't work +#AM_INIT_AUTOMAKE([subdir-objects]) + AM_CONFIG_HEADER(include/config.h) AC_CONFIG_MACRO_DIR([m4]) @@ -49,6 +52,10 @@ fi # --------------------------------------------------------------------- AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib],[allow zlib compressed modules (default=yes)]),,with_zlib=yes) +AC_ARG_WITH(bzip2, + AC_HELP_STRING([--with-bzip2],[allow bzip2 compressed modules (default=no)]),,with_bzip2=no) +AC_ARG_WITH(xz, + AC_HELP_STRING([--with-xz],[allow xz compressed modules (default=no)]),,with_xz=no) AC_ARG_WITH(icu, AC_HELP_STRING([--with-icu],[use ICU for unicode (default=yes)]),,with_icu=yes) AC_ARG_WITH(icusword, @@ -65,6 +72,12 @@ AC_ARG_WITH(curl_sftp, # AC_HELP_STRING([--with-lucene],[include lucene support for searching (default=no)]),,with_lucene=no) AC_ARG_WITH([internalregex], AS_HELP_STRING([--with-internalregex], [Compile using SWORDs internal copy of regex])) +AC_ARG_WITH([icuregex], + AS_HELP_STRING([--with-icuregex], [use ICU regex engine])) +AC_ARG_WITH(xapian, + AC_HELP_STRING([--with-xapian],[use xapian search engine (default=yes)]),,with_xapian=yes) +AC_ARG_WITH([gapi], + AS_HELP_STRING([--with-gapi], [build SWORD with support for google apis]),,with_gapi=no) # --------------------------------------------------------------------- @@ -94,23 +107,42 @@ AM_MAINTAINER_MODE if test x$enable_debug = xyes; then GCJFLAGS="-g -O0" if test x$ac_cv_prog_cc_g = xyes; then - AM_CFLAGS="-g3 -O0 -Wall -Werror" + AM_CFLAGS="-g3 -O0 -Wall" else - AM_CFLAGS="-O0 -Wall -Werror" + AM_CFLAGS="-O0 -Wall" fi if test x$ac_cv_prog_cxx_g = xyes; then - AM_CXXFLAGS="-g3 -O0 -Wall -Werror -Woverloaded-virtual" + AM_CXXFLAGS="-g3 -O0 -Wall -Woverloaded-virtual" else - AM_CXXFLAGS="-O0 -Wall -Werror -Woverloaded-virtual" + AM_CXXFLAGS="-O0 -Wall -Woverloaded-virtual" fi else - AM_CFLAGS="-O3" - AM_CXXFLAGS="-O3" + my_save_cxxflags="$CXXFLAGS" + CXXFLAGS=-Ofast + AC_MSG_CHECKING([whether CXX supports -Ofast]) + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [AC_MSG_RESULT([yes])] + [AM_CFLAGS=-Ofast] + [AM_CXXFLAGS=-Ofast], + [AC_MSG_RESULT([no])] + [AM_CFLAGS=-O3] + [AM_CXXFLAGS=-O3], + ) + CXXFLAGS="$my_save_cxxflags" + AC_LANG_POP([C++]) fi AM_CFLAGS="$AM_CFLAGS -fPIC" AM_CXXFLAGS="$AM_CXXFLAGS -fPIC" +#stupid check for old or new g++ compiler param syntax for this compiler option +saved_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -ftemplate-depth=100" +AC_LANG_PUSH([C++]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],,[CXXFLAGS="$saved_CXXFLAGS -ftemplate-depth-100";]) +AC_LANG_POP([C++]) + # --------------------------------------------------------------------- # Check libraries # --------------------------------------------------------------------- @@ -125,9 +157,31 @@ if test x$with_zlib = xno; then AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEZLIB" fi +if test x$with_bzip2 = xyes; then + AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress,,with_bzip2="no") +else + with_bzip2="no" +fi + +if test x$with_bzip2 = xno; then + AM_CFLAGS="$AM_CFLAGS -DEXCLUDEBZIP2" + AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEBZIP2" +fi + +if test x$with_xz = xyes; then + AC_CHECK_LIB(lzma, lzma_easy_buffer_encode,,with_xz="no") +else + with_xz="no" +fi + +if test x$with_xz = xno; then + AM_CFLAGS="$AM_CFLAGS -DEXCLUDEXZ" + AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEXZ" +fi + AS_IF([test "x$with_internalregex" = "xyes"], - [have_systemregex="no"], - [AC_SEARCH_LIBS(regexec, regex, [have_systemregex="yes"], [have_systemregex="no"])]) + [have_systemregex="no, using internal regex"], + [AC_SEARCH_LIBS(regexec, regex, [have_systemregex="yes"], [have_systemregex="no, using internal regex"])]) AS_IF([test "x$have_systemregex" = "xyes"], [with_internalregex="no" @@ -196,9 +250,6 @@ AM_CXXFLAGS="$AM_CXXFLAGS -D_ICUSWORD_" AM_CFLAGS="$AM_CFLAGS -D_ICUSWORD_" fi - -AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25" - if test x$enable_warnings = xyes; then AM_CFLAGS="$AM_CFLAGS -Werror" AM_CXXFLAGS="$AM_CXXFLAGS -Werror -Woverloaded-virtual" @@ -224,7 +275,7 @@ if test x$with_curl = xyes; then if test "$CURL_CONFIG" = "no" ; then echo "*** The curl-config script installed by curl could not be found" echo "*** compiling without libcurl support" - with_curl=no + with_curl="no, using internal ftplib" with_curl_sftp=no with_internalftplib=yes else @@ -244,13 +295,13 @@ if test x$with_curl = xyes; then fi fi else - with_curl=no; + with_curl="no, using internal ftplib" with_curl_sftp=no; with_internalftplib=yes fi if test x$with_cxx11regex = xyes; then - AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11 -ftemplate-depth=100" + AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11" fi # --------------------------------------------------------------------- @@ -278,6 +329,34 @@ else fi fi +if test x$with_xapian = xyes; then + AC_LANG_CPLUSPLUS + AC_CHECK_LIB(xapian,main,,with_xapian="no") +else + with_xapian="no" +fi + +if test x$with_icuregex = xyes; then + if test x$with_icu = xno; then + with_icuregex="requested; but using ICU not enabled" + else + AM_CFLAGS="$AM_CFLAGS -DUSEICUREGEX" + AM_CXXFLAGS="$AM_CXXFLAGS -DUSEICUREGEX" + fi +else + with_icuregex="no" +fi + +if test x$with_xapian = xyes; then + AM_CFLAGS="$AM_CFLAGS -DUSEXAPIAN" + AM_CXXFLAGS="$AM_CXXFLAGS -DUSEXAPIAN" + if test x$with_clucene = xno; then + with_clucene="no" + else + with_clucene="$with_clucene; but using XAPIAN instead" + fi +fi + AC_CHECK_FUNCS(vsnprintf, [have_vsnprintf="yes"]) # --------------------------------------------------------------------- @@ -309,6 +388,23 @@ if test "$V3" -le 9 ; then V3=00$V3 ; elif test "$V3" -le 99 ; then V3=0$V3 ; fi if test "$V4" -le 9 ; then V4=00$V4 ; elif test "$V4" -le 99 ; then V4=0$V4 ; fi SWORD_VERSION_NUM=$V1$V2$V3$V4 +echo "checking compiler warnings" +m4_foreach(WARN_CHECK, [-Wno-address, -Wno-nonnull-compare], +[ + saved_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS WARN_CHECK" + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],[WARNING_CHECK=WARN_CHECK],[WARNING_CHECK=;]) + AC_LANG_POP([C++]) + CXXFLAGS="$saved_CXXFLAGS" + echo "WARNING_CHECK: $WARNING_CHECK" + WARNINGS_OFF="$WARNINGS_OFF $WARNING_CHECK" +]) + +echo "WARNINGS_OFF: $WARNINGS_OFF" +AM_CXXFLAGS="$AM_CXXFLAGS $WARNINGS_OFF" + + AC_SUBST(SWORD_VERSION_NUM) AC_SUBST(SWORD_VERSION_STR) AC_SUBST(SWORD_VERSION_MAJOR) @@ -322,6 +418,8 @@ AC_SUBST(SWORD_VERSION_NANO) # Substitute variables into makefiles # --------------------------------------------------------------------- AC_SUBST(with_zlib) +AC_SUBST(with_bzip2) +AC_SUBST(with_xz) AC_SUBST(with_icu) AC_SUBST(with_icusword) AC_SUBST(with_conf) @@ -351,6 +449,8 @@ AC_SUBST(CLUCENE_LIBS) # --------------------------------------------------------------------- AM_CONDITIONAL(HAVE_LIBZ, test x$with_zlib = xyes) +AM_CONDITIONAL(HAVE_BZIP2, test x$with_bzip2 = xyes) +AM_CONDITIONAL(HAVE_XZ, test x$with_xz = xyes) AM_CONDITIONAL(HAVE_ICU, test x$with_icu = xyes) AM_CONDITIONAL(HAVE_ICUSWORD, test x$with_icusword = xyes) AM_CONDITIONAL(HAVE_VSNPRINTF, test x$have_vsnprintf = xyes) @@ -359,7 +459,9 @@ AM_CONDITIONAL(USELUCENE, test "x$with_clucene" != xno) AM_CONDITIONAL(SHAREDLIB, test x$enable_shared = xyes) AM_CONDITIONAL(INSTCONF, test x$with_conf = xyes) AM_CONDITIONAL(USECXX11REGEX, test x$with_cxx11regex = xyes) +AM_CONDITIONAL(USEICUREGEX, test x$with_icuregex = xyes) AM_CONDITIONAL(WITHCURL, test x$with_curl = xyes) +AM_CONDITIONAL(WITHGAPI, test x$with_gapi = xyes) AM_CONDITIONAL(WITHCURLSFTP, test x$with_curl_sftp = xyes) AM_CONDITIONAL(INTERNALFTPLIB, test x$with_internalftplib = xyes) AM_CONDITIONAL(USE_INTERNAL_REGEX, test x$with_internalregex = xyes) @@ -372,29 +474,36 @@ AM_CONDITIONAL(BUILDEXAMPLES, test x$enable_examples = xyes) # --------------------------------------------------------------------- # Final output # --------------------------------------------------------------------- -AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile examples/tasks/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec) +AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile tests/testsuite/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile examples/tasks/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec) AC_OUTPUT echo echo echo "Configuration:" -echo " LIBDIR: $libdir" -echo " DEBUG: $enable_debug" -echo " PROFILE: $enable_profile" -echo " BUILD TESTS: $enable_tests" -echo " BUILD EXAMPLES: $enable_examples" -echo " BUILD UTILITIES: $enable_utilities" -echo " LIBZ: $with_zlib" -echo " ICU: $with_icu" -echo " ICUSWORD: $with_icusword" -echo " CXX11REGEX: $with_cxx11regex" -echo " CURL: $with_curl" -echo " CURL SFTP: $with_curl_sftp" -echo " INTERNAL FTPLIB: $with_internalftplib" -echo " INTERNAL REGEX: $with_internalregex" -echo " CLUCENE: $with_clucene" -echo -echo - +echo "" +echo " Settings:" +echo " LIBDIR: $libdir" +echo " DEBUG: $enable_debug" +echo " PROFILE: $enable_profile" +echo " BUILD TESTS: $enable_tests" +echo " BUILD EXAMPLES: $enable_examples" +echo " BUILD UTILITIES: $enable_utilities" +echo "" +echo " Dependencies for standard use:" +echo " REGEX: $have_systemregex" +echo " ZLIB: $with_zlib" +echo " LIBICU: $with_icu" +echo " LIBCURL: $with_curl" +echo " CLUCENE-CORE: $with_clucene" +echo "" +echo " Optional / Experimental:" +echo " LIBCURL SFTP: $with_curl_sftp" +echo " BZIP2: $with_bzip2" +echo " XZ: $with_xz" +echo " ICUSWORD: $with_icusword" +echo " CXX11-REGEX: $with_cxx11regex" +echo " ICU-REGEX: $with_icuregex" +echo " XAPIAN-CORE: $with_xapian" +echo " GAPI: $with_gapi" diff --git a/doc/Doxyfile b/doc/Doxyfile index dfec7a2..51ad5a1 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -6,7 +6,7 @@ # # Doxyfile 1.5.5 # -# $Id: usrinst.sh 2327 2009-04-22 11:42:33Z scribe $ +# $Id: Doxyfile 3562 2018-01-07 06:46:41Z greg.hellings $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society @@ -55,7 +55,7 @@ PROJECT_NAME = "The SWORD Project" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "1.7.4" +PROJECT_NUMBER = "1.8.1" # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/doc/QUICKSTART.ubuntu b/doc/QUICKSTART.ubuntu index 23a7b5a..73882bd 100755 --- a/doc/QUICKSTART.ubuntu +++ b/doc/QUICKSTART.ubuntu @@ -10,7 +10,7 @@ # the engine, install a modules, and test with a simple command line tool: # install necessary packages for all features of SWORD to be enabled -sudo apt-get install autoconf autogen automake subversion make g++ libtool zlib1g-dev libicu-dev libclucene-dev libcurl4-openssl-dev +sudo apt-get install autoconf autogen automake subversion make g++ libtool zlib1g-dev libicu-dev libclucene-dev libcurl4-openssl-dev libbz2-dev liblzma-dev # checkout and build the source tree svn co https://crosswire.org/svn/sword/trunk sword diff --git a/examples/Makefile.in b/examples/Makefile.in index 385c119..58e5cf0 100644 --- a/examples/Makefile.in +++ b/examples/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. @@ -326,9 +326,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 = cmdline tasks diff --git a/examples/classes/Makefile b/examples/classes/Makefile index c626fb0..04e3457 100644 --- a/examples/classes/Makefile +++ b/examples/classes/Makefile @@ -1,4 +1,4 @@ -TARGETS= ciphercng swmgrex verseranges lastVerseInChapter verseposition simplechapter flatapilookup flatapiparsekey flatapisearch +TARGETS= ciphercng swmgrex verseranges lastVerseInChapter verseposition simplechapter flatapilookup flatapiparsekey flatapisearch versenorm flatapiinstallmgr all: $(TARGETS) clean: diff --git a/examples/classes/flatapiinstallmgr.cpp b/examples/classes/flatapiinstallmgr.cpp new file mode 100644 index 0000000..6541063 --- /dev/null +++ b/examples/classes/flatapiinstallmgr.cpp @@ -0,0 +1,48 @@ +/****************************************************************************** + * + * flatapilookup.c - + * + * $Id$ + * + * Copyright 2014 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 <stdio.h> +#include <stdlib.h> + +#include <flatapi.h> + +int main(int argc, char **argv) { + if (argc != 4) { + fprintf(stderr, "\nusage: %s \"<sourceName>\" <\"modName\"> \"<destPath>\"\n" + "\tExample: CrossWire KJV ~/library\n\n", argv[0]); + exit(-1); + } + + + SWHANDLE mgr = org_crosswire_sword_SWMgr_newWithPath(argv[3]); + + SWHANDLE instMgr = org_crosswire_sword_InstallMgr_new("/home/scribe/.sword/InstallMgr", 0); + + org_crosswire_sword_InstallMgr_setUserDisclaimerConfirmed(instMgr); + + fprintf(stdout, "Install returned: %d\n", org_crosswire_sword_InstallMgr_remoteInstallModule(instMgr, mgr, argv[1], argv[2])); + + org_crosswire_sword_SWMgr_delete(mgr); + org_crosswire_sword_InstallMgr_delete(instMgr); + + return 0; +} diff --git a/examples/classes/flatapilookup.c b/examples/classes/flatapilookup.c index b76e7e2..9afde22 100644 --- a/examples/classes/flatapilookup.c +++ b/examples/classes/flatapilookup.c @@ -2,7 +2,7 @@ * * flatapilookup.c - * - * $Id: flatapilookup.c 3162 2014-04-17 04:05:54Z greg.hellings $ + * $Id: flatapilookup.c 3097 2014-03-11 11:40:13Z scribe $ * * Copyright 2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/examples/classes/flatapiparsekey.c b/examples/classes/flatapiparsekey.c index a8616a2..41f7118 100644 --- a/examples/classes/flatapiparsekey.c +++ b/examples/classes/flatapiparsekey.c @@ -2,7 +2,7 @@ * * flatapiparsekey.c - * - * $Id: flatapiparsekey.c 3162 2014-04-17 04:05:54Z greg.hellings $ + * $Id: flatapiparsekey.c 3097 2014-03-11 11:40:13Z scribe $ * * Copyright 2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/examples/classes/flatapisearch.c b/examples/classes/flatapisearch.c index 59e0074..715d6bc 100644 --- a/examples/classes/flatapisearch.c +++ b/examples/classes/flatapisearch.c @@ -2,7 +2,7 @@ * * flatapisearch.c - * - * $Id: flatapisearch.c 3165 2014-04-17 04:07:57Z greg.hellings $ + * $Id: flatapisearch.c 3102 2014-03-12 04:55:44Z chrislit $ * * Copyright 2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/examples/classes/simplechapter.cpp b/examples/classes/simplechapter.cpp index 2178181..489f730 100644 --- a/examples/classes/simplechapter.cpp +++ b/examples/classes/simplechapter.cpp @@ -2,7 +2,7 @@ * * simplechapter.cpp - * - * $Id: simplechapter.cpp 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: simplechapter.cpp 3045 2014-03-02 07:53:52Z chrislit $ * * Copyright 2013-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/examples/classes/versenorm.cpp b/examples/classes/versenorm.cpp new file mode 100644 index 0000000..08bad54 --- /dev/null +++ b/examples/classes/versenorm.cpp @@ -0,0 +1,72 @@ +/****************************************************************************** + * + * versenorm.cpp - checks normalization of verse to module + * + * $Id$ + * + * Copyright 2012-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 <iostream> +#include <swmgr.h> +#include <swmodule.h> +#include <versekey.h> + + +using namespace sword; +using namespace std; + + +int main(int argc, char **argv) { + + const char *modName = "RusCARS"; + const char *keyTextRegular = "1Sam1.20"; + const char *keyTextNeedsNormalization = "1Sam1.200"; + + + SWMgr library; + SWModule *book = library.getModule(modName); + if (!book) { + cerr << "Can't find module: " << modName << endl; + return -1; + } + + + // get two VerseKey objects for a module + VerseKey *verse = ((VerseKey *)book->createKey()); + VerseKey *verseNormalized = ((VerseKey *)book->createKey()); + + // turn off autonormalization for one VerseKey reference + verse->setAutoNormalize(false); + + // set a reference not requiring normalization to both VerseKey objects + verse->setText(keyTextRegular); + verseNormalized->setText(keyTextRegular); + + // check to see if they are equal + cout << *verse << ((*verse) == (*verseNormalized) ? " == " : " != ") << *verseNormalized << endl; + + // now do the same for a reference which requires normalization in this module's v11n system + verse->setText(keyTextNeedsNormalization); + verseNormalized->setText(keyTextNeedsNormalization); + + cout << *verse << ((*verse) == (*verseNormalized) ? " == " : " != ") << *verseNormalized << endl; + + delete verse; + delete verseNormalized; + + return 0; +} diff --git a/examples/cmdline/CMakeLists.txt b/examples/cmdline/CMakeLists.txt index bfbb995..a6c8c73 100644 --- a/examples/cmdline/CMakeLists.txt +++ b/examples/cmdline/CMakeLists.txt @@ -11,6 +11,7 @@ SET(example_PROGRAMS outrender search verserangeparse + stripaccents ) FOREACH(DEMO ${example_PROGRAMS}) diff --git a/examples/cmdline/Makefile.am b/examples/cmdline/Makefile.am index 1b14b67..1e1444e 100644 --- a/examples/cmdline/Makefile.am +++ b/examples/cmdline/Makefile.am @@ -5,10 +5,11 @@ AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex endif LDADD = $(top_builddir)/lib/libsword.la -noinst_PROGRAMS = lookup search threaded_search listoptions verserangeparse outplain outrender +noinst_PROGRAMS = lookup search threaded_search listoptions verserangeparse outplain outrender stripaccents lookup_SOURCES = lookup.cpp search_SOURCES = search.cpp +stripaccents_SOURCES = stripaccents.cpp listoptions_SOURCES = listoptions.cpp verserangeparse_SOURCES = verserangeparse.cpp threaded_search_SOURCES = threaded_search.cpp diff --git a/examples/cmdline/Makefile.in b/examples/cmdline/Makefile.in index 7ee0d78..6d8cded 100644 --- a/examples/cmdline/Makefile.in +++ b/examples/cmdline/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. @@ -82,7 +82,8 @@ target_triplet = @target@ @USE_INTERNAL_REGEX_TRUE@am__append_1 = -I$(top_srcdir)/include/internal/regex noinst_PROGRAMS = lookup$(EXEEXT) search$(EXEEXT) \ threaded_search$(EXEEXT) listoptions$(EXEEXT) \ - verserangeparse$(EXEEXT) outplain$(EXEEXT) outrender$(EXEEXT) + verserangeparse$(EXEEXT) outplain$(EXEEXT) outrender$(EXEEXT) \ + stripaccents$(EXEEXT) subdir = examples/cmdline DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp @@ -123,6 +124,10 @@ am_search_OBJECTS = search.$(OBJEXT) search_OBJECTS = $(am_search_OBJECTS) search_LDADD = $(LDADD) search_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_threaded_search_OBJECTS = threaded_search.$(OBJEXT) threaded_search_OBJECTS = $(am_threaded_search_OBJECTS) threaded_search_DEPENDENCIES = $(LDADD) @@ -165,11 +170,12 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = SOURCES = $(listoptions_SOURCES) $(lookup_SOURCES) $(outplain_SOURCES) \ - $(outrender_SOURCES) $(search_SOURCES) \ + $(outrender_SOURCES) $(search_SOURCES) $(stripaccents_SOURCES) \ $(threaded_search_SOURCES) $(verserangeparse_SOURCES) DIST_SOURCES = $(listoptions_SOURCES) $(lookup_SOURCES) \ $(outplain_SOURCES) $(outrender_SOURCES) $(search_SOURCES) \ - $(threaded_search_SOURCES) $(verserangeparse_SOURCES) + $(stripaccents_SOURCES) $(threaded_search_SOURCES) \ + $(verserangeparse_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -348,15 +354,18 @@ 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 AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1) LDADD = $(top_builddir)/lib/libsword.la lookup_SOURCES = lookup.cpp search_SOURCES = search.cpp +stripaccents_SOURCES = stripaccents.cpp listoptions_SOURCES = listoptions.cpp verserangeparse_SOURCES = verserangeparse.cpp threaded_search_SOURCES = threaded_search.cpp @@ -427,6 +436,10 @@ search$(EXEEXT): $(search_OBJECTS) $(search_DEPENDENCIES) $(EXTRA_search_DEPENDE @rm -f search$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(search_OBJECTS) $(search_LDADD) $(LIBS) +stripaccents$(EXEEXT): $(stripaccents_OBJECTS) $(stripaccents_DEPENDENCIES) $(EXTRA_stripaccents_DEPENDENCIES) + @rm -f stripaccents$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(stripaccents_OBJECTS) $(stripaccents_LDADD) $(LIBS) + threaded_search$(EXEEXT): $(threaded_search_OBJECTS) $(threaded_search_DEPENDENCIES) $(EXTRA_threaded_search_DEPENDENCIES) @rm -f threaded_search$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(threaded_search_OBJECTS) $(threaded_search_LDADD) $(LIBS) @@ -446,6 +459,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outplain.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outrender.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripaccents.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threaded_search.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verserangeparse.Po@am__quote@ diff --git a/examples/cmdline/bcppmake/cmdline.bpg b/examples/cmdline/bcppmake/cmdline.bpg index 943790e..756b532 100644 --- a/examples/cmdline/bcppmake/cmdline.bpg +++ b/examples/cmdline/bcppmake/cmdline.bpg @@ -1,81 +1,81 @@ -#------------------------------------------------------------------------------
-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 = icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib \
- listoptions.exe lookup.exe outplain.exe outrender.exe search.exe \
- verserangeparse.exe threaded_search.exe
-#------------------------------------------------------------------------------
-default: $(PROJECTS)
-#------------------------------------------------------------------------------
-
-libsword.lib: ..\..\..\lib\bcppmake\libsword.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-icuuc.lib: ..\..\..\..\icu-sword\as_is\borland\icuuc.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-icuin.lib: ..\..\..\..\icu-sword\as_is\borland\icuin.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-xml2gbs.exe: xml2gbs.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-osis2mod.exe: osis2mod.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-tei2mod.exe: tei2mod.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-installmgr.exe: installmgr.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-clucene.lib: ..\..\..\..\biblecs\clucene\clucene.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-libcurl.lib: ..\..\..\..\biblecs\apps\InstallMgr\libcurl.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-verserangeparse.exe: verserangeparse.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-threaded_search.exe: threaded_search.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-search.exe: search.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-outrender.exe: outrender.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-outplain.exe: outplain.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-lookup.exe: lookup.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-listoptions.exe: listoptions.bpr
- $(ROOT)\bin\bpr2mak $**
- $(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 = icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib \ + listoptions.exe lookup.exe outplain.exe outrender.exe search.exe \ + verserangeparse.exe threaded_search.exe +#------------------------------------------------------------------------------ +default: $(PROJECTS) +#------------------------------------------------------------------------------ + +libsword.lib: ..\..\..\lib\bcppmake\libsword.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +icuuc.lib: ..\..\..\..\icu-sword\as_is\borland\icuuc.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +icuin.lib: ..\..\..\..\icu-sword\as_is\borland\icuin.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +xml2gbs.exe: xml2gbs.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +osis2mod.exe: osis2mod.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +tei2mod.exe: tei2mod.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +installmgr.exe: installmgr.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +clucene.lib: ..\..\..\..\biblecs\clucene\clucene.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +libcurl.lib: ..\..\..\..\biblecs\apps\InstallMgr\libcurl.bpr + $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +verserangeparse.exe: verserangeparse.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +threaded_search.exe: threaded_search.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +search.exe: search.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +outrender.exe: outrender.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +outplain.exe: outplain.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +lookup.exe: lookup.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak + +listoptions.exe: listoptions.bpr + $(ROOT)\bin\bpr2mak $** + $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak diff --git a/examples/cmdline/bcppmake/listoptions.bpf b/examples/cmdline/bcppmake/listoptions.bpf index 9e2ee47..64148ce 100644 --- a/examples/cmdline/bcppmake/listoptions.bpf +++ b/examples/cmdline/bcppmake/listoptions.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\listoptions.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("..\listoptions.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/examples/cmdline/bcppmake/listoptions.bpr b/examples/cmdline/bcppmake/listoptions.bpr index 753553e..18ec3f1 100644 --- a/examples/cmdline/bcppmake/listoptions.bpr +++ b/examples/cmdline/bcppmake/listoptions.bpr @@ -1,96 +1,96 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="listoptions.exe"/>
- <OBJFILES value="..\listoptions.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="listoptions.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="listoptions.exe"/> + <OBJFILES value="..\listoptions.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib + ..\..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="listoptions.bpf"/> + <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/> + <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n + -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 + -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + </IDEOPTIONS> +</PROJECT> diff --git a/examples/cmdline/bcppmake/lookup.bpf b/examples/cmdline/bcppmake/lookup.bpf index d7722c5..f0f4680 100644 --- a/examples/cmdline/bcppmake/lookup.bpf +++ b/examples/cmdline/bcppmake/lookup.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\lookup.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("..\lookup.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/examples/cmdline/bcppmake/lookup.bpr b/examples/cmdline/bcppmake/lookup.bpr index 4b642c3..2db34e2 100644 --- a/examples/cmdline/bcppmake/lookup.bpr +++ b/examples/cmdline/bcppmake/lookup.bpr @@ -1,96 +1,96 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="lookup.exe"/>
- <OBJFILES value="..\lookup.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="lookup.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="lookup.exe"/> + <OBJFILES value="..\lookup.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib + ..\..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="lookup.bpf"/> + <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/> + <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n + -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 + -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + </IDEOPTIONS> +</PROJECT> diff --git a/examples/cmdline/bcppmake/outplain.bpf b/examples/cmdline/bcppmake/outplain.bpf index edce864..9995991 100644 --- a/examples/cmdline/bcppmake/outplain.bpf +++ b/examples/cmdline/bcppmake/outplain.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\outplain.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("..\outplain.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/examples/cmdline/bcppmake/outplain.bpr b/examples/cmdline/bcppmake/outplain.bpr index 089d890..cdc38b9 100644 --- a/examples/cmdline/bcppmake/outplain.bpr +++ b/examples/cmdline/bcppmake/outplain.bpr @@ -1,96 +1,96 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="outplain.exe"/>
- <OBJFILES value="..\outplain.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="outplain.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="outplain.exe"/> + <OBJFILES value="..\outplain.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib + ..\..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="outplain.bpf"/> + <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/> + <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n + -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 + -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + </IDEOPTIONS> +</PROJECT> diff --git a/examples/cmdline/bcppmake/outrender.bpf b/examples/cmdline/bcppmake/outrender.bpf index 0ca9e33..6ff21ee 100644 --- a/examples/cmdline/bcppmake/outrender.bpf +++ b/examples/cmdline/bcppmake/outrender.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\outrender.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("..\outrender.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/examples/cmdline/bcppmake/outrender.bpr b/examples/cmdline/bcppmake/outrender.bpr index 6c2438a..609e1ec 100644 --- a/examples/cmdline/bcppmake/outrender.bpr +++ b/examples/cmdline/bcppmake/outrender.bpr @@ -1,96 +1,96 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="outrender.exe"/>
- <OBJFILES value="..\outrender.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="outrender.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="outrender.exe"/> + <OBJFILES value="..\outrender.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib + ..\..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="outrender.bpf"/> + <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/> + <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n + -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 + -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + </IDEOPTIONS> +</PROJECT> diff --git a/examples/cmdline/bcppmake/search.bpf b/examples/cmdline/bcppmake/search.bpf index 438ee60..b85f692 100644 --- a/examples/cmdline/bcppmake/search.bpf +++ b/examples/cmdline/bcppmake/search.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\search.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
+USEUNIT("..\search.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 diff --git a/examples/cmdline/bcppmake/search.bpr b/examples/cmdline/bcppmake/search.bpr index 23a79ca..13417b3 100644 --- a/examples/cmdline/bcppmake/search.bpr +++ b/examples/cmdline/bcppmake/search.bpr @@ -1,96 +1,96 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="search.exe"/>
- <OBJFILES value="..\search.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="search.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="search.exe"/> + <OBJFILES value="..\search.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib + ..\..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="search.bpf"/> + <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/> + <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n + -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 + -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + </IDEOPTIONS> +</PROJECT> diff --git a/examples/cmdline/bcppmake/threaded_search.bpf b/examples/cmdline/bcppmake/threaded_search.bpf index f69800a..8871afd 100644 --- a/examples/cmdline/bcppmake/threaded_search.bpf +++ b/examples/cmdline/bcppmake/threaded_search.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\threaded_search.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("..\threaded_search.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/examples/cmdline/bcppmake/threaded_search.bpr b/examples/cmdline/bcppmake/threaded_search.bpr index a666afa..5459afd 100644 --- a/examples/cmdline/bcppmake/threaded_search.bpr +++ b/examples/cmdline/bcppmake/threaded_search.bpr @@ -1,96 +1,96 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="threaded_search.exe"/>
- <OBJFILES value="..\threaded_search.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="threaded_search.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="threaded_search.exe"/> + <OBJFILES value="..\threaded_search.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib + ..\..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="threaded_search.bpf"/> + <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/> + <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n + -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 + -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + </IDEOPTIONS> +</PROJECT> diff --git a/examples/cmdline/bcppmake/verserangeparse.bpf b/examples/cmdline/bcppmake/verserangeparse.bpf index 6e2bc5a..b237e62 100644 --- a/examples/cmdline/bcppmake/verserangeparse.bpf +++ b/examples/cmdline/bcppmake/verserangeparse.bpf @@ -1,11 +1,11 @@ -USEUNIT("..\verserangeparse.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("..\verserangeparse.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/examples/cmdline/bcppmake/verserangeparse.bpr b/examples/cmdline/bcppmake/verserangeparse.bpr index 89de5ae..aa2a4e2 100644 --- a/examples/cmdline/bcppmake/verserangeparse.bpr +++ b/examples/cmdline/bcppmake/verserangeparse.bpr @@ -1,96 +1,96 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="verserangeparse.exe"/>
- <OBJFILES value="..\verserangeparse.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="verserangeparse.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="verserangeparse.exe"/> + <OBJFILES value="..\verserangeparse.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib + ..\..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="verserangeparse.bpf"/> + <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/> + <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n + -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 + -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + +[Debugging] +DebugSourceDirs=$(BCB)\source\vcl + +[Parameters] +RunParams=./nasb nasb.xml +HostApplication= +RemoteHost= +RemotePath= +RemoteDebug=0 + +[Language] +ActiveLang= +ProjectLang= +RootDir= + </IDEOPTIONS> +</PROJECT> diff --git a/examples/cmdline/lookup.cpp b/examples/cmdline/lookup.cpp index 2ff80c8..e328143 100644 --- a/examples/cmdline/lookup.cpp +++ b/examples/cmdline/lookup.cpp @@ -3,7 +3,7 @@ * lookup.cpp - Simple example of how to retrieve an entry from a * SWORD module * - * $Id: lookup.cpp 3187 2014-04-17 04:34:03Z greg.hellings $ + * $Id: lookup.cpp 3483 2017-06-25 15:19:34Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,7 @@ #include <swfilter.h> #include <markupfiltmgr.h> #include <versekey.h> +//#include "../../bindings/corba/orbitcpp/webmgr.hpp" using sword::SWMgr; @@ -36,7 +37,9 @@ using sword::MarkupFilterMgr; using sword::SWModule; using sword::FMT_WEBIF; using sword::FMT_HTMLHREF; +using sword::FMT_XHTML; using sword::FMT_RTF; +using sword::FMT_LATEX; using sword::ModMap; using sword::AttributeTypeList; using sword::AttributeList; @@ -48,8 +51,13 @@ using sword::FilterList; int main(int argc, char **argv) { - SWMgr manager(new MarkupFilterMgr(FMT_WEBIF)); -// SWMgr manager(new MarkupFilterMgr(FMT_HTMLHREF)); +// for testing webmgr +// WebMgr manager((const char *)0); +// manager.setJavascript(true); +// + SWMgr manager(new MarkupFilterMgr(FMT_XHTML)); +// SWMgr manager(new MarkupFilterMgr(FMT_WEBIF)); + SWModule *target; if (argc != 3) { @@ -71,7 +79,7 @@ int main(int argc, char **argv) // turn all filters to default values manager.setGlobalOption("Headings", "On"); - manager.setGlobalOption("Strong's Numbers", "On"); + manager.setGlobalOption("Strong's Numbers", "Off"); manager.setGlobalOption("Lemmas", "Off"); // manager.setGlobalOption("Greek Accents", "Off"); diff --git a/examples/cmdline/search.cpp b/examples/cmdline/search.cpp index f437430..1a3b098 100644 --- a/examples/cmdline/search.cpp +++ b/examples/cmdline/search.cpp @@ -6,7 +6,7 @@ * * search KJV "swift hear slow speak" * - * $Id: search.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: search.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -36,15 +36,23 @@ using namespace sword; #endif -/* - * >=0 - regex - * -1 - phrase - * -2 - multiword - * -3 - entryAttrib (eg. Word//Lemma/G1234/) - * -4 - Lucene - */ +// FROM swmodule.h + /* + * >=0 - regex; (for backward compat, if > 0 then used as additional REGEX FLAGS) + * -1 - phrase + * -2 - multiword + * -3 - entryAttrib (eg. Word//Lemma./G1234/) (Lemma with dot means check components (Lemma.[1-9]) also) + * -4 - Lucene + * -5 - multilemma window; set 'flags' param to window size (NOT DONE) + */ char SEARCH_TYPE=-2; +int flags = 0 +// for case insensitivity +| REG_ICASE +// for use with entryAttrib search type to match whole entry to value, e.g., G1234 and not G12345 +//| SEARCHFLAG_MATCHWHOLEENTRY +; char printed = 0; void percentUpdate(char percent, void *userData) { @@ -68,7 +76,7 @@ int main(int argc, char **argv) SWMgr manager; SWModule *target; ListKey listkey; - ListKey scope; + ListKey *scope = 0; ModMap::iterator it; if ((argc < 3) || (argc > 5)) { @@ -81,7 +89,7 @@ int main(int argc, char **argv) SWBuf searchTerm = argv[2]; manager.setGlobalOption("Greek Accents", "Off"); - manager.setGlobalOption("Strong's Numbers", "On"); + manager.setGlobalOption("Strong's Numbers", "Off"); manager.setGlobalOption("Hebrew Vowel Points", "Off"); manager.filterText("Greek Accents", searchTerm); @@ -96,32 +104,33 @@ int main(int argc, char **argv) target = (*it).second; + ListKey maybeScope; if (argc > 3) { // if min / max specified SWKey *k = target->getKey(); VerseKey *parser = SWDYNAMIC_CAST(VerseKey, k); VerseKey kjvParser; if (!parser) parser = &kjvParser; // use standard KJV parsing as fallback - scope = parser->parseVerseList(argv[3], *parser, true); - scope.setPersist(true); - target->setKey(scope); + maybeScope = parser->parseVerseList(argv[3], *parser, true); + scope = &maybeScope; } std::cerr << "[0=================================50===============================100]\n "; char lineLen = 70; - listkey = target->search(searchTerm.c_str(), SEARCH_TYPE, /*SEARCHFLAG_MATCHWHOLEENTRY*/ REG_ICASE, 0, 0, &percentUpdate, &lineLen); + listkey = target->search(searchTerm.c_str(), SEARCH_TYPE, flags, scope, 0, &percentUpdate, &lineLen); std::cerr << std::endl; - if (argc > 4) { // if min / max specified - scope = listkey; - scope.setPersist(true); - target->setKey(scope); + if (argc > 4) { // example: if a second search term is supplied, search again for a second search term, limiting to previous results + scope = &listkey; printed = 0; std::cerr << " "; - listkey = target->search(argv[4], SEARCH_TYPE, /*SEARCHFLAG_MATCHWHOLEENTRY*/ REG_ICASE, 0, 0, &percentUpdate, &lineLen); + listkey = target->search(argv[4], SEARCH_TYPE, flags, scope, 0, &percentUpdate, &lineLen); std::cerr << std::endl; } - listkey.sort(); +// we don't want to sort by verse if we've been given scores +// listkey.sort(); while (!listkey.popError()) { - std::cout << (const char *)listkey << std::endl; + std::cout << (const char *)listkey; + if (listkey.getElement()->userData) std::cout << " : " << (__u64)listkey.getElement()->userData << "%"; + std::cout << std::endl; listkey++; } diff --git a/examples/cmdline/stripaccents.cpp b/examples/cmdline/stripaccents.cpp new file mode 100644 index 0000000..34061d5 --- /dev/null +++ b/examples/cmdline/stripaccents.cpp @@ -0,0 +1,80 @@ +/****************************************************************************** + * + * stripaccents.cpp - This simple example shows how to strip diacritical marks from a stringa + * using the SWORD library. It amounts to a simple commandline + * tool with a usage like: + * + * stripaccents 4 "וְהָאָ֗רֶץ הָיְתָ֥ה תֹ֙הוּ֙ וָבֹ֔הוּ וְחֹ֖שֶׁךְ עַל־פְּנֵ֣י תְהֹ֑ום וְר֣וּחַ " + * + * + * $Id: stripaccents.cpp 3382 2015-09-01 22:57GMT refdoc $ + * + * 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 <stdio.h> +#include <cstdlib> +#include <swmgr.h> +#include <markupfiltmgr.h> +#include <iostream> + +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif + +int usage() +{ + fprintf(stderr, "\nusage: stripaccents <n=1-15> <text-to-be-stripped> \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 << 3)) manager.filterText("Hebrew Cantillation", stripTerm); + if (stripFilters & (1 << 2)) manager.filterText("Hebrew Vowel Points", stripTerm); + if (stripFilters & (1 << 1)) manager.filterText("Arabic Vowel Points", stripTerm); + if (stripFilters & (1 << 0)) manager.filterText("Greek Accents", stripTerm); + + fprintf(stdout,"%s\n",stripTerm.c_str()); + return 0; + +} diff --git a/examples/tasks/CMakeLists.txt b/examples/tasks/CMakeLists.txt index dceeb0b..d63731d 100644 --- a/examples/tasks/CMakeLists.txt +++ b/examples/tasks/CMakeLists.txt @@ -6,6 +6,8 @@ MESSAGE(STATUS "\n-- CONFIGURING LIBRARY EXAMPLES") SET(example_PROGRAMS parallelbibles + simpleverselookup + listbiblebooknames ) FOREACH(DEMO ${example_PROGRAMS}) diff --git a/examples/tasks/Makefile.am b/examples/tasks/Makefile.am index bdc5169..318a73b 100644 --- a/examples/tasks/Makefile.am +++ b/examples/tasks/Makefile.am @@ -5,7 +5,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex endif LDADD = $(top_builddir)/lib/libsword.la -noinst_PROGRAMS = parallelbibles +noinst_PROGRAMS = parallelbibles listbiblebooknames simpleverselookup parallelbibles_SOURCES = parallelbibles.cpp - +listbiblebooknames_SOURCES = listbiblebooknames.cpp +simpleverselookup_SOURCES = simpleverselookup.cpp diff --git a/examples/tasks/Makefile.in b/examples/tasks/Makefile.in index e9d3d12..254abf1 100644 --- a/examples/tasks/Makefile.in +++ b/examples/tasks/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,7 +80,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @USE_INTERNAL_REGEX_TRUE@am__append_1 = -I$(top_srcdir)/include/internal/regex -noinst_PROGRAMS = parallelbibles$(EXEEXT) +noinst_PROGRAMS = parallelbibles$(EXEEXT) listbiblebooknames$(EXEEXT) \ + simpleverselookup$(EXEEXT) subdir = examples/tasks DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp @@ -97,14 +98,22 @@ CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) -am_parallelbibles_OBJECTS = parallelbibles.$(OBJEXT) -parallelbibles_OBJECTS = $(am_parallelbibles_OBJECTS) -parallelbibles_LDADD = $(LDADD) -parallelbibles_DEPENDENCIES = $(top_builddir)/lib/libsword.la +am_listbiblebooknames_OBJECTS = listbiblebooknames.$(OBJEXT) +listbiblebooknames_OBJECTS = $(am_listbiblebooknames_OBJECTS) +listbiblebooknames_LDADD = $(LDADD) +listbiblebooknames_DEPENDENCIES = $(top_builddir)/lib/libsword.la AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +am_parallelbibles_OBJECTS = parallelbibles.$(OBJEXT) +parallelbibles_OBJECTS = $(am_parallelbibles_OBJECTS) +parallelbibles_LDADD = $(LDADD) +parallelbibles_DEPENDENCIES = $(top_builddir)/lib/libsword.la +am_simpleverselookup_OBJECTS = simpleverselookup.$(OBJEXT) +simpleverselookup_OBJECTS = $(am_simpleverselookup_OBJECTS) +simpleverselookup_LDADD = $(LDADD) +simpleverselookup_DEPENDENCIES = $(top_builddir)/lib/libsword.la AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -139,8 +148,10 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(parallelbibles_SOURCES) -DIST_SOURCES = $(parallelbibles_SOURCES) +SOURCES = $(listbiblebooknames_SOURCES) $(parallelbibles_SOURCES) \ + $(simpleverselookup_SOURCES) +DIST_SOURCES = $(listbiblebooknames_SOURCES) $(parallelbibles_SOURCES) \ + $(simpleverselookup_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -319,14 +330,18 @@ 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 AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1) LDADD = $(top_builddir)/lib/libsword.la parallelbibles_SOURCES = parallelbibles.cpp +listbiblebooknames_SOURCES = listbiblebooknames.cpp +simpleverselookup_SOURCES = simpleverselookup.cpp all: all-am .SUFFIXES: @@ -371,17 +386,27 @@ clean-noinstPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +listbiblebooknames$(EXEEXT): $(listbiblebooknames_OBJECTS) $(listbiblebooknames_DEPENDENCIES) $(EXTRA_listbiblebooknames_DEPENDENCIES) + @rm -f listbiblebooknames$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(listbiblebooknames_OBJECTS) $(listbiblebooknames_LDADD) $(LIBS) + parallelbibles$(EXEEXT): $(parallelbibles_OBJECTS) $(parallelbibles_DEPENDENCIES) $(EXTRA_parallelbibles_DEPENDENCIES) @rm -f parallelbibles$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(parallelbibles_OBJECTS) $(parallelbibles_LDADD) $(LIBS) +simpleverselookup$(EXEEXT): $(simpleverselookup_OBJECTS) $(simpleverselookup_DEPENDENCIES) $(EXTRA_simpleverselookup_DEPENDENCIES) + @rm -f simpleverselookup$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(simpleverselookup_OBJECTS) $(simpleverselookup_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listbiblebooknames.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parallelbibles.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simpleverselookup.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/examples/tasks/listbiblebooknames.cpp b/examples/tasks/listbiblebooknames.cpp new file mode 100644 index 0000000..5c42072 --- /dev/null +++ b/examples/tasks/listbiblebooknames.cpp @@ -0,0 +1,57 @@ +/****************************************************************************** + * + * verseranges.cpp - This example demonstrates how to work with contiguous + * verse ranges using VerseKey + * + * $Id$ + * + * Copyright 2011-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 <iostream> + +#include <swmgr.h> +#include <swmodule.h> +#include <versekey.h> + + +using namespace sword; +using namespace std; + + +int main(int argc, char **argv) { + + cout << "\n"; + + const char *modName = (argc > 1) ? argv[1] : "KJV"; + SWMgr manager; + SWModule *bible = manager.getModule(modName); + if (!bible) { + cout << modName << " module is not installed.\nPlease install to show versification (v11n) from this specific Bible.\nShowing builtin KJV v11n scheme..\n\n"; + } + + VerseKey *vk = (bible) ? (VerseKey *)bible->getKey() : new VerseKey(); + + for ((*vk) = TOP; !vk->popError(); vk->setBook(vk->getBook()+1)) { + cout << vk->getBookName() << "\n"; + } + + // if we 'new'ed a VerseKey unassociated with a module, above, then we should delete it. + if (!bible) delete vk; + + return 0; +} + diff --git a/examples/simple.cpp b/examples/tasks/simpleverselookup.cpp index c46346b..164e66c 100644 --- a/examples/simple.cpp +++ b/examples/tasks/simpleverselookup.cpp @@ -16,7 +16,7 @@ * * SWMgr library(0, 0, true, new MarkupFilterMgr(FMT_HTMLHREF)); * - * $Id: simple.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: simpleverselookup.cpp 3483 2017-06-25 15:19:34Z scribe $ * * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -34,6 +34,10 @@ * */ +// Simple example to show James 1:19 from KJV, +// if argv[1] is passed then use this instead of KJV +// if argv[2] is passed then use this instead of James 1:19 + #include <swmgr.h> #include <swmodule.h> #include <iostream> @@ -44,10 +48,17 @@ using std::cout; int main(int argc, char **argv) { + // instantiate a SWORD Manager to give access to the installed library of books (modules) SWMgr library; - SWModule *darby = library.getModule("Darby"); - darby->setKey("James 1:19"); - cout << darby->RenderText(); + + // try to retrieve a reference to an installed book (module) + SWModule *book = library.getModule((argc > 1) ? argv[1] : "KJV"); + + // set that book's reference key to our desired verse + book->setKey((argc > 2) ? argv[2] : "James 1:19"); + + // ask the book to render the current text + cout << book->renderText() << "\n"; return 0; } diff --git a/include/Makefile.am b/include/Makefile.am index cd7cec0..122d893 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,6 +15,7 @@ pkginclude_HEADERS += $(swincludedir)/versificationmgr.h pkginclude_HEADERS += $(swincludedir)/flatapi.h pkginclude_HEADERS += $(swincludedir)/ftpparse.h pkginclude_HEADERS += $(swincludedir)/remotetrans.h +pkginclude_HEADERS += $(swincludedir)/rtranspgdrive.h pkginclude_HEADERS += $(swincludedir)/ftplibftpt.h pkginclude_HEADERS += $(swincludedir)/ftplib.h @@ -32,8 +33,9 @@ pkginclude_HEADERS += $(swincludedir)/gbfrtf.h pkginclude_HEADERS += $(swincludedir)/gbfstrongs.h pkginclude_HEADERS += $(swincludedir)/gbfwordjs.h pkginclude_HEADERS += $(swincludedir)/gbfthml.h -pkginclude_HEADERS += $(swincludedir)/greeklexattribs.h +pkginclude_HEADERS += $(swincludedir)/gbflatex.h +pkginclude_HEADERS += $(swincludedir)/greeklexattribs.h pkginclude_HEADERS += $(swincludedir)/hebrewmcim.h pkginclude_HEADERS += $(swincludedir)/hrefcom.h pkginclude_HEADERS += $(swincludedir)/installmgr.h @@ -66,6 +68,7 @@ pkginclude_HEADERS += $(swincludedir)/osisscripref.h pkginclude_HEADERS += $(swincludedir)/osiswordjs.h pkginclude_HEADERS += $(swincludedir)/osisvariants.h pkginclude_HEADERS += $(swincludedir)/osisxlit.h +pkginclude_HEADERS += $(swincludedir)/osislatex.h pkginclude_HEADERS += $(swincludedir)/papyriplain.h pkginclude_HEADERS += $(swincludedir)/rawcom.h @@ -131,11 +134,13 @@ pkginclude_HEADERS += $(swincludedir)/thmlscripref.h pkginclude_HEADERS += $(swincludedir)/thmlstrongs.h pkginclude_HEADERS += $(swincludedir)/thmlvariants.h pkginclude_HEADERS += $(swincludedir)/thmlwordjs.h +pkginclude_HEADERS += $(swincludedir)/thmllatex.h pkginclude_HEADERS += $(swincludedir)/teiplain.h pkginclude_HEADERS += $(swincludedir)/teirtf.h pkginclude_HEADERS += $(swincludedir)/teixhtml.h pkginclude_HEADERS += $(swincludedir)/teihtmlhref.h +pkginclude_HEADERS += $(swincludedir)/teilatex.h pkginclude_HEADERS += $(swincludedir)/treekey.h pkginclude_HEADERS += $(swincludedir)/treekeyidx.h @@ -153,6 +158,7 @@ pkginclude_HEADERS += $(swincludedir)/utf8html.h pkginclude_HEADERS += $(swincludedir)/utf8latin1.h pkginclude_HEADERS += $(swincludedir)/utf8nfc.h pkginclude_HEADERS += $(swincludedir)/utf8nfkd.h +pkginclude_HEADERS += $(swincludedir)/utf8scsu.h pkginclude_HEADERS += $(swincludedir)/utf8transliterator.h pkginclude_HEADERS += $(swincludedir)/utf8utf16.h pkginclude_HEADERS += $(swincludedir)/utilstr.h @@ -161,11 +167,16 @@ pkginclude_HEADERS += $(swincludedir)/utilxml.h pkginclude_HEADERS += $(swincludedir)/versekey.h pkginclude_HEADERS += $(swincludedir)/versetreekey.h pkginclude_HEADERS += $(swincludedir)/zcom.h +pkginclude_HEADERS += $(swincludedir)/zcom4.h pkginclude_HEADERS += $(swincludedir)/zipcomprs.h +pkginclude_HEADERS += $(swincludedir)/bz2comprs.h +pkginclude_HEADERS += $(swincludedir)/xzcomprs.h pkginclude_HEADERS += $(swincludedir)/zld.h pkginclude_HEADERS += $(swincludedir)/zstr.h pkginclude_HEADERS += $(swincludedir)/ztext.h +pkginclude_HEADERS += $(swincludedir)/ztext4.h pkginclude_HEADERS += $(swincludedir)/zverse.h +pkginclude_HEADERS += $(swincludedir)/zverse4.h pkginclude_HEADERS += $(swincludedir)/canon_kjva.h pkginclude_HEADERS += $(swincludedir)/canon_leningrad.h @@ -182,4 +193,7 @@ pkginclude_HEADERS += $(swincludedir)/canon_catholic2.h pkginclude_HEADERS += $(swincludedir)/canon_lxx.h pkginclude_HEADERS += $(swincludedir)/canon_orthodox.h pkginclude_HEADERS += $(swincludedir)/canon_null.h +pkginclude_HEADERS += $(swincludedir)/canon_segond.h +pkginclude_HEADERS += $(swincludedir)/canon_calvin.h +pkginclude_HEADERS += $(swincludedir)/canon_darbyfr.h diff --git a/include/bz2comprs.h b/include/bz2comprs.h index 8452dfc..449a385 100644 --- a/include/bz2comprs.h +++ b/include/bz2comprs.h @@ -3,7 +3,7 @@ * bz2comprs.h - Bzip2Compress, a driver class that provides bzip2 * compression (Burrows–Wheeler with Huffman coding) * - * $Id: bz2comprs.h 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: bz2comprs.h 3045 2014-03-02 07:53:52Z chrislit $ * * Copyright 2000-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/canon_calvin.h b/include/canon_calvin.h new file mode 100644 index 0000000..b13e4ca --- /dev/null +++ b/include/canon_calvin.h @@ -0,0 +1,395 @@ +/****************************************************************************** + * + * canon_calvin.h - Versification data for French Bibles de Genève + * (Bibles de Genève, Épée, Martin, Ostervald) + * + * $Id$ + * + * Copyright 1998-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. + * + */ + +#ifndef CANON_CALVIN_H +#define CANON_CALVIN_H + +SWORD_NAMESPACE_START + + +// Versification system: Calvin + +/* Book order: + Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr + Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel + Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Matt Mark Luke John + Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus + Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev +*/ + +/* The first Bible de Genève, a revision of the Bible d'Olivétan, was + released in 1560 by Jean Calvin. The Bible d'Olivétan was printed + without verse division. + Because Bibles employing this versification system, introduced by + Robert 'Stephanus' Estienne in 1553 differ subtly in versification, + this is not based on any single edition, although some may + eventually match, but on multiple editions of these bibles. +*/ + +// Apocryphal books are not included. + + +/****************************************************************************** + * [on]tbooks_calvin - initialize static instance for all canonical + * text names and chapmax + * + * for otbooks_calvin, use otbooks + * + * for ntbooks_calvin, use ntbooks + * + ******************************************************************************/ + + +/****************************************************************************** + * Maximum verses per chapter + */ + +int vm_calvin[] = { + // Genesis + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + // Exodus + 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + // Leviticus + 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, + // Numbers + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 15, 34, 45, 41, 50, 13, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, + // Deuteronomy + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, + 30, 52, 29, 12, + // Joshua + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, + // Judges + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, + // Ruth + 22, 23, 18, 22, + // I Samuel + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, + 15, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, + // II Samuel + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, + 22, 51, 39, 25, + // I Kings + 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 54, + // II Kings + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, + // I Chronicles + 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, + 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, + // II Chronicles + 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, + // Ezra + 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, + // Nehemiah + 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, + 36, 47, 31, + // Esther + 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, + // Job + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 38, 38, 28, + 25, 17, + // Psalms + 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, + 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, + 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, + 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, + 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, + 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, + 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, + 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, + 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, + 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, + 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, + // Proverbs + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, + // Ecclesiastes + 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, + 8, 16, + // Song of Solomon + 17, 17, 11, 16, 16, 13, 13, 14, + // Isaiah + 31, 22, 26, 6, 30, 13, 25, 23, 20, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 12, 25, 24, + // Jeremiah + 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, + // Lamentations + 22, 22, 66, 22, 22, + // Ezekiel + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, + // Daniel + 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, + 45, 13, + // Hosea + 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, + 11, 15, 16, 9, + // Joel + 20, 32, 21, + // Amos + 15, 16, 15, 13, 27, 14, 17, 14, 15, + // Obadiah + 21, + // Jonah + 16, 11, 10, 11, + // Micah + 16, 13, 12, 13, 15, 16, 20, + // Nahum + 15, 13, 19, + // Habakkuk + 17, 20, 19, + // Zephaniah + 18, 15, 20, + // Haggai + 15, 23, + // Zechariah + 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, + // Malachi + 14, 17, 18, 6, + // ----------------------------------------------------------------- + // Matthew + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, + // Mark + 45, 28, 35, 41, 43, 56, 37, 38, 51, 53, + 33, 44, 37, 72, 47, 20, + // Luke + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, + // John + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, + // Acts + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 40, 38, + 40, 30, 35, 28, 27, 32, 44, 31, + // Romans + 32, 29, 30, 25, 21, 23, 25, 38, 33, 21, + 36, 21, 14, 23, 33, 27, + // I Corinthians + 31, 16, 22, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, + // II Corinthians + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 13, + // Galatians + 24, 21, 29, 31, 26, 18, + // Ephesians + 23, 22, 21, 32, 33, 24, + // Philippians + 30, 30, 21, 23, + // Colossians + 29, 23, 25, 18, + // I Thessalonians + 10, 20, 13, 18, 28, + // II Thessalonians + 12, 17, 18, + // I Timothy + 20, 15, 16, 16, 25, 21, + // II Timothy + 18, 26, 17, 22, + // Titus + 16, 15, 15, + // Philemon + 25, + // Hebrews + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, + // James + 27, 26, 18, 17, 20, + // I Peter + 25, 25, 22, 19, 14, + // II Peter + 21, 22, 18, + // I John + 10, 29, 24, 21, 21, + // II John + 13, + // III John + 15, + // Jude + 25, + // Revelation of John + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 +}; + +unsigned char mappings_calvin[] = { + 0, + 4, 13, 1, 0, 12, 16, 0, + 4, 13, 2, 0, 13, 1, 0, + 4, 30, 1, 0, 29, 40, 0, + 4, 30, 2, 0, 30, 1, 0, + 9, 20, 43, 0, 20, 42, 0, + 9, 24, 1, 0, 23, 29, 0, + 9, 24, 2, 0, 24, 1, 0, + 11, 22, 44, 0, 22, 43, 0, + 18, 39, 1, 0, 38, 39, 0, + 18, 39, 4, 0, 39, 1, 0, + 18, 39, 34, 0, 40, 1, 0, + 18, 40, 1, 0, 40, 6, 0, + 18, 40, 20, 0, 41, 1, 0, + 18, 41, 1, 0, 41, 10, 0, + 19, 3, 2, 0, 3, 1, 0, + 19, 4, 2, 0, 4, 1, 0, + 19, 5, 2, 0, 5, 1, 0, + 19, 6, 2, 0, 6, 1, 0, + 19, 7, 2, 0, 7, 1, 0, + 19, 8, 2, 0, 8, 1, 0, + 19, 9, 2, 0, 9, 1, 0, + 19, 12, 2, 0, 12, 1, 0, + 19, 18, 2, 0, 18, 1, 0, + 19, 19, 2, 0, 19, 1, 0, + 19, 20, 2, 0, 20, 1, 0, + 19, 21, 2, 0, 21, 1, 0, + 19, 22, 2, 0, 22, 1, 0, + 19, 30, 2, 0, 30, 1, 0, + 19, 31, 2, 0, 31, 1, 0, + 19, 34, 2, 0, 34, 1, 0, + 19, 36, 2, 0, 36, 1, 0, + 19, 38, 2, 0, 38, 1, 0, + 19, 39, 2, 0, 39, 1, 0, + 19, 40, 2, 0, 40, 1, 0, + 19, 41, 2, 0, 41, 1, 0, + 19, 42, 2, 0, 42, 1, 0, + 19, 44, 2, 0, 44, 1, 0, + 19, 45, 2, 0, 45, 1, 0, + 19, 46, 2, 0, 46, 1, 0, + 19, 47, 2, 0, 47, 1, 0, + 19, 48, 2, 0, 48, 1, 0, + 19, 49, 2, 0, 49, 1, 0, + 19, 51, 2, 0, 51, 1, 0, + 19, 51, 3, 0, 51, 1, 0, + 19, 52, 2, 0, 52, 1, 0, + 19, 52, 3, 0, 52, 1, 0, + 19, 53, 2, 0, 53, 1, 0, + 19, 54, 3, 0, 54, 1, 0, + 19, 55, 2, 0, 55, 1, 0, + 19, 56, 2, 0, 56, 1, 0, + 19, 57, 2, 0, 57, 1, 0, + 19, 58, 2, 0, 58, 1, 0, + 19, 59, 2, 0, 59, 1, 0, + 19, 60, 2, 0, 60, 1, 0, + 19, 60, 3, 0, 60, 1, 0, + 19, 61, 2, 0, 61, 1, 0, + 19, 62, 2, 0, 62, 1, 0, + 19, 63, 2, 0, 63, 1, 0, + 19, 64, 2, 0, 64, 1, 0, + 19, 65, 2, 0, 65, 1, 0, + 19, 67, 2, 0, 67, 1, 0, + 19, 68, 2, 0, 68, 1, 0, + 19, 69, 2, 0, 69, 1, 0, + 19, 70, 2, 0, 70, 1, 0, + 19, 75, 2, 0, 75, 1, 0, + 19, 76, 2, 0, 76, 1, 0, + 19, 77, 2, 0, 77, 1, 0, + 19, 80, 2, 0, 80, 1, 0, + 19, 81, 2, 0, 81, 1, 0, + 19, 83, 2, 0, 83, 1, 0, + 19, 84, 2, 0, 84, 1, 0, + 19, 85, 2, 0, 85, 1, 0, + 19, 88, 2, 0, 88, 1, 0, + 19, 89, 2, 0, 89, 1, 0, + 19, 92, 2, 0, 92, 1, 0, + 19, 102, 2, 0, 102, 1, 0, + 19, 108, 2, 0, 108, 1, 0, + 19, 140, 2, 0, 140, 1, 0, + 19, 142, 2, 0, 142, 1, 0, + 21, 12, 1, 0, 11, 9, 0, + 21, 12, 3, 0, 12, 1, 0, + 23, 8, 23, 0, 9, 1, 0, + 23, 9, 1, 0, 9, 2, 0, + 26, 21, 1, 0, 20, 45, 0, + 26, 21, 6, 0, 21, 1, 0, + 28, 12, 1, 0, 11, 12, 0, + 28, 12, 2, 0, 12, 1, 0, + 32, 2, 1, 0, 1, 17, 0, + 32, 2, 2, 0, 2, 1, 0, + 41, 9, 51, 0, 9, 50, 0, + 41, 10, 53, 0, 10, 52, 0, + 44, 19, 40, 0, 19, 41, 0, + 45, 3, 23, 0, 3, 24, 0, + 46, 3, 22, 0, 3, 23, 0, + 64, 1, 15, 0, 1, 14, 0, + 66, 12, 18, 0, 13, 1, 0, + 0 +}; + +SWORD_NAMESPACE_END + +#endif diff --git a/include/canon_darbyfr.h b/include/canon_darbyfr.h new file mode 100644 index 0000000..cd54ba5 --- /dev/null +++ b/include/canon_darbyfr.h @@ -0,0 +1,311 @@ +/****************************************************************************** + * + * canon_darbyfr.h - Versification data for the French Darby Bibles + * + * $Id$ + * + * Copyright 1998-2015 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. + * + */ + +#ifndef CANON_DARBYFR_H +#define CANON_DARBYFR_H + +SWORD_NAMESPACE_START + + +// Versification system: DarbyFR +// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev + +// This versification scheme is based on the French Darby translation. + + +/****************************************************************************** + * [on]tbooks_darbyfr - initialize static instance for all canonical + * text names and chapmax + * + * for otbooks_darbyfr, use otbooks + * + * for ntbooks_darbyfr, use ntbooks + * + ******************************************************************************/ + +/****************************************************************************** + * Maximum verses per chapter + */ + +int vm_darbyfr[] = { + // Genesis + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + // Exodus + 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + // Leviticus + 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, + // Numbers + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 15, 34, 45, 41, 50, 13, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 40, 17, + 54, 42, 56, 29, 34, 13, + // Deuteronomy + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 25, 22, 19, 19, 26, 69, 29, 20, + 30, 52, 29, 12, + // Joshua + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, + // Judges + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, + // Ruth + 22, 23, 18, 22, + // I Samuel + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, + 15, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, + // II Samuel + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, + 22, 51, 39, 25, + // I Kings + 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 54, + // II Kings + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, + // I Chronicles + 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, + 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, + // II Chronicles + 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, + // Ezra + 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, + // Nehemiah + 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, + 36, 47, 31, + // Esther + 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, + // Job + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 38, 38, 27, + 25, 17, + // Psalms + 6, 12, 8, 8, 12, 10, 17, 9, 20, 18, + 7, 8, 5, 7, 5, 11, 15, 50, 14, 9, + 13, 31, 6, 10, 22, 12, 14, 9, 11, 12, + 24, 11, 22, 22, 28, 12, 40, 22, 13, 17, + 13, 11, 5, 26, 17, 11, 9, 14, 20, 23, + 19, 9, 6, 7, 23, 13, 11, 11, 17, 12, + 8, 12, 11, 10, 13, 20, 7, 35, 36, 5, + 24, 20, 28, 23, 10, 12, 20, 72, 13, 19, + 16, 8, 18, 12, 13, 17, 7, 18, 52, 17, + 16, 15, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 28, 22, 35, 45, 48, 43, 13, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 13, + 10, 7, 12, 15, 21, 10, 20, 14, 9, 6, + // Proverbs + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, + // Ecclesiastes + 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, + 10, 14, + // Song of Solomon + 17, 17, 11, 16, 16, 13, 13, 14, + // Isaiah + 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 12, 25, 24, + // Jeremiah + 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, + // Lamentations + 22, 22, 66, 22, 22, + // Ezekiel + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, + // Daniel + 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, + 45, 13, + // Hosea + 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, + 11, 15, 16, 9, + // Joel + 20, 32, 21, + // Amos + 15, 16, 15, 13, 27, 14, 17, 14, 15, + // Obadiah + 21, + // Jonah + 16, 11, 10, 11, + // Micah + 16, 13, 12, 13, 15, 16, 20, + // Nahum + 15, 13, 19, + // Habakkuk + 17, 20, 19, + // Zephaniah + 18, 15, 20, + // Haggai + 15, 23, + // Zechariah + 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, + // Malachi + 14, 17, 18, 6, + // ----------------------------------------------------------------- + // Matthew + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, + // Mark + 45, 28, 35, 41, 43, 56, 37, 38, 51, 52, + 33, 44, 37, 72, 47, 20, + // Luke + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, + // John + 52, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, + // Acts + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, + 40, 30, 35, 27, 27, 32, 44, 31, + // Romans + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, + // I Corinthians + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, + // II Corinthians + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 13, + // Galatians + 24, 21, 29, 31, 26, 18, + // Ephesians + 23, 22, 21, 32, 33, 24, + // Philippians + 30, 30, 21, 23, + // Colossians + 29, 23, 25, 18, + // I Thessalonians + 10, 20, 13, 18, 28, + // II Thessalonians + 12, 17, 18, + // I Timothy + 20, 15, 16, 16, 25, 21, + // II Timothy + 18, 26, 17, 22, + // Titus + 16, 15, 15, + // Philemon + 25, + // Hebrews + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, + // James + 27, 26, 18, 17, 20, + // I Peter + 25, 25, 22, 19, 14, + // II Peter + 21, 22, 18, + // I John + 10, 29, 24, 21, 21, + // II John + 13, + // III John + 15, + // Jude + 25, + // Revelation of John + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 +}; + +unsigned char mappings_darbyfr[] = { + 0, + 3, 5, 20, 0, 6, 1, 0, + 3, 6, 1, 0, 6, 8, 0, + 4, 13, 1, 0, 12, 16, 0, + 4, 13, 2, 0, 13, 1, 0, + 4, 30, 2, 0, 30, 1, 0, + 5, 28, 69, 0, 29, 1, 0, + 5, 29, 1, 0, 29, 2, 0, + 9, 20, 43, 0, 20, 42, 0, + 9, 24, 1, 0, 23, 29, 0, + 9, 24, 2, 0, 24, 1, 0, + 11, 22, 44, 0, 22, 43, 0, + 18, 39, 1, 0, 38, 39, 0, + 18, 39, 4, 0, 39, 1, 0, + 18, 39, 34, 0, 40, 1, 0, + 18, 40, 1, 0, 40, 6, 0, + 18, 40, 20, 0, 41, 1, 0, + 18, 41, 1, 0, 41, 9, 0, + 18, 41, 1, 0, 41, 10, 0, + 19, 13, 1, 0, 13, 2, 0, + 26, 21, 1, 0, 20, 45, 0, + 26, 21, 6, 0, 21, 1, 0, + 28, 12, 1, 0, 11, 12, 0, + 28, 12, 2, 0, 12, 1, 0, + 32, 2, 1, 0, 1, 17, 0, + 32, 2, 2, 0, 2, 1, 0, + 41, 9, 51, 0, 9, 50, 0, + 43, 1, 39, 0, 1, 38, 0, + 47, 13, 13, 0, 13, 14, 0, + 64, 1, 15, 0, 1, 14, 0, + 66, 12, 18, 0, 13, 1, 0, + 0 +}; + +SWORD_NAMESPACE_END + +#endif diff --git a/include/canon_nrsv.h b/include/canon_nrsv.h index 6959512..e131e2e 100644 --- a/include/canon_nrsv.h +++ b/include/canon_nrsv.h @@ -2,7 +2,7 @@ * * canon_nrsv.h - Versification data for the NRSV system * - * $Id: canon_nrsv.h 2915 2013-07-23 16:55:54Z chrislit $ + * $Id: canon_nrsv.h 3240 2014-07-12 16:27:35Z scribe $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -264,6 +264,12 @@ int vm_nrsv[] = { 27, 21 }; +unsigned char mappings_nrsv[] = { + 0, + 66, 12, 18, 19, 13, 1, 0, + 66, 13, 1, 1, 13, 1, 0, + 0 +}; SWORD_NAMESPACE_END diff --git a/include/canon_segond.h b/include/canon_segond.h new file mode 100644 index 0000000..16b5f4d --- /dev/null +++ b/include/canon_segond.h @@ -0,0 +1,390 @@ +/****************************************************************************** + * + * canon_segond.h - Versification data for French Louis Segond original + * and revised Bibles + * + * $Id$ + * + * Copyright 1998-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. + * + */ + +#ifndef CANON_SEGOND_H +#define CANON_SEGOND_H + +SWORD_NAMESPACE_START + +// Versification system: Segond + +// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev + +// Because different editions of the L. Segond Bibles employing this versification system differ subtly in versification, this is not based on any single edition, but on multiple editions of these Bibles. + + +/****************************************************************************** + * [on]tbooks_segond - initialize static instance for all canonical text names + * and chapmax + * + * for otbooks_segond, use otbooks + * + * for ntbooks_segond, use ntbooks + * + ******************************************************************************/ + +/****************************************************************************** + * Maximum verses per chapter + */ + +int vm_segond[] = { + // Genesis + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + // Exodus + 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + // Leviticus + 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, + // Numbers + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 50, 13, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, + // Deuteronomy + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, + 30, 52, 29, 12, + // Joshua + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, + // Judges + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, + // Ruth + 22, 23, 18, 22, + // I Samuel + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, + 15, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, + // II Samuel + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, + 22, 51, 39, 25, + // I Kings + 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 54, + // II Kings + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, + // I Chronicles + 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, + 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, + // II Chronicles + 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, + // Ezra + 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, + // Nehemiah + 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, + 36, 47, 31, + // Esther + 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, + // Job + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 38, 38, 28, + 25, 17, + // Psalms + 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, + 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, + 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, + 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, + 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, + 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, + 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, + 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, + 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, + 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, + 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, + // Proverbs + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, + // Ecclesiastes + 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, + 8, 16, + // Song of Solomon + 17, 17, 11, 16, 16, 12, 14, 14, + // Isaiah + 31, 22, 26, 6, 30, 13, 25, 23, 20, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 11, 25, 24, + // Jeremiah + 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, + // Lamentations + 22, 22, 66, 22, 22, + // Ezekiel + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, + // Daniel + 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, + 45, 13, + // Hosea + 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, + 11, 15, 16, 9, + // Joel + 20, 32, 21, + // Amos + 15, 16, 15, 13, 27, 14, 17, 14, 15, + // Obadiah + 21, + // Jonah + 16, 11, 10, 11, + // Micah + 16, 13, 12, 14, 14, 16, 20, + // Nahum + 14, 14, 19, + // Habakkuk + 17, 20, 19, + // Zephaniah + 18, 15, 20, + // Haggai + 15, 23, + // Zechariah + 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, + // Malachi + 14, 17, 18, 6, + // ----------------------------------------------------------------- + // Matthew + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, + // Mark + 45, 28, 35, 41, 43, 56, 37, 38, 51, 52, + 33, 44, 37, 72, 47, 20, + // Luke + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, + // John + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, + // Acts + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 40, 38, + 40, 30, 35, 27, 27, 32, 44, 31, + // Romans + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, + // I Corinthians + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, + // II Corinthians + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 13, + // Galatians + 24, 21, 29, 31, 26, 18, + // Ephesians + 23, 22, 21, 32, 33, 24, + // Philippians + 30, 30, 21, 23, + // Colossians + 29, 23, 25, 18, + // I Thessalonians + 10, 20, 13, 18, 28, + // II Thessalonians + 12, 17, 18, + // I Timothy + 20, 15, 16, 16, 25, 21, + // II Timothy + 18, 26, 17, 22, + // Titus + 16, 15, 15, + // Philemon + 25, + // Hebrews + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, + // James + 27, 26, 18, 17, 20, + // I Peter + 25, 25, 22, 19, 14, + // II Peter + 21, 22, 18, + // I John + 10, 29, 24, 21, 21, + // II John + 13, + // III John + 15, + // Jude + 25, + // Revelation of John + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 +}; + +unsigned char mappings_segond[] = { + 0, + 2, 7, 26, 0, 8, 1, 0, + 2, 8, 1, 0, 8, 5, 0, + 3, 5, 20, 0, 6, 1, 0, + 3, 6, 1, 0, 6, 8, 0, + 4, 30, 1, 0, 29, 40, 0, + 4, 30, 2, 0, 30, 1, 0, + 9, 20, 43, 0, 20, 42, 0, + 9, 24, 1, 0, 23, 29, 0, + 9, 24, 2, 0, 24, 1, 0, + 11, 22, 44, 0, 22, 43, 0, + 18, 39, 1, 0, 38, 39, 0, + 18, 39, 4, 0, 39, 1, 0, + 18, 39, 34, 0, 40, 1, 0, + 18, 40, 1, 0, 40, 6, 0, + 18, 40, 20, 0, 41, 1, 0, + 18, 41, 1, 0, 41, 10, 0, + 19, 3, 2, 0, 3, 1, 0, + 19, 4, 2, 0, 4, 1, 0, + 19, 5, 2, 0, 5, 1, 0, + 19, 6, 2, 0, 6, 1, 0, + 19, 7, 2, 0, 7, 1, 0, + 19, 8, 2, 0, 8, 1, 0, + 19, 9, 2, 0, 9, 1, 0, + 19, 12, 2, 0, 12, 1, 0, + 19, 18, 2, 0, 18, 1, 0, + 19, 19, 2, 0, 19, 1, 0, + 19, 20, 2, 0, 20, 1, 0, + 19, 21, 2, 0, 21, 1, 0, + 19, 22, 2, 0, 22, 1, 0, + 19, 30, 2, 0, 30, 1, 0, + 19, 31, 2, 0, 31, 1, 0, + 19, 34, 2, 0, 34, 1, 0, + 19, 36, 2, 0, 36, 1, 0, + 19, 38, 2, 0, 38, 1, 0, + 19, 39, 2, 0, 39, 1, 0, + 19, 40, 2, 0, 40, 1, 0, + 19, 41, 2, 0, 41, 1, 0, + 19, 42, 2, 0, 42, 1, 0, + 19, 44, 2, 0, 44, 1, 0, + 19, 45, 2, 0, 45, 1, 0, + 19, 46, 2, 0, 46, 1, 0, + 19, 47, 2, 0, 47, 1, 0, + 19, 48, 2, 0, 48, 1, 0, + 19, 49, 2, 0, 49, 1, 0, + 19, 51, 2, 0, 51, 1, 0, + 19, 51, 3, 0, 51, 1, 0, + 19, 52, 2, 0, 52, 1, 0, + 19, 52, 3, 0, 52, 1, 0, + 19, 53, 2, 0, 53, 1, 0, + 19, 54, 3, 0, 54, 1, 0, + 19, 55, 2, 0, 55, 1, 0, + 19, 56, 2, 0, 56, 1, 0, + 19, 57, 2, 0, 57, 1, 0, + 19, 58, 2, 0, 58, 1, 0, + 19, 59, 2, 0, 59, 1, 0, + 19, 60, 2, 0, 60, 1, 0, + 19, 60, 3, 0, 60, 1, 0, + 19, 61, 2, 0, 61, 1, 0, + 19, 62, 2, 0, 62, 1, 0, + 19, 63, 2, 0, 63, 1, 0, + 19, 64, 2, 0, 64, 1, 0, + 19, 65, 2, 0, 65, 1, 0, + 19, 67, 2, 0, 67, 1, 0, + 19, 68, 2, 0, 68, 1, 0, + 19, 69, 2, 0, 69, 1, 0, + 19, 70, 2, 0, 70, 1, 0, + 19, 75, 2, 0, 75, 1, 0, + 19, 76, 2, 0, 76, 1, 0, + 19, 77, 2, 0, 77, 1, 0, + 19, 80, 2, 0, 80, 1, 0, + 19, 81, 2, 0, 81, 1, 0, + 19, 83, 2, 0, 83, 1, 0, + 19, 84, 2, 0, 84, 1, 0, + 19, 85, 2, 0, 85, 1, 0, + 19, 88, 2, 0, 88, 1, 0, + 19, 89, 2, 0, 89, 1, 0, + 19, 92, 2, 0, 92, 1, 0, + 19, 102, 2, 0, 102, 1, 0, + 19, 108, 2, 0, 108, 1, 0, + 19, 140, 2, 0, 140, 1, 0, + 19, 142, 2, 0, 142, 1, 0, + 21, 4, 17, 0, 5, 1, 0, + 21, 5, 1, 0, 5, 2, 0, + 21, 12, 1, 0, 11, 9, 0, + 21, 12, 3, 0, 12, 1, 0, + 22, 7, 1, 0, 6, 13, 0, + 22, 7, 2, 0, 7, 1, 0, + 23, 8, 23, 0, 9, 1, 0, + 23, 9, 1, 0, 9, 2, 0, + 23, 63, 19, 0, 64, 1, 0, + 23, 64, 2, 0, 64, 3, 0, + 26, 21, 1, 0, 20, 45, 0, + 26, 21, 6, 0, 21, 1, 0, + 28, 2, 1, 0, 1, 10, 0, + 28, 2, 3, 0, 2, 1, 0, + 28, 12, 1, 0, 11, 12, 0, + 28, 12, 2, 0, 12, 1, 0, + 32, 2, 1, 0, 1, 17, 0, + 32, 2, 2, 0, 2, 1, 0, + 33, 4, 14, 0, 5, 1, 0, + 33, 5, 1, 0, 5, 2, 0, + 34, 2, 1, 0, 1, 15, 0, + 34, 2, 2, 0, 2, 1, 0, + 41, 9, 51, 0, 9, 50, 0, + 44, 19, 40, 0, 19, 41, 0, + 47, 13, 12, 0, 13, 13, 0, + 64, 1, 15, 0, 1, 14, 0, + 66, 12, 18, 0, 13, 1, 0, + 0 +}; + +SWORD_NAMESPACE_END + +#endif diff --git a/include/canon_synodal.h b/include/canon_synodal.h index c153d81..9fb4119 100644 --- a/include/canon_synodal.h +++ b/include/canon_synodal.h @@ -2,7 +2,7 @@ * * canon_synodal.h - Versification data for the Synodal system * - * $Id: canon_synodal.h 2915 2013-07-23 16:55:54Z chrislit $ + * $Id: canon_synodal.h 3240 2014-07-12 16:27:35Z scribe $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -393,6 +393,199 @@ int vm_synodal[] = { 27, 21 }; +unsigned char mappings_synodal[] = { + 'P', 'r', 'A', 'z', 'a', 'r', 0, + 'S', 'u', 's', 0, + 'B', 'e', 'l', 0, + 0, + 3, 14, 55, 0, 14, 55, 56, + 4, 13, 1, 0, 12, 16, 0, + 4, 13, 2, 0, 13, 1, 0, + 4, 30, 1, 0, 29, 40, 0, + 4, 30, 2, 0, 30, 1, 0, + 6, 5, 16, 0, 6, 1, 0, + 6, 6, 1, 0, 6, 2, 0, + 9, 24, 1, 0, 23, 29, 0, + 9, 24, 2, 0, 24, 1, 0, + 22, 39, 31, 0, 40, 1, 0, + 22, 40, 1, 0, 40, 6, 0, + 22, 40, 20, 0, 41, 1, 0, + 22, 41, 1, 0, 41, 9, 0, + 23, 3, 1, 0, 3, 0, 0, + 23, 4, 1, 0, 4, 0, 0, + 23, 5, 1, 0, 5, 0, 0, + 23, 6, 1, 0, 6, 0, 0, + 23, 7, 1, 0, 7, 0, 0, + 23, 8, 1, 0, 8, 0, 0, + 23, 9, 1, 0, 9, 0, 0, + 23, 9, 22, 0, 10, 1, 0, + 23, 10, 1, 0, 11, 0, 1, + 23, 11, 1, 0, 12, 0, 0, + 23, 12, 1, 0, 13, 0, 0, + 23, 12, 6, 0, 13, 5, 6, + 23, 13, 1, 0, 14, 0, 1, + 23, 14, 1, 0, 15, 0, 1, + 23, 15, 1, 0, 16, 0, 1, + 23, 16, 1, 0, 17, 0, 1, + 23, 17, 1, 0, 18, 0, 0, + 23, 18, 1, 0, 19, 0, 0, + 23, 19, 1, 0, 20, 0, 0, + 23, 20, 1, 0, 21, 0, 0, + 23, 21, 1, 0, 22, 0, 0, + 23, 22, 1, 0, 23, 0, 1, + 23, 23, 1, 0, 24, 0, 1, + 23, 24, 1, 0, 25, 0, 1, + 23, 25, 1, 0, 26, 0, 1, + 23, 26, 1, 0, 27, 0, 1, + 23, 27, 1, 0, 28, 0, 1, + 23, 28, 1, 0, 29, 0, 1, + 23, 29, 1, 0, 30, 0, 0, + 23, 30, 1, 0, 31, 0, 0, + 23, 31, 1, 0, 32, 0, 1, + 23, 32, 1, 0, 33, 0, 1, + 23, 33, 1, 0, 34, 0, 0, + 23, 34, 1, 0, 35, 0, 1, + 23, 35, 1, 0, 36, 0, 0, + 23, 36, 1, 0, 37, 0, 1, + 23, 37, 1, 0, 38, 0, 0, + 23, 38, 1, 0, 39, 0, 0, + 23, 39, 1, 0, 40, 0, 0, + 23, 40, 1, 0, 41, 0, 0, + 23, 41, 1, 0, 42, 0, 0, + 23, 42, 0, 0, 43, 0, 0, + 23, 43, 1, 0, 44, 0, 0, + 23, 44, 1, 0, 45, 0, 0, + 23, 45, 1, 0, 46, 0, 0, + 23, 46, 1, 0, 47, 0, 0, + 23, 47, 1, 0, 48, 0, 0, + 23, 48, 1, 0, 49, 0, 0, + 23, 49, 0, 0, 50, 0, 0, + 23, 50, 1, 2, 51, 0, 0, + 23, 51, 1, 2, 52, 0, 0, + 23, 52, 1, 0, 53, 0, 0, + 23, 53, 1, 2, 54, 0, 0, + 23, 54, 1, 0, 55, 0, 0, + 23, 55, 1, 0, 56, 0, 0, + 23, 56, 1, 0, 57, 0, 0, + 23, 57, 1, 0, 58, 0, 0, + 23, 58, 1, 0, 59, 0, 0, + 23, 59, 1, 2, 60, 0, 0, + 23, 60, 1, 0, 61, 0, 0, + 23, 61, 1, 0, 62, 0, 0, + 23, 62, 1, 0, 63, 0, 0, + 23, 63, 1, 0, 64, 0, 0, + 23, 64, 1, 0, 65, 0, 0, + 23, 65, 1, 0, 66, 0, 1, + 23, 66, 1, 0, 67, 0, 0, + 23, 67, 1, 0, 68, 0, 0, + 23, 68, 1, 0, 69, 0, 0, + 23, 69, 1, 0, 70, 0, 0, + 23, 70, 0, 0, 71, 0, 0, + 23, 71, 0, 0, 72, 0, 0, + 23, 72, 0, 0, 73, 0, 0, + 23, 73, 0, 0, 74, 0, 0, + 23, 74, 1, 0, 75, 0, 0, + 23, 75, 1, 0, 76, 0, 0, + 23, 76, 1, 0, 77, 0, 0, + 23, 77, 0, 0, 78, 0, 0, + 23, 78, 0, 0, 79, 0, 0, + 23, 79, 1, 0, 80, 0, 0, + 23, 80, 1, 0, 81, 0, 0, + 23, 81, 0, 0, 82, 0, 0, + 23, 82, 1, 0, 83, 0, 0, + 23, 83, 1, 0, 84, 0, 0, + 23, 84, 1, 0, 85, 0, 0, + 23, 85, 0, 0, 86, 0, 0, + 23, 86, 1, 0, 87, 0, 0, + 23, 86, 2, 0, 87, 1, 2, + 23, 87, 1, 0, 88, 0, 0, + 23, 88, 1, 0, 89, 0, 0, + 23, 89, 1, 0, 90, 0, 0, + 23, 89, 6, 0, 90, 5, 6, + 23, 90, 0, 0, 91, 0, 0, + 23, 91, 1, 0, 92, 0, 0, + 23, 92, 0, 0, 93, 0, 0, + 23, 93, 0, 0, 94, 0, 0, + 23, 94, 0, 0, 95, 0, 0, + 23, 95, 0, 0, 96, 0, 0, + 23, 96, 0, 0, 97, 0, 0, + 23, 97, 0, 0, 98, 0, 0, + 23, 98, 0, 0, 99, 0, 0, + 23, 99, 0, 0, 100, 0, 0, + 23, 100, 0, 0, 101, 0, 0, + 23, 101, 1, 0, 102, 0, 0, + 23, 102, 0, 0, 103, 0, 0, + 23, 103, 0, 0, 104, 0, 0, + 23, 104, 0, 0, 105, 0, 0, + 23, 105, 0, 0, 106, 0, 0, + 23, 106, 0, 0, 107, 0, 0, + 23, 107, 1, 0, 108, 0, 0, + 23, 108, 0, 0, 109, 0, 0, + 23, 109, 0, 0, 110, 0, 0, + 23, 110, 0, 0, 111, 0, 0, + 23, 111, 0, 1, 112, 1, 0, + 23, 112, 0, 1, 113, 1, 0, + 23, 113, 0, 0, 114, 0, 0, + 23, 113, 9, 0, 115, 1, 0, + 23, 114, 0, 0, 116, 0, 0, + 23, 115, 1, 0, 116, 10, 0, + 23, 116, 0, 0, 117, 0, 0, + 23, 117, 0, 0, 118, 0, 0, + 23, 118, 0, 0, 119, 0, 0, + 23, 119, 0, 0, 120, 0, 0, + 23, 120, 0, 0, 121, 0, 0, + 23, 121, 0, 0, 122, 0, 0, + 23, 122, 0, 0, 123, 0, 0, + 23, 123, 0, 0, 124, 0, 0, + 23, 124, 0, 0, 125, 0, 0, + 23, 125, 0, 0, 126, 0, 0, + 23, 126, 0, 0, 127, 0, 0, + 23, 127, 0, 0, 128, 0, 0, + 23, 128, 0, 0, 129, 0, 0, + 23, 129, 0, 0, 130, 0, 0, + 23, 130, 0, 0, 131, 0, 0, + 23, 131, 0, 0, 132, 0, 0, + 23, 132, 0, 0, 133, 0, 0, + 23, 133, 0, 0, 134, 0, 0, + 23, 134, 0, 1, 135, 1, 0, + 23, 135, 0, 0, 136, 0, 0, + 23, 136, 0, 0, 137, 0, 0, + 23, 137, 0, 0, 138, 0, 0, + 23, 138, 0, 0, 139, 0, 0, + 23, 139, 1, 0, 140, 0, 0, + 23, 140, 0, 0, 141, 0, 0, + 23, 141, 0, 0, 142, 0, 0, + 23, 142, 0, 0, 143, 0, 0, + 23, 143, 0, 0, 144, 0, 0, + 23, 144, 0, 0, 145, 0, 0, + 23, 145, 0, 1, 146, 1, 0, + 23, 146, 0, 1, 147, 1, 0, + 23, 147, 1, 0, 147, 12, 0, + 23, 148, 0, 1, 148, 1, 0, + 23, 149, 0, 1, 149, 1, 0, + 23, 150, 0, 1, 150, 1, 0, + 25, 4, 17, 0, 5, 1, 0, + 25, 5, 1, 0, 5, 2, 0, + 26, 1, 0, 0, 1, 1, 0, + 26, 7, 1, 0, 6, 13, 0, + 26, 7, 2, 0, 7, 1, 0, + 79, 3, 24, 0, 1, 1, 0, 35, + 79, 3, 52, 0, 1, 29, 30, 35, + 35, 3, 91, 0, 3, 24, 0, + 35, 3, 98, 0, 4, 1, 0, + 35, 4, 1, 0, 4, 4, 0, + 80, 13, 1, 0, 1, 1, 0, 35, + 81, 14, 1, 0, 1, 1, 0, 35, + 36, 14, 1, 0, 13, 16, 0, + 36, 14, 2, 0, 14, 1, 0, + 40, 2, 1, 0, 1, 17, 0, + 40, 2, 2, 0, 2, 1, 0, + 56, 19, 40, 0, 19, 40, 41, + 64, 14, 24, 0, 16, 25, 0, + 66, 13, 12, 0, 13, 12, 13, + 62, 1, 14, 15, 1, 14, 0, + 0 +}; SWORD_NAMESPACE_END diff --git a/include/canon_vulg.h b/include/canon_vulg.h index 9fa8e04..5822193 100644 --- a/include/canon_vulg.h +++ b/include/canon_vulg.h @@ -2,7 +2,7 @@ * * canon_vulg.h - Versification data for the Vulg system * - * $Id: canon_vulg.h 2915 2013-07-23 16:55:54Z chrislit $ + * $Id: canon_vulg.h 3240 2014-07-12 16:27:35Z scribe $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -386,6 +386,288 @@ int vm_vulg[] = { 20 }; +unsigned char mappings_vulg[] = { + 'E', 'p', 'J', 'e', 'r', 0, + 'P', 'r', 'A', 'z', 'a', 'r', 0, + 'S', 'u', 's', 0, + 'B', 'e', 'l', 0, + 0, + 1, 49, 31, 0, 49, 31, 32, + 1, 50, 22, 0, 50, 22, 23, + 2, 40, 13, 0, 40, 13, 15, + 3, 26, 45, 0, 26, 45, 46, + 4, 11, 34, 0, 11, 34, 35, + 4, 13, 1, 0, 12, 16, 0, + 4, 13, 2, 0, 13, 1, 0, + 4, 20, 29, 0, 20, 28, 0, + 4, 26, 1, 0, 25, 19, 0, + 4, 26, 1, 0, 26, 1, 0, + 6, 4, 24, 0, 4, 23, 0, + 6, 5, 15, 0, 5, 14, 0, + 6, 21, 36, 0, 21, 36, 37, + 6, 21, 37, 0, 21, 38, 39, + 7, 5, 32, 0, 5, 31, 0, + 7, 21, 24, 0, 21, 24, 25, + 9, 20, 41, 0, 20, 42, 0, + 9, 20, 43, 0, 21, 1, 0, + 9, 24, 1, 0, 23, 28, 29, + 9, 24, 2, 0, 24, 1, 0, + 13, 11, 46, 0, 11, 46, 47, + 13, 20, 7, 0, 20, 7, 8, + 16, 3, 30, 0, 3, 30, 31, + 16, 12, 33, 0, 12, 33, 34, + 20, 16, 5, 0, 16, 4, 0, + 20, 39, 31, 0, 40, 1, 0, + 20, 40, 1, 0, 40, 6, 0, + 20, 40, 20, 0, 41, 1, 0, + 20, 41, 1, 0, 41, 10, 0, + 20, 42, 16, 0, 42, 16, 17, + 21, 2, 13, 0, 2, 12, 0, + 21, 3, 2, 0, 3, 1, 0, + 21, 4, 2, 0, 4, 1, 0, + 21, 4, 9, 10, 4, 8, 0, + 21, 5, 2, 0, 5, 1, 0, + 21, 6, 2, 0, 6, 1, 0, + 21, 7, 2, 0, 7, 1, 0, + 21, 8, 2, 0, 8, 1, 0, + 21, 9, 2, 0, 9, 1, 0, + 21, 9, 22, 0, 10, 1, 0, + 21, 10, 1, 2, 11, 1, 0, + 21, 11, 0, 0, 12, 0, 0, + 21, 12, 1, 0, 13, 1, 0, + 21, 12, 2, 3, 13, 2, 0, + 21, 13, 0, 0, 14, 0, 0, + 21, 14, 1, 0, 15, 1, 0, + 21, 15, 0, 0, 16, 0, 0, + 21, 15, 10, 0, 16, 10, 11, + 21, 16, 0, 0, 17, 0, 0, + 21, 17, 1, 2, 18, 1, 0, + 21, 18, 1, 2, 19, 1, 0, + 21, 19, 1, 2, 20, 1, 0, + 21, 20, 1, 2, 21, 1, 0, + 21, 21, 1, 2, 22, 1, 0, + 21, 22, 0, 0, 23, 0, 0, + 21, 23, 0, 0, 24, 0, 0, + 21, 24, 0, 0, 25, 0, 0, + 21, 25, 0, 0, 26, 0, 0, + 21, 26, 0, 0, 27, 0, 0, + 21, 27, 0, 0, 28, 0, 0, + 21, 28, 0, 0, 29, 0, 0, + 21, 29, 1, 2, 30, 1, 0, + 21, 30, 1, 2, 31, 1, 0, + 21, 31, 0, 0, 32, 0, 0, + 21, 32, 0, 0, 33, 0, 0, + 21, 33, 1, 2, 34, 1, 0, + 21, 34, 0, 0, 35, 0, 0, + 21, 35, 1, 2, 36, 1, 0, + 21, 36, 0, 0, 37, 0, 0, + 21, 37, 1, 2, 38, 1, 0, + 21, 38, 1, 2, 39, 1, 0, + 21, 39, 1, 2, 40, 1, 0, + 21, 40, 1, 2, 41, 1, 0, + 21, 41, 1, 2, 42, 1, 0, + 21, 42, 0, 0, 43, 0, 0, + 21, 43, 1, 2, 44, 1, 0, + 21, 43, 22, 0, 44, 21, 22, + 21, 44, 1, 2, 45, 1, 0, + 21, 45, 1, 2, 46, 1, 0, + 21, 46, 1, 2, 47, 1, 0, + 21, 47, 1, 2, 48, 1, 0, + 21, 48, 1, 2, 49, 1, 0, + 21, 49, 0, 0, 50, 0, 0, + 21, 50, 1, 3, 51, 1, 0, + 21, 51, 1, 3, 52, 1, 0, + 21, 52, 1, 2, 53, 1, 0, + 21, 53, 1, 3, 54, 1, 0, + 21, 54, 1, 2, 55, 1, 0, + 21, 55, 1, 2, 56, 1, 0, + 21, 55, 11, 0, 56, 10, 11, + 21, 56, 1, 2, 57, 1, 0, + 21, 57, 1, 2, 58, 1, 0, + 21, 58, 1, 2, 59, 1, 0, + 21, 59, 1, 3, 60, 1, 0, + 21, 60, 1, 2, 61, 1, 0, + 21, 61, 1, 2, 62, 1, 0, + 21, 62, 1, 2, 63, 1, 0, + 21, 63, 1, 2, 64, 1, 0, + 21, 64, 1, 2, 65, 1, 0, + 21, 65, 0, 0, 66, 0, 0, + 21, 66, 1, 2, 67, 1, 0, + 21, 67, 1, 2, 68, 1, 0, + 21, 68, 1, 2, 69, 1, 0, + 21, 69, 1, 2, 70, 1, 0, + 21, 70, 0, 0, 71, 0, 0, + 21, 71, 0, 0, 72, 0, 0, + 21, 72, 0, 0, 73, 0, 0, + 21, 73, 0, 0, 74, 0, 0, + 21, 74, 1, 2, 75, 1, 0, + 21, 75, 1, 2, 76, 1, 0, + 21, 76, 1, 2, 77, 1, 0, + 21, 77, 0, 0, 78, 0, 0, + 21, 78, 0, 0, 79, 0, 0, + 21, 79, 1, 2, 80, 1, 0, + 21, 80, 1, 2, 81, 1, 0, + 21, 81, 0, 0, 82, 0, 0, + 21, 82, 1, 2, 83, 1, 0, + 21, 83, 1, 2, 84, 1, 0, + 21, 84, 1, 2, 85, 1, 0, + 21, 85, 0, 0, 86, 0, 0, + 21, 86, 0, 0, 87, 0, 0, + 21, 87, 1, 2, 88, 1, 0, + 21, 88, 1, 2, 89, 1, 0, + 21, 89, 0, 0, 90, 0, 0, + 21, 90, 0, 0, 91, 0, 0, + 21, 91, 1, 2, 92, 1, 0, + 21, 92, 0, 0, 93, 0, 0, + 21, 93, 0, 0, 94, 0, 0, + 21, 94, 0, 0, 95, 0, 0, + 21, 95, 0, 0, 96, 0, 0, + 21, 96, 0, 0, 97, 0, 0, + 21, 97, 0, 0, 98, 0, 0, + 21, 98, 0, 0, 99, 0, 0, + 21, 99, 0, 0, 100, 0, 0, + 21, 100, 0, 0, 101, 0, 0, + 21, 101, 1, 2, 102, 1, 0, + 21, 102, 0, 0, 103, 0, 0, + 21, 103, 0, 0, 104, 0, 0, + 21, 104, 0, 0, 105, 0, 0, + 21, 105, 0, 0, 106, 0, 0, + 21, 106, 0, 0, 107, 0, 0, + 21, 107, 1, 2, 108, 1, 0, + 21, 108, 0, 0, 109, 0, 0, + 21, 109, 0, 0, 110, 0, 0, + 21, 110, 0, 0, 111, 0, 0, + 21, 111, 0, 0, 112, 0, 0, + 21, 112, 0, 0, 113, 0, 0, + 21, 113, 0, 0, 114, 0, 0, + 21, 113, 9, 0, 115, 1, 0, + 21, 114, 0, 0, 116, 0, 0, + 21, 115, 1, 0, 116, 10, 0, + 21, 116, 0, 0, 117, 0, 0, + 21, 117, 0, 0, 118, 0, 0, + 21, 118, 0, 0, 119, 0, 0, + 21, 119, 0, 0, 120, 0, 0, + 21, 120, 0, 0, 121, 0, 0, + 21, 121, 0, 0, 122, 0, 0, + 21, 122, 0, 0, 123, 0, 0, + 21, 123, 0, 0, 124, 0, 0, + 21, 124, 0, 0, 125, 0, 0, + 21, 125, 0, 0, 126, 0, 0, + 21, 126, 0, 0, 127, 0, 0, + 21, 127, 0, 0, 128, 0, 0, + 21, 128, 0, 0, 129, 0, 0, + 21, 129, 0, 0, 130, 0, 0, + 21, 130, 0, 0, 131, 0, 0, + 21, 131, 0, 0, 132, 0, 0, + 21, 132, 0, 0, 133, 0, 0, + 21, 133, 0, 0, 134, 0, 0, + 21, 134, 0, 0, 135, 0, 0, + 21, 135, 0, 0, 136, 0, 0, + 21, 136, 0, 0, 137, 0, 0, + 21, 137, 0, 0, 138, 0, 0, + 21, 138, 0, 0, 139, 0, 0, + 21, 139, 1, 2, 140, 1, 0, + 21, 140, 0, 0, 141, 0, 0, + 21, 141, 1, 2, 142, 1, 0, + 21, 142, 0, 0, 143, 0, 0, + 21, 143, 0, 0, 144, 0, 0, + 21, 144, 0, 0, 145, 0, 0, + 21, 145, 1, 0, 146, 0, 0, + 21, 145, 2, 0, 146, 1, 2, + 21, 146, 0, 0, 147, 0, 0, + 21, 147, 1, 0, 147, 12, 0, + 23, 4, 17, 0, 5, 1, 0, + 23, 5, 1, 0, 5, 2, 0, + 23, 7, 1, 0, 6, 12, 0, + 23, 7, 2, 0, 7, 1, 0, + 24, 1, 1, 0, 1, 1, 2, + 24, 5, 17, 0, 6, 1, 0, + 24, 6, 1, 0, 6, 2, 0, + 25, 2, 25, 0, 2, 24, 0, + 25, 5, 14, 0, 5, 13, 0, + 25, 6, 2, 0, 6, 1, 0, + 25, 6, 22, 23, 6, 21, 0, + 25, 9, 19, 0, 9, 18, 0, + 25, 11, 6, 0, 11, 5, 0, + 25, 19, 12, 0, 19, 12, 13, + 27, 8, 22, 0, 8, 22, 23, + 28, 37, 4, 0, 37, 4, 5, + 79, 6, 1, 0, 6, 1, 0, 30, + 31, 2, 9, 0, 2, 9, 10, + 80, 3, 24, 0, 1, 1, 0, 32, + 80, 3, 52, 0, 1, 29, 30, 32, + 32, 3, 91, 0, 3, 24, 0, + 32, 3, 98, 0, 4, 1, 0, + 32, 4, 1, 0, 4, 4, 0, + 81, 13, 1, 0, 1, 1, 0, 32, + 81, 13, 64, 65, 1, 64, 0, 32, + 82, 14, 1, 0, 1, 1, 0, 32, + 82, 14, 41, 42, 1, 41, 0, 32, + 33, 14, 1, 0, 13, 16, 0, + 33, 14, 2, 0, 14, 1, 0, + 35, 6, 11, 0, 6, 10, 0, + 42, 2, 1, 0, 1, 15, 0, + 42, 2, 2, 0, 2, 1, 0, + 45, 1, 5, 0, 1, 4, 0, + 45, 1, 31, 32, 1, 30, 0, + 45, 1, 36, 0, 1, 34, 35, + 45, 1, 37, 0, 1, 35, 0, + 45, 1, 47, 48, 1, 45, 0, + 45, 12, 54, 0, 12, 53, 0, + 45, 13, 53, 0, 13, 52, 0, + 46, 2, 19, 0, 2, 18, 0, + 46, 12, 46, 0, 12, 45, 0, + 46, 15, 37, 0, 15, 36, 0, + 47, 17, 15, 0, 17, 16, 0, + 48, 4, 40, 0, 4, 40, 41, + 48, 8, 39, 0, 9, 1, 0, + 48, 9, 1, 0, 9, 2, 0, + 50, 6, 52, 0, 6, 51, 0, + 51, 7, 55, 0, 7, 55, 56, + 51, 14, 6, 0, 14, 6, 7, + 51, 19, 40, 0, 19, 40, 41, + 73, 12, 18, 19, 13, 1, 0, + 73, 13, 1, 0, 13, 1, 0, + 75, 1, 4, 0, 1, 3, 4, + 75, 1, 10, 0, 1, 10, 11, + 75, 1, 11, 0, 1, 12, 13, + 75, 1, 12, 0, 1, 13, 0, + 75, 1, 16, 0, 1, 15, 0, + 75, 1, 17, 18, 1, 16, 0, + 75, 1, 51, 52, 1, 49, 0, + 75, 2, 2, 0, 2, 1, 0, + 75, 2, 3, 4, 2, 2, 0, + 75, 2, 6, 7, 2, 4, 0, + 75, 2, 11, 12, 2, 8, 0, + 75, 2, 13, 0, 2, 9, 10, + 75, 2, 14, 15, 2, 11, 0, + 75, 2, 20, 21, 2, 16, 0, + 75, 2, 22, 23, 2, 17, 0, + 75, 2, 26, 0, 2, 20, 21, + 75, 2, 30, 0, 2, 25, 26, + 75, 3, 15, 0, 3, 14, 0, + 75, 3, 17, 0, 3, 16, 17, + 75, 4, 10, 0, 4, 10, 11, + 75, 4, 40, 0, 4, 39, 40, + 75, 5, 42, 0, 5, 41, 0, + 75, 5, 54, 55, 5, 53, 0, + 75, 5, 58, 0, 5, 56, 57, + 75, 5, 59, 60, 5, 57, 0, + 75, 5, 73, 0, 5, 70, 71, + 75, 6, 9, 0, 6, 8, 0, + 75, 8, 6, 0, 8, 5, 0, + 75, 8, 20, 0, 8, 19, 20, + 75, 8, 44, 0, 8, 43, 0, + 75, 8, 50, 0, 8, 49, 50, + 75, 8, 57, 0, 8, 56, 0, + 75, 8, 63, 64, 8, 62, 0, + 75, 8, 65, 66, 8, 63, 0, + 75, 8, 86, 0, 8, 83, 84, + 75, 8, 87, 0, 8, 84, 0, + 75, 8, 93, 94, 8, 90, 0, + 0 + }; + SWORD_NAMESPACE_END #endif diff --git a/include/config.h.in b/include/config.h.in index cde8a27..06203e0 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -9,6 +9,15 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `bz2' library (-lbz2). */ +#undef HAVE_LIBBZ2 + +/* Define to 1 if you have the `lzma' library (-llzma). */ +#undef HAVE_LIBLZMA + +/* Define to 1 if you have the `xapian' library (-lxapian). */ +#undef HAVE_LIBXAPIAN + /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ diff --git a/include/defs.h b/include/defs.h index fdad3db..d950cc9 100644 --- a/include/defs.h +++ b/include/defs.h @@ -2,7 +2,7 @@ * * defs.h - Global defines, mostly platform-specific stuff * - * $Id: defs.h 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: defs.h 3029 2014-02-25 13:00:49Z scribe $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -162,7 +162,7 @@ SWORD_NAMESPACE_START #ifdef __cplusplus enum {DIRECTION_LTR = 0, DIRECTION_RTL, DIRECTION_BIDI}; -enum {FMT_UNKNOWN = 0, FMT_PLAIN, FMT_THML, FMT_GBF, FMT_HTML, FMT_HTMLHREF, FMT_RTF, FMT_OSIS, FMT_WEBIF, FMT_TEI, FMT_XHTML}; +enum {FMT_UNKNOWN = 0, FMT_PLAIN, FMT_THML, FMT_GBF, FMT_HTML, FMT_HTMLHREF, FMT_RTF, FMT_OSIS, FMT_WEBIF, FMT_TEI, FMT_XHTML, FMT_LATEX}; enum {ENC_UNKNOWN = 0, ENC_LATIN1, ENC_UTF8, ENC_SCSU, ENC_UTF16, ENC_RTF, ENC_HTML}; enum {BIB_BIBTEX = 0, /* possible future formats: BIB_MARCXML, BIB_MARC21, BIB_DCMI BIB_OSISHEADER, BIB_SBL_XHTML, BIB_MLA_XHTML, BIB_APA_XHTML, BIB_CHICAGO_XHTML */}; #endif diff --git a/include/encfiltmgr.h b/include/encfiltmgr.h index bf62756..76a758a 100644 --- a/include/encfiltmgr.h +++ b/include/encfiltmgr.h @@ -4,7 +4,7 @@ * used to transcode all module text to a requested * markup * - * $Id: encfiltmgr.h 2846 2013-06-29 14:48:47Z chrislit $ + * $Id: encfiltmgr.h 3076 2014-03-05 04:49:08Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -39,15 +39,16 @@ class SWFilter; class SWDLLEXPORT EncodingFilterMgr : public SWFilterMgr { protected: - SWFilter *latin1utf8; + SWFilter *latin1utf8; SWFilter *scsuutf8; - SWFilter *targetenc; + SWFilter *utf16utf8; + SWFilter *targetenc; /* * current encoding value */ - char encoding; + char encoding; public: @@ -56,33 +57,33 @@ public: * * @param encoding The desired encoding. */ - EncodingFilterMgr (char encoding = ENC_UTF8); + EncodingFilterMgr (char encoding = ENC_UTF8); /** * The destructor of SWEncodingMgr. */ - ~EncodingFilterMgr(); + ~EncodingFilterMgr(); /** Markup sets/gets the encoding after initialization * * @param enc The new encoding or ENC_UNKNOWN if you just want to get the current markup. * @return The current (possibly changed) encoding format. */ - char Encoding(char enc); + char Encoding(char enc); /** * Adds the raw filters which are defined in "section" to the SWModule object "module". * @param module To this module the raw filter(s) are added * @param section We use this section to get a list of filters we should apply to the module */ - virtual void AddRawFilters(SWModule *module, ConfigEntMap §ion); + virtual void AddRawFilters(SWModule *module, ConfigEntMap §ion); /** * Adds the encoding filters which are defined in "section" to the SWModule object "module". * @param module To this module the encoding filter(s) are added * @param section We use this section to get a list of filters we should apply to the module */ - virtual void AddEncodingFilters(SWModule *module, ConfigEntMap §ion); + virtual void AddEncodingFilters(SWModule *module, ConfigEntMap §ion); }; SWORD_NAMESPACE_END diff --git a/include/filemgr.h b/include/filemgr.h index eedfbcc..8d0e511 100644 --- a/include/filemgr.h +++ b/include/filemgr.h @@ -2,7 +2,7 @@ * * filemgr.h - definition of class FileMgr used for pooling file handles * - * $Id: filemgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: filemgr.h 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -32,7 +32,7 @@ SWORD_NAMESPACE_START -class SWDLLEXPORT FileMgr; +class SWDLLEXPORT FileDesc; struct SWDLLEXPORT DirEntry { public: @@ -40,49 +40,23 @@ public: unsigned long size; bool isDirectory; }; -/** -* This class represents one file. It works with the FileMgr object. -*/ -class SWDLLEXPORT FileDesc { - - friend class FileMgr; - - long offset; - int fd; // -77 closed; - FileMgr *parent; - FileDesc *next; - - FileDesc(FileMgr * parent, const char *path, int mode, int perms, bool tryDowngrade); - virtual ~FileDesc(); - -public: - /** @return File handle. - */ - int getFd(); - - long seek(long offset, int whence); - long read(void *buf, long count); - long write(const void *buf, long count); - - /** Path to file. - */ - char *path; - /** File access mode. - */ - int mode; - /** File permissions. - */ - int perms; - /** - */ - bool tryDowngrade; -}; /** -* This class ist used make file access operations easier. -* It keeps a list of all open files internally and closes them -* when the destructor is called. -*/ + * This class isolates all file io for SWORD, making OS + * level quirks easier to fix. This class is typically + * copied and replaced if necessary to get SWORD to run on + * a specific platform (e.g., Windows Mobile), but in + * the future, statics should be removed to make possible to + * instead simply subclass and override necessary methods. + * + * This class also provides many convenience methods which + * make working with data storage easier. + * + * Conceptually, this factory exposes an interface which + * allows SWORD to 'open' every file it wants, without + * worrying about OS limits, and takes care of opening and + * closing the actual file descriptors when necessary. + */ class SWDLLEXPORT FileMgr : public SWCacher { friend class FileDesc; @@ -151,13 +125,13 @@ public: virtual void flush(); virtual long resourceConsumption(); - /** Checks for the existence of a file. + /** Checks for the existence and readability of a file. * @param ipath Path to file. * @param ifileName Name of file to check for. */ static signed char existsFile(const char *ipath, const char *ifileName = 0); - /** Checks for the existence of a directory. + /** Checks for the existence and readability of a directory. * @param ipath Path to directory. * @param idirName Name of directory to check for. */ @@ -184,6 +158,63 @@ public: static int removeFile(const char *fName); static char getLine(FileDesc *fDesc, SWBuf &line); + /** + * Determines where SWORD looks for the user's home folder. This is + * typically used as a place to find any additional personal SWORD + * modules which a user might wish to be added to a system-wide + * library (e.g., added from ~/.sword/mods.d/ or ~/sword/mods.d/) + * + * or if a user or UI wishes to override SWORD system configuration + * settings (e.g., /etc/sword.conf) with a custom configuration + * (e.g., ~/.sword/sword.conf) + */ + SWBuf getHomeDir(); + +}; + +/** +* This class represents one file. It works with the FileMgr object. +*/ +class SWDLLEXPORT FileDesc { + + friend class FileMgr; + + long offset; + int fd; // -77 closed; + FileMgr *parent; + FileDesc *next; + + FileDesc(FileMgr * parent, const char *path, int mode, int perms, bool tryDowngrade); + virtual ~FileDesc(); + +public: + /** @return File handle. + * NOTE: magic file descriptor -77 = closed to avoid os limits + */ + inline int getFd() { + if (fd == -77) + fd = parent->sysOpen(this); +// if ((fd < -1) && (fd != -77)) // kludge to handle ce +// return 777; + return fd; + } + + long seek(long offset, int whence); + long read(void *buf, long count); + long write(const void *buf, long count); + + /** Path to file. + */ + char *path; + /** File access mode. + */ + int mode; + /** File permissions. + */ + int perms; + /** + */ + bool tryDowngrade; }; diff --git a/include/flatapi.h b/include/flatapi.h index c5f8412..2f57841 100644 --- a/include/flatapi.h +++ b/include/flatapi.h @@ -2,7 +2,7 @@ * * flatapi.h - This file contains an api usable by non-C++ environments * - * $Id: flatapi.h 3184 2014-04-17 04:30:54Z greg.hellings $ + * $Id: flatapi.h 3561 2018-01-07 06:45:42Z greg.hellings $ * * Copyright 2002-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -24,7 +24,7 @@ #define SWORDFLATAPI_H #include <inttypes.h> -#include <defs.h> +#include "defs.h" #ifdef __cplusplus extern "C" { @@ -60,6 +60,21 @@ struct org_crosswire_sword_SearchHit { #undef org_crosswire_sword_SWModule_SEARCHTYPE_LUCENE #define org_crosswire_sword_SWModule_SEARCHTYPE_LUCENE -4L + const int org_crosswire_sword_SWModule_VERSEKEY_TESTAMENT = 0; + const int org_crosswire_sword_SWModule_VERSEKEY_BOOK = 1; + const int org_crosswire_sword_SWModule_VERSEKEY_CHAPTER = 2; + const int org_crosswire_sword_SWModule_VERSEKEY_VERSE = 3; + const int org_crosswire_sword_SWModule_VERSEKEY_CHAPMAX = 4; + const int org_crosswire_sword_SWModule_VERSEKEY_VERSEMAX = 5; + const int org_crosswire_sword_SWModule_VERSEKEY_BOOKNAME = 6; + const int org_crosswire_sword_SWModule_VERSEKEY_OSISREF = 7; + const int org_crosswire_sword_SWModule_VERSEKEY_SHORTTEXT = 8; + const int org_crosswire_sword_SWModule_VERSEKEY_BOOKABBREV = 9; + + + + + /* * Class: org_crosswire_sword_SWModule * Method: terminateSearch @@ -68,13 +83,15 @@ struct org_crosswire_sword_SearchHit { void SWDLLEXPORT org_crosswire_sword_SWModule_terminateSearch (SWHANDLE hSWModule); +typedef void (*org_crosswire_sword_SWModule_SearchCallback)(int); + /* * Class: org_crosswire_sword_SWModule * Method: search * Signature: (Ljava/lang/String;IJLjava/lang/String;Lorg/crosswire/android/sword/SWModule/SearchProgressReporter;)[Lorg/crosswire/android/sword/SWModule/SearchHit; */ const struct org_crosswire_sword_SearchHit * SWDLLEXPORT org_crosswire_sword_SWModule_search - (SWHANDLE hSWModule, const char *searchString, int searchType, long flags, const char *scope, SWHANDLE progressReporter); + (SWHANDLE hSWModule, const char *searchString, int searchType, long flags, const char *scope, org_crosswire_sword_SWModule_SearchCallback progressReporter); /* * Class: org_crosswire_sword_SWModule @@ -281,6 +298,15 @@ SWHANDLE SWDLLEXPORT org_crosswire_sword_SWMgr_new /* * Class: org_crosswire_sword_SWMgr + * Method: newWithPath + * Signature: ()V + * Signature: (Ljava/lang/String;)V + */ +SWHANDLE SWDLLEXPORT org_crosswire_sword_SWMgr_newWithPath + (const char *path); + +/* + * Class: org_crosswire_sword_SWMgr * Method: delete * Signature: ()V */ @@ -367,6 +393,47 @@ const char * SWDLLEXPORT org_crosswire_sword_SWMgr_filterText const char ** SWDLLEXPORT org_crosswire_sword_SWMgr_getGlobalOptions (SWHANDLE hSWMgr); + +/* + * Class: org_crosswire_sword_SWConfig + * Method: getSections + * Signature: ()[Ljava/lang/String; + */ +const char ** SWDLLEXPORT org_crosswire_sword_SWConfig_getSections + (const char *confPath); + +/* + * Class: org_crosswire_sword_SWConfig + * Method: getSectionKeys + * Signature: (Ljava/lang/String;)[Ljava/lang/String; + */ +const char ** SWDLLEXPORT org_crosswire_sword_SWConfig_getSectionKeys + (const char *confPath, const char *section); + +/* + * Class: org_crosswire_sword_SWConfig + * Method: getKeyValue + * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + */ +const char * SWDLLEXPORT org_crosswire_sword_SWConfig_getKeyValue + (const char *confPath, const char *section, const char *key); + +/* + * Class: org_crosswire_sword_SWConfig + * Method: setKeyValue + * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + */ +void SWDLLEXPORT org_crosswire_sword_SWConfig_setKeyValue + (const char *confPath, const char *section, const char *key, const char *value); + +/* + * Class: org_crosswire_sword_SWConfig + * Method: augmentConfig + * Signature: (Ljava/lang/String;)[Ljava/lang/String; + */ +const char ** SWDLLEXPORT org_crosswire_sword_SWConfig_augmentConfig + (const char *confPath, const char *configBlob); + /* * Class: org_crosswire_sword_SWMgr * Method: getGlobalOptionValues @@ -424,6 +491,7 @@ const char * SWDLLEXPORT org_crosswire_sword_SWMgr_translate // // +typedef void (*org_crosswire_sword_InstallMgr_StatusCallback)(const char *, unsigned long, unsigned long); /* * Class: org_crosswire_sword_InstallMgr @@ -431,7 +499,15 @@ const char * SWDLLEXPORT org_crosswire_sword_SWMgr_translate * Signature: (Ljava/lang/String;Lorg/crosswire/android/sword/SWModule/SearchProgressReporter;)V */ SWHANDLE SWDLLEXPORT org_crosswire_sword_InstallMgr_new - (const char *baseDir, SWHANDLE statusReporter); + (const char *baseDir, org_crosswire_sword_InstallMgr_StatusCallback statusReporter); + +/* + * Class: org_crosswire_sword_InstallMgr + * Method: delete + * Signature: ()V + */ +void SWDLLEXPORT org_crosswire_sword_InstallMgr_delete + (SWHANDLE hInstallMgr); /* * Class: org_crosswire_sword_InstallMgr @@ -497,6 +573,12 @@ int SWDLLEXPORT org_crosswire_sword_InstallMgr_remoteInstallModule SWHANDLE SWDLLEXPORT org_crosswire_sword_InstallMgr_getRemoteModuleByName (SWHANDLE hInstallMgr, const char *sourceName, const char *modName); +void SWDLLEXPORT org_crosswire_sword_SWlog_logError(const char *msg); +void SWDLLEXPORT org_crosswire_sword_SWlog_logDebug(const char *msg); +void SWDLLEXPORT org_crosswire_sword_SWlog_logWarning(const char *msg); +void SWDLLEXPORT org_crosswire_sword_SWlog_logInformation(const char *msg); +void SWDLLEXPORT org_crosswire_sword_SWlog_logTimedInformation(const char *msg); + #ifdef __cplusplus } #endif diff --git a/include/gbflatex.h b/include/gbflatex.h new file mode 100644 index 0000000..a0c50f0 --- /dev/null +++ b/include/gbflatex.h @@ -0,0 +1,52 @@ +/****************************************************************************** + * + * gbflatex.h - Implementation of GBFLaTeX + * + * $Id: gbflatex.h 3074 2014-03-05 00:30:21Z chrislit $ + * + * Copyright 2011-2014 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. + * + */ + +#ifndef GBFLATEX_H +#define GBFLATEX_H + +#include <swbasicfilter.h> + +SWORD_NAMESPACE_START + +/** this filter converts GBF text to classed LaTeX text + */ +class SWDLLEXPORT GBFLaTeX : public SWBasicFilter { + bool renderNoteNumbers; +protected: + class MyUserData : public BasicFilterUserData { + public: + MyUserData(const SWModule *module, const SWKey *key); + bool hasFootnotePreTag; + SWBuf version; + }; + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); + } + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); +public: + GBFLaTeX(); + virtual const char *getHeader() const; + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/gbfredletterwords.h b/include/gbfredletterwords.h index 4fa1963..36b98a3 100644 --- a/include/gbfredletterwords.h +++ b/include/gbfredletterwords.h @@ -2,7 +2,7 @@ * * gbfredletterwords.h - Implementation of GBFRedLetterWords * - * $Id: gbfredletterwords.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: gbfredletterwords.h 3451 2017-03-29 22:42:00Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -20,7 +20,7 @@ * */ -#ifndef GBFSREDLETTERWORDS_H +#ifndef GBFREDLETTERWORDS_H #define GBFREDLETTERWORDS_H #include <swoptfilter.h> diff --git a/include/installmgr.h b/include/installmgr.h index 56ebf7e..56f879a 100644 --- a/include/installmgr.h +++ b/include/installmgr.h @@ -2,7 +2,7 @@ * * installmgr.h - Implementation of InstallMgr * - * $Id: installmgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: installmgr.h 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -76,6 +76,7 @@ protected: StatusReporter *statusReporter; bool passive; SWBuf u, p; + bool unverifiedPeerAllowed; /** override this method and provide your own custom RemoteTransport subclass */ @@ -236,7 +237,8 @@ A sample implementation, roughly taken from the windows installmgr: return false; } */ - virtual bool getCipherCode(const char *modName, SWConfig *config) { (void) modName; (void) config; return false; } + + virtual bool getCipherCode(const char *modName, SWConfig *config) { (void) modName; (void) config; return false; } @@ -245,6 +247,9 @@ A sample implementation, roughly taken from the windows installmgr: void setFTPPassive(bool passive) { this->passive = passive; } bool isFTPPassive() { return passive; } + void setUnverifiedPeerAllowed(bool allowed) { this->unverifiedPeerAllowed = allowed; } + bool isUnverifiedPeerAllowed() { return unverifiedPeerAllowed; } + /** call from another thread to terminate the installation process */ void terminate(); diff --git a/include/listkey.h b/include/listkey.h index a388a06..e081a32 100644 --- a/include/listkey.h +++ b/include/listkey.h @@ -4,7 +4,7 @@ * types of keys for indexing into modules * (e.g. verse, word, place, etc.) * - * $Id: listkey.h 2893 2013-07-16 03:07:02Z scribe $ + * $Id: listkey.h 3541 2017-12-03 18:40:33Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -89,7 +89,7 @@ public: * @return error status * deprecated use setToElement */ - virtual char setToElement(int ielement, SW_POSITION = TOP); + virtual char setToElement(int ielement, SW_POSITION pos = TOP); // deprecated use setToElement SWDEPRECATED virtual char SetToElement(int ielement, SW_POSITION pos = TOP) { return setToElement(ielement, pos); } @@ -122,7 +122,6 @@ public: /** Positions this key * * @param pos position - * @return *this */ virtual void setPosition(SW_POSITION pos); @@ -144,7 +143,7 @@ public: * Returns the index for the new one given as as parameter. * The first parameter is the new index. */ - virtual void setIndex(long index) { setToElement(index); } + virtual void setIndex(long index) { setToElement((int)index); } virtual const char *getText() const; virtual void setText(const char *ikey); virtual void sort(); diff --git a/include/osishtmlhref.h b/include/osishtmlhref.h index dedd79b..fef86a7 100644 --- a/include/osishtmlhref.h +++ b/include/osishtmlhref.h @@ -2,7 +2,7 @@ * * osishtmlhref.h - Implementation of OSISHTMLHREF * - * $Id: osishtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: osishtmlhref.h 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -41,7 +41,7 @@ protected: bool osisQToTick; bool inBold; // TODO: obsolete. left for binary compat for 1.6.x bool inXRefNote; - bool BiblicalText; + bool isBiblicalText; int suspendLevel; SWBuf wordsOfChristStart; SWBuf wordsOfChristEnd; diff --git a/include/osislatex.h b/include/osislatex.h new file mode 100644 index 0000000..ce18fd9 --- /dev/null +++ b/include/osislatex.h @@ -0,0 +1,77 @@ +/****************************************************************************** + * + * osislatex.h - Render filter for LaTeX of an OSIS module + * + * $Id: osislatex.h 3548 2017-12-10 05:11:38Z scribe $ + * + * Copyright 2011-2014 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. + * + */ + +#ifndef OSISLATEX_H +#define OSISLATEX_H + +#include <swbasicfilter.h> + +SWORD_NAMESPACE_START + +/** this filter converts OSIS text to classed XHTML + */ +class SWDLLEXPORT OSISLaTeX : public SWBasicFilter { +private: + bool morphFirst; + bool renderNoteNumbers; +protected: + + class TagStack; + // used by derived classes so we have it in the header + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key); + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); + + + class MyUserData : public BasicFilterUserData { + public: + bool osisQToTick; + bool inXRefNote; + bool isBiblicalText; + int suspendLevel; + bool firstCell; // for tables, indicates whether a cell is the first one in a row + SWBuf wordsOfChristStart; + SWBuf wordsOfChristEnd; + SWBuf divLevel; // divLevel "module", "testament, "bookgroup", "book", "majorsection", "section", "paragraph" , ignore others. + + TagStack *quoteStack; + TagStack *hiStack; + TagStack *titleStack; + TagStack *lineStack; + int consecutiveNewlines; + SWBuf lastTransChange; + SWBuf w; + SWBuf fn; + SWBuf version; + + MyUserData(const SWModule *module, const SWKey *key); + ~MyUserData(); + void outputNewline(SWBuf &buf); + }; +public: + OSISLaTeX(); + void setMorphFirst(bool val = true) { morphFirst = val; } + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } + virtual const char *getHeader() const; +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/osisplain.h b/include/osisplain.h index 5d728ca..485ff10 100644 --- a/include/osisplain.h +++ b/include/osisplain.h @@ -2,7 +2,7 @@ * * osisplain.h - Implementation of OSISPlain * - * $Id: osisplain.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: osisplain.h 3524 2017-11-07 03:08:49Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -35,6 +35,7 @@ public: protected: virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key); virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); + virtual bool processStage(char stage, SWBuf &text, char *&from, BasicFilterUserData *userData); public: OSISPlain(); }; diff --git a/include/osisreferencelinks.h b/include/osisreferencelinks.h index 4c75850..44d1ca8 100644 --- a/include/osisreferencelinks.h +++ b/include/osisreferencelinks.h @@ -3,7 +3,7 @@ * osisreferencelinks.h - SWFilter descendant to toggle OSIS reference * links with specified type/subType * - * $Id: osisreferencelinks.h 2995 2013-12-28 06:32:26Z greg.hellings $ + * $Id: osisreferencelinks.h 2989 2013-10-09 08:22:21Z chrislit $ * * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/osiswebif.h b/include/osiswebif.h index 66d3b69..db70777 100644 --- a/include/osiswebif.h +++ b/include/osiswebif.h @@ -2,7 +2,7 @@ * * osiswebif.h - Implementation of OSISWEBIF * - * $Id: osiswebif.h 3285 2014-12-03 06:14:50Z greg.hellings $ + * $Id: osiswebif.h 3257 2014-09-23 01:08:24Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/osisxhtml.h b/include/osisxhtml.h index 0f20893..8a71fa9 100644 --- a/include/osisxhtml.h +++ b/include/osisxhtml.h @@ -2,7 +2,7 @@ * * osisxhtml.h - Render filter for classed XHTML of an OSIS module * - * $Id: osisxhtml.h 3285 2014-12-03 06:14:50Z greg.hellings $ + * $Id: osisxhtml.h 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -45,7 +45,7 @@ protected: public: bool osisQToTick; bool inXRefNote; - bool BiblicalText; + bool isBiblicalText; int suspendLevel; SWBuf wordsOfChristStart; SWBuf wordsOfChristEnd; diff --git a/include/rawstr.h b/include/rawstr.h index 478035d..63af071 100644 --- a/include/rawstr.h +++ b/include/rawstr.h @@ -5,7 +5,7 @@ * and provides lookup and parsing functions based on * class StrKey * - * $Id: rawstr.h 3181 2014-04-17 04:27:57Z greg.hellings $ + * $Id: rawstr.h 3134 2014-03-17 09:30:15Z chrislit $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/rawstr4.h b/include/rawstr4.h index 71f50dc..e395ba8 100644 --- a/include/rawstr4.h +++ b/include/rawstr4.h @@ -5,7 +5,7 @@ * and provides lookup and parsing functions based on * class StrKey * - * $Id: rawstr4.h 3181 2014-04-17 04:27:57Z greg.hellings $ + * $Id: rawstr4.h 3134 2014-03-17 09:30:15Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/rawverse.h b/include/rawverse.h index 4c919cd..77c2fe3 100644 --- a/include/rawverse.h +++ b/include/rawverse.h @@ -5,7 +5,7 @@ * and provides lookup and parsing functions based on * class VerseKey * - * $Id: rawverse.h 3181 2014-04-17 04:27:57Z greg.hellings $ + * $Id: rawverse.h 3134 2014-03-17 09:30:15Z chrislit $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/rawverse4.h b/include/rawverse4.h index 0b66dbe..95748db 100644 --- a/include/rawverse4.h +++ b/include/rawverse4.h @@ -5,7 +5,7 @@ * ??.vss and provides lookup and parsing functions based * on class VerseKey * - * $Id: rawverse4.h 3181 2014-04-17 04:27:57Z greg.hellings $ + * $Id: rawverse4.h 3134 2014-03-17 09:30:15Z chrislit $ * * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/remotetrans.h b/include/remotetrans.h index d20d96b..18ba672 100644 --- a/include/remotetrans.h +++ b/include/remotetrans.h @@ -2,7 +2,7 @@ * * remotetrans.h - code for Remote Transport * - * $Id: remotetrans.h 2932 2013-07-31 14:07:01Z scribe $ + * $Id: remotetrans.h 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -53,6 +53,7 @@ protected: StatusReporter *statusReporter; bool passive; bool term; + bool unverifiedPeerAllowed; SWBuf host; SWBuf u; SWBuf p; @@ -68,13 +69,23 @@ public: */ virtual char getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf = 0); + /*********** + * override this method in your real impl + * + * if sourceBuf then read from buffer instead of file + */ + virtual char putURL(const char *destURL, const char *sourcePath, SWBuf *sourceBuf = 0); + int copyDirectory(const char *urlPrefix, const char *dir, const char *dest, const char *suffix); virtual std::vector<struct DirEntry> getDirList(const char *dirURL); void setPassive(bool passive) { this->passive = passive; } + bool isPassive() { return passive; } void setUser(const char *user) { u = user; } void setPasswd(const char *passwd) { p = passwd; } + void setUnverifiedPeerAllowed(bool val) { this->unverifiedPeerAllowed = val; } + bool isUnverifiedPeerAllowed() { return unverifiedPeerAllowed; } void terminate() { term = true; } }; diff --git a/include/rtranspgdrive.h b/include/rtranspgdrive.h new file mode 100644 index 0000000..4a87789 --- /dev/null +++ b/include/rtranspgdrive.h @@ -0,0 +1,45 @@ +/****************************************************************************** + * + * rtranspgdrive.h - code for Google Drive impl of Remote Transport + * + * $Id$ + * + * Copyright 2004-2017 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. + * + */ + +#ifndef RTRANSPGDRIVE_H +#define RTRANSPGDRIVE_H + +#include <defs.h> +#include <remotetrans.h> + +SWORD_NAMESPACE_START + + +class SWDLLEXPORT RTransportGDrive : public RemoteTransport { + +public: + RTransportGDrive(const char *host, StatusReporter *statusReporter = 0); + ~RTransportGDrive(); + + virtual char getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf = 0); + virtual char putURL(const char *destURL, const char *sourcePath, SWBuf *sourceBuf = 0); +}; + + +SWORD_NAMESPACE_END + +#endif diff --git a/include/scsuutf8.h b/include/scsuutf8.h index 7a36733..cf33887 100644 --- a/include/scsuutf8.h +++ b/include/scsuutf8.h @@ -2,7 +2,7 @@ * * scsuutf8.h - SWFilter descendant to convert a SCSU character to UTF-8 * - * $Id: scsuutf8.h 2846 2013-06-29 14:48:47Z chrislit $ + * $Id: scsuutf8.h 3083 2014-03-06 08:13:10Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,16 +25,38 @@ #include <swfilter.h> +#ifdef _ICU_ +#include <unicode/utypes.h> +#include <unicode/ucnv.h> +#include <unicode/uchar.h> +#endif + SWORD_NAMESPACE_START /** This filter converts SCSU compressed (encoded) text to UTF-8 */ class SWDLLEXPORT SCSUUTF8 : public SWFilter { - unsigned long c, d; - unsigned char* UTF8Output(unsigned long, unsigned char* text); +private: +#ifdef _ICU_ + UConverter* scsuConv; + UConverter* utf8Conv; + UErrorCode err; +#else + // without ICU, we'll attempt to use Roman Czyborra's SCSU decoder code + unsigned char active; + bool mode; + unsigned long c, d; + + static unsigned short start[8]; + static unsigned short slide[8]; + static unsigned short win[256]; + + int UTF8Output(unsigned long, SWBuf* utf8Buf); +#endif public: SCSUUTF8(); + ~SCSUUTF8(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; diff --git a/include/swbasicfilter.h b/include/swbasicfilter.h index 29ea8a0..97b4638 100644 --- a/include/swbasicfilter.h +++ b/include/swbasicfilter.h @@ -5,7 +5,7 @@ * many filter will need and can use as a starting * point * - * $Id: swbasicfilter.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: swbasicfilter.h 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -31,14 +31,16 @@ SWORD_NAMESPACE_START +class VerseKey; // not a protected inner class because MSVC++ sucks and can't handle it class SWDLLEXPORT BasicFilterUserData { public: - BasicFilterUserData(const SWModule *module, const SWKey *key) { this->module = module; this->key = key; suspendTextPassThru = false; supressAdjacentWhitespace = false; } + BasicFilterUserData(const SWModule *module, const SWKey *key); virtual ~BasicFilterUserData() {} const SWModule *module; const SWKey *key; + const VerseKey *vkey; SWBuf lastTextNode; SWBuf lastSuspendSegment; bool suspendTextPassThru; diff --git a/include/swbuf.h b/include/swbuf.h index 0344299..254664b 100644 --- a/include/swbuf.h +++ b/include/swbuf.h @@ -2,7 +2,7 @@ * * swbuf.h - code for SWBuf used as a transport and utility for data buffers * - * $Id: swbuf.h 2980 2013-09-14 21:51:47Z scribe $ + * $Id: swbuf.h 3541 2017-12-03 18:40:33Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -90,27 +90,40 @@ public: init(0); } - /** - * SWBuf Constructor - Creates an SWBuf initialized + /****************************************************************************** + * SWBuf Constructor - Creates an empty SWBuf object or an SWBuf initialized * to a value from a const char * - * - */ - SWBuf(const char *initVal, unsigned long initSize = 0); -// SWBuf(unsigned long initSize); + * + */ + inline SWBuf(const char *initVal, unsigned long initSize = 0) { + init(initSize); + if (initVal) + set(initVal); + } - /** + /****************************************************************************** * SWBuf Constructor - Creates an SWBuf initialized - * to a value from a char + * to a value from another SWBuf * */ - SWBuf(char initVal, unsigned long initSize = 0); + inline SWBuf(const SWBuf &other, unsigned long initSize = 0) { + init(initSize); + set(other); + } - /** + /****************************************************************************** * SWBuf Constructor - Creates an SWBuf initialized - * to a value from another SWBuf + * to a value from a char * */ - SWBuf(const SWBuf &other, unsigned long initSize = 0); + inline SWBuf(char initVal, unsigned long initSize = 0) { + init(initSize+1); + *buf = initVal; + end = buf+1; + *end = 0; + } +// SWBuf(unsigned long initSize); + /****************************************************************************** * SWBuf Destructor - Cleans up instance of SWBuf @@ -220,7 +233,13 @@ public: * SWBuf::setSize - Size this buffer to a specific length. * @param len The new size of the buffer. One byte for the null will be added. */ - void setSize(unsigned long len); + inline void setSize(unsigned long len) { + assureSize(len+1); + if ((unsigned)(end - buf) < len) + memset(end, fillByte, len - (end-buf)); + end = buf + len; + *end = 0; + } /** * SWBuf::resize - Resize this buffer to a specific length. * @param len The new size of the buffer. One byte for the null will be added. @@ -233,7 +252,17 @@ public: * @param str Append this. * @param max Append only max chars. */ - SWBuf &append(const char *str, long max = -1); + inline SWBuf &append(const char *str, long max = -1) { + // if (!str) //A null string was passed + // return; + if (max < 0) + max = strlen(str); + assureMore(max+1); + for (;((max)&&(*str));max--) + *end++ = *str++; + *end = 0; + return *this; + } /** * SWBuf::append - appends a value to the current value of this SWBuf @@ -266,7 +295,7 @@ public: * If the allocated memory is not enough, it will be resized accordingly. * NOTE: This is dangerous, as wchar_t is currently different sizes on different * platforms (stupid windoze; stupid c++ spec for not mandating 4byte). - * @param ch Append this. + * @param wch Append this. */ inline SWBuf &append(wchar_t wch) { assureMore(sizeof(wchar_t)*2); @@ -402,7 +431,7 @@ public: * * @return prefix if separator character found; otherwise, null and leaves buffer unmodified */ - inline const char *stripPrefix(char separator, bool endOfStringAsSeparator = false) { const char *m = strchr(buf, separator); if (!m && endOfStringAsSeparator) { if (*buf) { operator >>(1); *buf=0; end = buf; return buf + 1;} else return buf; } if (m) { int len = m-buf; char *hold = new char[len]; memcpy(hold, buf, len); *this << (len+1); memcpy(end+1, hold, len); delete [] hold; end[len+1] = 0; } return (m) ? end+1 : 0; } // safe. we know we don't actually realloc and shrink buffer when shifting, so we can place our return val at end. + inline const char *stripPrefix(char separator, bool endOfStringAsSeparator = false) { const char *m = strchr(buf, separator); if (!m && endOfStringAsSeparator) { if (*buf) { operator >>(1); *buf=0; end = buf; return buf + 1;} else return buf; } if (m) { int len = (int)(m-buf); char *hold = new char[len]; memcpy(hold, buf, len); *this << (len+1); memcpy(end+1, hold, len); delete [] hold; end[len+1] = 0; } return (m) ? end+1 : 0; } // safe. we know we don't actually realloc and shrink buffer when shifting, so we can place our return val at end. // this could be nicer, like replacing a contiguous series of target bytes with single replacement; offering replacement const char * /** @@ -445,7 +474,7 @@ public: /** * @return returns true if this buffer ends with the specified postfix */ - inline bool endsWith(const char *postfix) const { unsigned int psize = strlen(postfix); return (size() >= psize)?!strncmp(end-psize, postfix, psize):false; } + inline bool endsWith(const char *postfix) const { unsigned int psize = (unsigned int)strlen(postfix); return (size() >= psize)?!strncmp(end-psize, postfix, psize):false; } // be sure we've been given a valid pointer to compare. If not, we return !=; specifically less-than, for lack of better options inline int compare(const char *other) const { return (other?strcmp(c_str(), other):-1); } diff --git a/include/swcomprs.h b/include/swcomprs.h index 247ffcd..3cead50 100644 --- a/include/swcomprs.h +++ b/include/swcomprs.h @@ -3,7 +3,7 @@ * swcomprs.h - definition of Class SWCompress used for data * compression * - * $Id: swcomprs.h 3175 2014-04-17 04:21:31Z greg.hellings $ + * $Id: swcomprs.h 3122 2014-03-14 08:08:28Z chrislit $ * * Copyright 1996-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -35,15 +35,18 @@ class SWDLLEXPORT SWCompress protected: char *buf, *zbuf, direct; // 0 - encode; 1 - decode unsigned long zlen, zpos, pos, slen; + int level; public: - SWCompress (); - virtual ~ SWCompress (); + SWCompress (); + virtual ~ SWCompress (); virtual char *Buf (const char *buf = 0, unsigned long *len = 0); virtual char *zBuf (unsigned long *len, char *buf = 0); virtual unsigned long GetChars (char *buf, unsigned long len); // override for other than buffer compression virtual unsigned long SendChars (char *buf, unsigned long len); // override for other than buffer compression virtual void Encode (void); // override to provide compression algorythm virtual void Decode (void); // override to provide compression algorythm + virtual void setLevel(int l) {level = l;}; + virtual int getLevel() {return level;}; }; SWORD_NAMESPACE_END diff --git a/include/swconfig.h b/include/swconfig.h index 71fe735..794d24c 100644 --- a/include/swconfig.h +++ b/include/swconfig.h @@ -3,7 +3,7 @@ * swconfig.h - definition of Class SWConfig used for saving and * retrieval of configuration information * - * $Id: swconfig.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: swconfig.h 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -39,51 +39,106 @@ typedef std::map < SWBuf, ConfigEntMap, std::less < SWBuf > >SectionMap; * */ class SWDLLEXPORT SWConfig { -private: - char getline(int fd, SWBuf &line); public: - /** The filename used by this SWConfig object - * - */ - SWBuf filename; /** Map of available sections * The map of available sections. */ - SectionMap Sections; /** Constructor of SWConfig - * @param ifilename The file, which should be used for this config. - */ - SWConfig(const char *ifilename); + * @param fileName The storage path for this config. + */ + SWConfig(const char *fileName); SWConfig(); virtual ~SWConfig(); - /** Load from disk - * Load the content from disk. - */ - virtual void Load(); + /** Get the section map for the config + */ + virtual SectionMap &getSections(); + const SectionMap &getSections() const { return const_cast<SWConfig *>(this)->getSections(); } - /** Save to disk - * Save the content of this config object to disk. - */ - virtual void Save(); + /** Load the content from datastore + */ + virtual void load(); - /** Merges the values of addFrom - * @param addFrom The config which values should be merged to this config object. Already existing values will be overwritten. - */ + /** Save the content of this config object to the datastore + */ + virtual void save() const; + + /** Merges into this config the values from addFrom + * @param addFrom The config which values should be merged to this config object. Already existing values will be overwritten. + */ virtual void augment(SWConfig &addFrom); - virtual SWConfig & operator +=(SWConfig &addFrom) { augment(addFrom); return *this; } - - /** Get a section - * This is an easy way to get and store config values. - * The following will work:\n - * - * @code - * SWConfig config("/home/user/.setttings"); - * config["Colors"]["Background"] = "red"; - * @endcode - */ - virtual ConfigEntMap & operator [](const char *section); - }; + + /** Get a specified section from config, creating the section if needed + * There is no const version of this method because it returns a ConfigEntMap reference, creating the requested section if it doesn't exist. + * @param section section name to retrieve + */ + ConfigEntMap &getSection(const char *section) { return getSections()[section]; } + + + /** This operator provides a conventient syntax to get and store config values + * + * config[section][key] = value; + * value = config[section][key]; + * + * The following will work:\n + * + * @code + * SWConfig config("/home/user/.settings"); + * config["Colors"]["Background"] = "red"; + * @endcode + */ + ConfigEntMap &operator [](const char *section) { return getSection(section); } + + /** shorthand operator for augment + */ + SWConfig &operator +=(SWConfig &addFrom) { augment(addFrom); return *this; } + + /** get a value from a [section] key=value + * @param section the section name containing the key + * @param key the key to which the value is associated + * @return the value associated with the key in the provided section + */ + SWBuf getValue(const char *section, const char *key) { + return (*this)[section][key]; + } + + /** set a value for a specified key in a [section] + * @param section the section name to contain the key + * @param key the key to which to associate the value + * @param value the value to associated with the key + */ + void setValue(const char *section, const char *key, const char *value) { + (*this)[section][key] = value; + } + + /** The storage path used by this SWConfig object + */ + SWBuf getFileName() const; + + + // ****** Deprecated methods for removal in 2.0 + + /** + * @deprecated Use getSections() instead. + */ + SWDEPRECATED SectionMap Sections; + + /** + * @deprecated Use getFileName() instead. + */ + SWDEPRECATED SWBuf filename; + + /** + * @deprecated Use load() instead. + */ + SWDEPRECATED void Load() { load(); } + + /** + * @deprecated Use save() instead. + */ + SWDEPRECATED void Save() { save(); } + +}; SWORD_NAMESPACE_END #endif diff --git a/include/swkey.h b/include/swkey.h index 89786f0..6dd0f6d 100644 --- a/include/swkey.h +++ b/include/swkey.h @@ -4,7 +4,7 @@ * types of keys for indexing into modules (e.g. verse, word, * place, etc.) * - * $Id: swkey.h 2926 2013-07-31 02:06:33Z scribe $ + * $Id: swkey.h 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -159,6 +159,7 @@ public: */ SWDEPRECATED char Error() { return popError(); } virtual char popError(); + virtual char getError() { return error; } virtual void setError(char err) { error = err; } /** Sets this SWKey with a character string diff --git a/include/swld.h b/include/swld.h index 397a0bc..1d7e72c 100644 --- a/include/swld.h +++ b/include/swld.h @@ -3,7 +3,7 @@ * swld.h - code for base class 'SWLD'. SWLD is the basis for all * types of Lexicon and Dictionary modules (hence the 'LD'). * - * $Id: swld.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: swld.h 3215 2014-05-01 05:13:22Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/swmgr.h b/include/swmgr.h index 1dad90a..9ddc4aa 100644 --- a/include/swmgr.h +++ b/include/swmgr.h @@ -3,7 +3,7 @@ * swmgr.h - definition of class SWMgr used to interact with an install * base of sword modules. * - * $Id: swmgr.h 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: swmgr.h 3541 2017-12-03 18:40:33Z scribe $ * * Copyright 1997-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -88,7 +88,7 @@ class SWOptionFilter; * SWMgr exposes an installed module set and can be asked to configure the desired * markup and options which modules will produce. * - * @version $Id: swmgr.h 3156 2014-04-17 03:50:37Z greg.hellings $ + * @version $Id: swmgr.h 3541 2017-12-03 18:40:33Z scribe $ */ class SWDLLEXPORT SWMgr { private: @@ -101,9 +101,11 @@ protected: SWConfig *myconfig; //made protected because because BibleTime needs it SWConfig *mysysconfig; SWConfig *homeConfig; - void CreateMods(bool multiMod = false); - virtual SWModule *createModule(const char *name, const char *driver, ConfigEntMap §ion); - void DeleteMods(); + /** + * Deprecated. Use createAllModules instead + */ + SWDEPRECATED void CreateMods(bool multiMod = false) { createAllModules(multiMod); }; + SWDEPRECATED void DeleteMods() { deleteAllModules(); } char configType; // 0 = file; 1 = directory OptionFilterMap optionFilters; FilterMap cipherFilters; @@ -115,49 +117,152 @@ protected: FilterList cleanupFilters; FilterMap extraFilters; StringList options; - virtual void init(); // use to initialize before loading modules - virtual char AddModToConfig(FileDesc *conffd, const char *fname); - virtual void loadConfigDir(const char *ipath); - virtual void AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end); - virtual void AddLocalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end); - StringList augPaths; + /** + * method to create all modules from configuration. + * + * Override to add any special processing before or after + * calling SWMgr::createAllModules + * + * e.g., augmenting a localConfig.conf to SWMgr::config + * that might store CipheyKey or Font preferences per module + * before actual construction of modules + * + */ + virtual void createAllModules(bool multiMod = false); + /** + * called to delete all contructed modules. Undoes createAllModules + * override to clean anything up before or after all modules are + * deleted + */ + virtual void deleteAllModules(); + + /** + * called to create exactly one module from a config entry + * override to do any extra work before or after each module + * is created + */ + virtual SWModule *createModule(const char *name, const char *driver, ConfigEntMap §ion); + + /** + * call by every constructor to initialize SWMgr object + * override to include any addition common initialization + */ + virtual void init(); + + /** + * Deprecated. Use addGlobalOptionFilters instead. + */ + SWDEPRECATED virtual void AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) { addGlobalOptionFilters(module, section); } + /** + * Adds appropriate global option filters to a module. Override to add any special + * global option filters. Global option filters typically update SourceType markup + * to turn on and off specific features of a text when a user has optionally chosen + * to show or hide that feature, e.g. Strongs, Footnotes, Headings, etc. + * Global options can also have more than On and Off values, but these are the most + * common. + * A set of all global options included from an entire library of installed modules + * can be obtained from getGlobalOptions and presented to the user. Values to + * which each global option may be set can be obtain from getGlobalOptionValues, + * and similar. See that family of methods for more information. + * See the module.conf GlobalOptionFilter= entries. + * @param module module to which to add encoding filters + * @param section configuration information for module + */ + virtual void addGlobalOptionFilters(SWModule *module, ConfigEntMap §ion); + + /** + * Deprecated. Use addLocalOptionFilters instead. + */ + SWDEPRECATED virtual void AddLocalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) { addLocalOptionFilters(module, section); } + /** + * Adds appropriate local option filters to a module. Override to add any special + * local option filters. Local options are similar to global options in that + * they may be toggled on or off or set to some value from a range of choices + * but local option + * See the module.conf LocalOptionFilter= entries. + * @param module module to which to add encoding filters + * @param section configuration information for module + */ + virtual void addLocalOptionFilters(SWModule *module, ConfigEntMap §ion); + + /** + * Deprecated. Use addEncodingFilters instead + */ + SWDEPRECATED virtual void AddEncodingFilters(SWModule *module, ConfigEntMap §ion) { addEncodingFilters(module, section); } /** - * Called to add appropriate Encoding Filters to a module. Override to do special actions, - * if desired. See the module.conf Encoding= entry. - * @param module module to which to add Encoding Filters - * @param section configuration information from module.conf + * Adds appropriate encoding filters to a module. Override to add any special + * encoding filters. + * See the module.conf Encoding= entry. + * @param module module to which to add encoding filters + * @param section configuration information for module */ - virtual void AddEncodingFilters(SWModule *module, ConfigEntMap §ion); + virtual void addEncodingFilters(SWModule *module, ConfigEntMap §ion); /** - * Called to add appropriate Render Filters to a module. Override to do special actions, - * if desired. See the module.conf SourceType= entry. - * @param module module to which to add Render Filters - * @param section configuration information from module.conf + * Deprecated. Use addRenderFilters instead. + */ + SWDEPRECATED virtual void AddRenderFilters(SWModule *module, ConfigEntMap §ion) { addRenderFilters(module, section); } + /** + * Add appropriate render filters to a module. Override to add any special + * render filters. Render filters are used for preparing a text for + * display and typically convert markup from SourceType + * to desired display markup. + * See the module.conf SourceType= entry. + * @param module module to which to add render filters + * @param section configuration information for module */ - virtual void AddRenderFilters(SWModule *module, ConfigEntMap §ion); + virtual void addRenderFilters(SWModule *module, ConfigEntMap §ion); /** - * Called to add appropriate Strip Filters to a module. Override to do special actions, - * if desired. See the module.conf SourceType= entry. - * @param module module to which to add Strip Filters - * @param section configuration information from module.conf + * Deprecated. Use addStripFilters instead. */ - virtual void AddStripFilters(SWModule *module, ConfigEntMap §ion); + SWDEPRECATED virtual void AddStripFilters(SWModule *module, ConfigEntMap §ion) { addStripFilters(module, section); } + /** + * Adds appropriate strip filters to a module. Override to add any special + * strip filters. Strip filters are used for preparing text for searching + * and typically strip out all markup and leave only searchable words + * See the module.conf SourceType= entry. + * @param module module to which to add strip filters + * @param section configuration information for module + */ + virtual void addStripFilters(SWModule *module, ConfigEntMap §ion); - // ones manually specified in .conf file - virtual void AddStripFilters(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end); + /** + * Deprecated. Use addLocalStripFilters instead. + */ + SWDEPRECATED virtual void AddStripFilters(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) { addLocalStripFilters(module, section); } + /** + * Adds manually specified strip filters specified in module configuration + * as LocalStripFilters. These might take care of special cases of preparation + * for searching, e.g., removing ()[] and underdot symbols from manuscript modules + * @param module module to which to add local strip filters + * @param section configuration information for module + */ + virtual void addLocalStripFilters(SWModule *module, ConfigEntMap §ion); /** - * Called to add appropriate Raw Filters to a module. Override to do special actions, - * if desired. See the module.conf CipherKey= entry. - * @param module module to which to add Raw Filters - * @param section configuration information from module.conf + * Deprecated. Use addRawFilters instead. + */ + SWDEPRECATED virtual void AddRawFilters(SWModule *module, ConfigEntMap §ion) { addRawFilters(module, section); } + /** + * Add appropriate raw filters to a module. Override to add any special + * raw filters. Raw filters are used to manipulate a buffer + * immediately after it has been read from storage. For example, + * any decryption that might need to be done. + * See the module.conf CipherKey= entry. + * @param module module to which to add raw filters + * @param section configuration information for module */ - virtual void AddRawFilters(SWModule *module, ConfigEntMap §ion); + virtual void addRawFilters(SWModule *module, ConfigEntMap §ion); + // still to be normalized below ... + // + StringList augPaths; + virtual char AddModToConfig(FileDesc *conffd, const char *fname); + virtual void loadConfigDir(const char *ipath); + public: // constants which represent module types used in SWModule::getType @@ -170,14 +275,32 @@ public: static bool isICU; static const char *globalConfPath; - static SWBuf getHomeDir(); /** - * + * Deprecated. Used FileMgr::getSystemFileMgr()->getHomeDir() instead. + */ + SWDEPRECATED static SWBuf getHomeDir(); + + /** + * Perform all the logic to discover a SWORD configuration and libraries on a system */ static void findConfig(char *configType, char **prefixPath, char **configPath, StringList *augPaths = 0, SWConfig **providedSysConf = 0); + /** + * The configuration of a loaded library of SWORD modules + * e.g., from /usr/share/sword/mods.d/ + * augmented with ~/.sword/mods.d/ + * + * This represents all discovered modules and their configuration + * compiled into a single SWConfig object with each [section] + * representing each module. e.g. [KJV] + */ SWConfig *config; + + /** + * The configuration file for SWORD + * e.g., /etc/sword.conf + */ SWConfig *sysConfig; /** The path to main module set and locales @@ -188,45 +311,52 @@ public: */ char *configPath; + + /** + * Deprecated. Use getModules instead. + */ + ModMap Modules; /** The map of available modules. * This map exposes the installed modules. - * Here's an example how to iterate over the map and check the module type of each module. * - *@code - * ModMap::iterator it; - * SWModule *curMod = 0; + * Here's an example how to iterate over all + * the installed modules and check the module name + * and type of each module and do something special + * if the module type is a Bible. * - * for (it = Modules.begin(); it != Modules.end(); it++) { - * curMod = (*it).second; - * if (!strcmp(curMod->Type(), "Biblical Texts")) { - * // do something with curMod - * } - * else if (!strcmp(curMod->Type(), "Commentaries")) { - * // do something with curMod - * } - * else if (!strcmp(curMod->Type(), "Lexicons / Dictionaries")) { - * // do something with curMod - * } + * @code + * + * for (ModMap::iterator it = getModules().begin(); it != getModules().end(); ++it) { + * + * SWBuf modName = it->first; + * SWModule *mod = it->second; + * + * SWBuf modType = mod->getType(); + * + * if (modType == SWMgr::MODTYPE_BIBLES) { + * // do something with mod + * } * } * @endcode */ - ModMap Modules; + ModMap &getModules(); + const ModMap &getModules() const { return const_cast<SWMgr *>(this)->getModules(); } /** Gets a specific module by name. e.g. SWModule *kjv = myManager.getModule("KJV"); * @param modName the name of the module to retrieve * @return the module, if found, otherwise 0 */ - SWModule *getModule(const char *modName) { ModMap::iterator it = Modules.find(modName); return ((it != Modules.end()) ? it->second : 0); } - const SWModule *getModule(const char *modName) const { ModMap::const_iterator it = Modules.find(modName); return ((it != Modules.end()) ? it->second : 0); } + SWModule *getModule(const char *modName) { ModMap::iterator it = getModules().find(modName); return ((it != getModules().end()) ? it->second : 0); } + const SWModule *getModule(const char *modName) const { ModMap::const_iterator it = getModules().find(modName); return ((it != getModules().end()) ? it->second : 0); } /** Constructs an instance of SWMgr * * @param iconfig manually supply a configuration. If not supplied, SWMgr will look on the system * using a complex hierarchical search. See README for detailed specifics. - * @param isysconfig + * @param isysconfig manually supply a an isysconfig (e.g. /etc/sword.conf) * @param autoload whether or not to immediately load modules on construction of this SWMgr. - * If you reimplemented SWMgr you can set this to false and call SWMgr::Load() after you have + * If you reimplemented SWMgr you can set this to false and call SWMgr::load() after you have * completed the contruction and setup of your SWMgr subclass. * @param filterMgr an SWFilterMgr subclass to use to manager filters on modules * SWMgr TAKES OWNERSHIP FOR DELETING THIS OBJECT @@ -271,12 +401,20 @@ public: */ virtual void InstallScan(const char *dir); - /** Load all modules. Should only be manually called if SWMgr was constructed + /** + * Deprecated. Use load + */ + SWDEPRECATED virtual signed char Load() { return load(); } + /** Loads installed library of SWORD modules. + * Should only be manually called if SWMgr was constructed * without autoload; otherwise, this will be called on SWMgr construction * Reimplement this function to supply special functionality when modules are - * initially loaded. + * initially loaded. This includes + * discovery of config path with SWMgr::fileconfig, + * loading of composite SWMgr::config, + * and construction of all modules from config using SWMgr::createAllModules */ - virtual signed char Load(); + virtual signed char load(); /** Change the values of global options (e.g. Footnotes, Strong's Number, etc.) * @param option The name of the option, for which you want to change the @@ -322,43 +460,53 @@ public: /** * Sets the cipher key for the given module. This function updates the key * at runtime, but it does not write to the config file. - * To write the new unlock key to the config file use code like this: + * This method is NOT the recommended means for applying a CipherKey + * to a module. + * + * Typically CipherKey entries and other per module user configuration + * settings are all saved in a separate localConfig.conf that is updated + * by a UI or other client of the library. e.g., + * + * + * [KJV] + * Font=Arial + * LocalOptionFilter=SomeSpecialFilterMyUIAppliesToTheKJV + * + * [ISV] + * CipherKey=xyzzy + * + * [StrongsGreek] + * SomeUISetting=false + * + * + * Then these extra config settings in this separate file are applied + * just before module creation by overriding SWMgr::createAllModules and + * augmenting SWMgr::config with code like this: * * @code - * SectionMap::iterator section; - * ConfigEntMap::iterator entry; - * DIR *dir = opendir(configPath); - * struct dirent *ent; - * char* modFile; - * if (dir) { // find and update .conf file - * rewinddir(dir); - * while ((ent = readdir(dir))) - * { - * if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) - * { - * modFile = m_backend->configPath; - * modFile += "/"; - * modFile += ent->d_name; - * SWConfig *myConfig = new SWConfig( modFile ); - * section = myConfig->Sections.find( m_module->Name() ); - * if ( section != myConfig->Sections.end() ) - * { - * entry = section->second.find("CipherKey"); - * if (entry != section->second.end()) - * { - * entry->second = unlockKey;//set cipher key - * myConfig->Save();//save config file - * } - * } - * delete myConfig; - * } - * } + * void createAllModules(bool multiMod) { + * + * // after SWMgr::config is loaded + * // see if we have our own local settings + * SWBuf myExtraConf = "~/.myapp/localConf.conf"; + * bool exists = FileMgr::existsFile(extraConf); + * if (exists) { + * SWConfig addConfig(extraConf); + * this->config->augment(addConfig); + * } + * + * // now that we've augmented SWMgr::config with our own custom + * // settings, proceed on with creating modules + * + * SWMgr::createAllModules(multiMod); + * * } - * closedir(dir); * @endcode * + * The above convention is preferred to using this setCipherKey method + * * @param modName For this module we change the unlockKey - * @param key This is the new unlck key we use for te module. + * @param key This is the new unlock key we use for the module. */ virtual signed char setCipherKey(const char *modName, const char *key); }; diff --git a/include/swmodule.h b/include/swmodule.h index 7bbdd32..6926bc7 100644 --- a/include/swmodule.h +++ b/include/swmodule.h @@ -4,7 +4,7 @@ * all types of modules (e.g. texts, commentaries, maps, * lexicons, etc.) * - * $Id: swmodule.h 3287 2014-12-03 06:16:12Z greg.hellings $ + * $Id: swmodule.h 3541 2017-12-03 18:40:33Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -47,7 +47,6 @@ class SWFilter; #define SEARCHFLAG_MATCHWHOLEENTRY 4096 #define SWMODULE_OPERATORS \ - SWDEPRECATED operator const char *() { static SWBuf unsafeTmp = renderText(); return unsafeTmp.c_str(); } \ operator SWBuf() { return renderText(); } \ operator SWKey &() { return *getKey(); } \ operator SWKey *() { return getKey(); } \ @@ -57,7 +56,8 @@ class SWFilter; SWModule &operator +=(int steps) { increment(steps); return *this; } \ SWModule &operator ++(int) { return *this += 1; } \ SWModule &operator --(int) { return *this -= 1; } \ - SWModule &operator =(SW_POSITION p) { setPosition(p); return *this; } + SWModule &operator =(SW_POSITION p) { setPosition(p); return *this; } \ + SWDEPRECATED operator const char *() { static SWBuf unsafeTmp = renderText(); return unsafeTmp.c_str(); } typedef std::list < SWFilter * >FilterList; @@ -349,31 +349,27 @@ public: /** Sets/gets module direction * - * @param newdir Value which to set direction; [-1]-only get * @return new direction */ virtual char getDirection() const; SWDEPRECATED char Direction(signed char newdir = -1) { char retVal = getDirection(); if (newdir != -1) return direction = newdir; return retVal; } - /** Sets/gets module encoding + /** Gets module encoding * - * @param enc Value which to set encoding; [-1]-only get * @return Encoding */ char getEncoding() const { return encoding; } SWDEPRECATED char Encoding(signed char enc = -1) { char retVal = getEncoding(); if (enc != -1) encoding = enc; return retVal; } - /** Sets/gets module markup + /** Gets module markup * - * @param markup Value which to set markup; [-1]-only get * @return Markup */ char getMarkup() const { return markup; } SWDEPRECATED char Markup(signed char imarkup = -1) { char retVal = getMarkup(); if (imarkup != -1) markup = imarkup; return retVal; } - /** Sets/gets module language + /** Gets module language * - * @param imodlang Value which to set modlang; [0]-only get * @return pointer to modlang */ const char *getLanguage() const { return modlang; } @@ -386,23 +382,23 @@ public: * * @param istr string for which to search * @param searchType type of search to perform - * >=0 - regex + * >=0 - regex; (for backward compat, if > 0 then used as additional REGEX FLAGS) * -1 - phrase * -2 - multiword - * -3 - entryAttrib (eg. Word//Strongs/G1234/) + * -3 - entryAttrib (eg. Word//Lemma./G1234/) (Lemma with dot means check components (Lemma.[1-9]) also) * -4 - Lucene + * -5 - multilemma window; set 'flags' param to window size (NOT DONE) * @param flags options flags for search * @param scope Key containing the scope. VerseKey or ListKey are useful here. - * @param justCheckIfSupported if set, don't search, - * only tell if this function supports requested search. + * @param justCheckIfSupported If set, don't search but instead set this variable to true/false if the requested search is supported, * @param percent Callback function to get the current search status in %. - * @param percentUserData User data that is given to the callback function as parameter. + * @param percentUserData Anything that you might want to send to the precent callback function. * * @return ListKey set to verses that contain istr */ virtual ListKey &search(const char *istr, int searchType = 0, int flags = 0, - SWKey * scope = 0, - bool * justCheckIfSupported = 0, + SWKey *scope = 0, + bool *justCheckIfSupported = 0, void (*percent) (char, void *) = &nullPercent, void *percentUserData = 0); @@ -487,7 +483,7 @@ public: /** Adds a RenderFilter to this module's renderFilters queue. * Render Filters are called when the module is asked to produce * renderable text. - * @param newfilter the filter to add + * @param newFilter the filter to add * @return *this */ virtual SWModule &addRenderFilter(SWFilter *newFilter) { @@ -505,7 +501,7 @@ public: } /** Removes a RenderFilter from this module's renderFilters queue - * @param oldfilter the filter to remove + * @param oldFilter the filter to remove * @return *this */ virtual SWModule &removeRenderFilter(SWFilter *oldFilter) { @@ -515,8 +511,8 @@ public: SWDEPRECATED SWModule &RemoveRenderFilter(SWFilter *oldFilter) { return removeRenderFilter(oldFilter); } /** Replaces a RenderFilter in this module's renderfilters queue - * @param oldfilter the filter to remove - * @param newfilter the filter to add in its place + * @param oldFilter the filter to remove + * @param newFilter the filter to add in its place * @return *this */ virtual SWModule &replaceRenderFilter(SWFilter *oldFilter, SWFilter *newFilter) { @@ -541,7 +537,7 @@ public: * Encoding Filters are called immediately when the module is read * from data source, to assure we have desired internal data stream * (e.g. UTF-8 for text modules) - * @param newfilter the filter to add + * @param newFilter the filter to add * @return *this */ virtual SWModule &addEncodingFilter(SWFilter *newFilter) { @@ -551,7 +547,7 @@ public: SWDEPRECATED SWModule &AddEncodingFilter(SWFilter *newFilter) { return addEncodingFilter(newFilter); } /** Removes an EncodingFilter from this module's encodingFilters queue - * @param oldfilter the filter to remove + * @param oldFilter the filter to remove * @return *this */ virtual SWModule &removeEncodingFilter(SWFilter *oldFilter) { @@ -561,8 +557,8 @@ public: SWDEPRECATED SWModule &RemoveEncodingFilter(SWFilter *oldFilter) { return removeEncodingFilter(oldFilter); } /** Replaces an EncodingFilter in this module's encodingfilters queue - * @param oldfilter the filter to remove - * @param newfilter the filter to add in its place + * @param oldFilter the filter to remove + * @param newFilter the filter to add in its place * @return *this */ virtual SWModule &replaceEncodingFilter(SWFilter *oldFilter, SWFilter *newFilter) { @@ -586,7 +582,7 @@ public: /** Adds a StripFilter to this module's stripFilters queue. * Strip filters are called when a module is asked to render * an entry without any markup (like when searching). - * @param newfilter the filter to add + * @param newFilter the filter to add * @return *this */ virtual SWModule &addStripFilter(SWFilter *newFilter) { @@ -599,8 +595,8 @@ public: * @param newFilter the filter to add * @return *this */ - virtual SWModule &addRawFilter(SWFilter *newfilter) { - rawFilters->push_back(newfilter); + virtual SWModule &addRawFilter(SWFilter *newFilter) { + rawFilters->push_back(newFilter); return *this; } SWDEPRECATED SWModule &AddRawFilter(SWFilter *newFilter) { return addRawFilter(newFilter); } @@ -626,7 +622,7 @@ public: * Option Filters are used to turn options in the text on * or off, or so some other state (e.g. Strong's Number, * Footnotes, Cross References, etc.) - * @param newfilter the filter to add + * @param newFilter the filter to add * @return *this */ virtual SWModule &addOptionFilter(SWOptionFilter *newFilter) { @@ -662,7 +658,8 @@ public: * @param render for internal use * @return result buffer */ - SWBuf renderText(const char *buf = 0, int len = -1, bool render = true); + SWBuf renderText(const char *buf, int len = -1, bool render = true) const; + SWBuf renderText(); SWDEPRECATED const char *RenderText(const char *buf = 0, int len = -1, bool render = true) { return renderText(buf, len, render); } /** Produces any header data which might be useful which is associated with the diff --git a/include/swobject.h b/include/swobject.h index 8866c37..0606ea0 100644 --- a/include/swobject.h +++ b/include/swobject.h @@ -3,7 +3,7 @@ * swobject.h - definition for SWObject used as lowest base class for * many SWORD objects * - * $Id: swobject.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: swobject.h 3433 2016-08-17 13:25:41Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/swoptfilter.h b/include/swoptfilter.h index 0f2aed5..a525033 100644 --- a/include/swoptfilter.h +++ b/include/swoptfilter.h @@ -2,7 +2,7 @@ * * swoptfilter.h - Implenetation of SWOptionFilter * - * $Id: swoptfilter.h 2980 2013-09-14 21:51:47Z scribe $ + * $Id: swoptfilter.h 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -80,7 +80,7 @@ public: virtual const char *getOptionValue(); /** sets the value of the option of this filter, - * e.g maybe a strong's filter mioght be set to "on" / "off" - + * e.g maybe a strong's filter might be set to "On" / "Off" - * that would mean to show or not to show the strongs in the text, * see also getOptionValues() * @param ival the new option value diff --git a/include/swversion.h b/include/swversion.h index 5f71dab..ee588fc 100644 --- a/include/swversion.h +++ b/include/swversion.h @@ -3,7 +3,7 @@ * swversion.h - definition of class SWVersion used to compare version * info * - * $Id: swversion.h 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: swversion.h 3524 2017-11-07 03:08:49Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -24,11 +24,11 @@ #ifndef SWVERSION_H #define SWVERSION_H -#define SWORD_VERSION_NUM 107003000 -#define SWORD_VERSION_STR "1.7.3" +#define SWORD_VERSION_NUM 107905000 +#define SWORD_VERSION_STR "1.7.905" #define SWORD_VERSION_MAJOR 1 #define SWORD_VERSION_MINOR 7 -#define SWORD_VERSION_MICRO 3 +#define SWORD_VERSION_MICRO 905 #define SWORD_VERSION_NANO 0 #include <defs.h> diff --git a/include/sysdata.h b/include/sysdata.h index b95b836..527c86d 100644 --- a/include/sysdata.h +++ b/include/sysdata.h @@ -2,7 +2,7 @@ * * sysdata.h - * - * $Id: sysdata.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: sysdata.h 3455 2017-04-24 08:50:31Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -40,7 +40,8 @@ typedef unsigned short __u16; typedef signed int __s32; typedef unsigned int __u32; -#ifdef __GNUC__ +#ifdef OS_ANDROID +#elif defined(__GNUC__) __extension__ typedef __signed__ long long __s64; __extension__ typedef unsigned long long __u64; #elif defined(__BORLANDC__) diff --git a/include/teihtmlhref.h b/include/teihtmlhref.h index 99b2755..d34cb7e 100644 --- a/include/teihtmlhref.h +++ b/include/teihtmlhref.h @@ -2,7 +2,7 @@ * * teihtmlhref.h - Implementation of TEIHTMLHREF * - * $Id: teihtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: teihtmlhref.h 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -36,7 +36,7 @@ private: protected: class MyUserData : public BasicFilterUserData { public: - bool BiblicalText; + bool isBiblicalText; SWBuf lastHi; SWBuf version; diff --git a/include/teilatex.h b/include/teilatex.h new file mode 100644 index 0000000..c36e302 --- /dev/null +++ b/include/teilatex.h @@ -0,0 +1,57 @@ +/****************************************************************************** + * + * teilatex.h - Implementation of TEILaTeX + * + * $Id: teilatex.h 3548 2017-12-10 05:11:38Z scribe $ + * + * Copyright 2012-2014 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. + * + */ + +#ifndef TEILATEX_H +#define TEILATEX_H + +#include <swbasicfilter.h> + +SWORD_NAMESPACE_START + +/** this filter converts TEI text to LaTeX text + */ +class SWDLLEXPORT TEILaTeX : public SWBasicFilter { +private: + bool renderNoteNumbers; + +protected: + class MyUserData : public BasicFilterUserData { + public: + bool isBiblicalText; + SWBuf lastHi; + bool firstCell; // for tables, indicates whether a cell is the first one in a row + int consecutiveNewlines; + + SWBuf version; + MyUserData(const SWModule *module, const SWKey *key); + }; + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); + } + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); +public: + TEILaTeX(); + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/teirtf.h b/include/teirtf.h index e9793d3..85eb0df 100644 --- a/include/teirtf.h +++ b/include/teirtf.h @@ -2,7 +2,7 @@ * * teirtf.h - Implementation of TEIRTF * - * $Id: teirtf.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: teirtf.h 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -35,7 +35,7 @@ private: protected: class MyUserData : public BasicFilterUserData { public: - bool BiblicalText; + bool isBiblicalText; bool inOsisRef; SWBuf w; SWBuf version; diff --git a/include/teixhtml.h b/include/teixhtml.h index c948608..7d72219 100644 --- a/include/teixhtml.h +++ b/include/teixhtml.h @@ -2,7 +2,7 @@ * * teixhtml.h - Implementation of TEIXHTML * - * $Id: teixhtml.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: teixhtml.h 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -36,7 +36,7 @@ private: protected: class MyUserData : public BasicFilterUserData { public: - bool BiblicalText; + bool isBiblicalText; SWBuf lastHi; SWBuf version; @@ -49,6 +49,7 @@ protected: public: TEIXHTML(); void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } + virtual const char *getHeader() const; }; SWORD_NAMESPACE_END diff --git a/include/thmlhtml.h b/include/thmlhtml.h index 2f32cc4..9c50f01 100644 --- a/include/thmlhtml.h +++ b/include/thmlhtml.h @@ -2,7 +2,7 @@ * * thmlhtml.h - Implementation of ThMLHTML * - * $Id: thmlhtml.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: thmlhtml.h 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -33,8 +33,8 @@ class SWDLLEXPORT ThMLHTML : public SWBasicFilter { protected: class MyUserData : public BasicFilterUserData { public: - MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {} - bool SecHead; + MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key), inSecHead(false) {} + bool inSecHead; }; virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) { return new MyUserData(module, key); diff --git a/include/thmlhtmlhref.h b/include/thmlhtmlhref.h index 8ce802e..5cacc99 100644 --- a/include/thmlhtmlhref.h +++ b/include/thmlhtmlhref.h @@ -2,7 +2,7 @@ * * thmlhtmlhref.h - Implementation of ThMLHTMLHREF * - * $Id: thmlhtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: thmlhtmlhref.h 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -38,8 +38,8 @@ protected: public: MyUserData(const SWModule *module, const SWKey *key);//: BasicFilterUserData(module, key) {} bool inscriptRef; - bool SecHead; - bool BiblicalText; + bool inSecHead; + bool isBiblicalText; SWBuf version; XMLTag startTag; }; diff --git a/include/thmllatex.h b/include/thmllatex.h new file mode 100644 index 0000000..14ea064 --- /dev/null +++ b/include/thmllatex.h @@ -0,0 +1,60 @@ +/****************************************************************************** + * + * thmllatex.h - Implementation of ThMLLaTeX + * + * $Id: thmllatex.h 3548 2017-12-10 05:11:38Z scribe $ + * + * Copyright 2011-2014 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. + * + */ + +#ifndef THMLLATEX_H +#define THMLLATEX_H + +#include <swbasicfilter.h> +#include <utilxml.h> + +SWORD_NAMESPACE_START + +/** this filter converts ThML text to LaTeX + */ +class SWDLLEXPORT ThMLLaTeX : public SWBasicFilter { + SWBuf imgPrefix; + bool renderNoteNumbers; +protected: + class MyUserData : public BasicFilterUserData { + public: + MyUserData(const SWModule *module, const SWKey *key);//: BasicFilterUserData(module, key) {} + bool inscriptRef; + bool inSecHead; + bool isBiblicalText; + SWBuf version; + XMLTag startTag; + }; + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); + } + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); +public: + ThMLLaTeX(); + virtual const char *getImagePrefix() { return imgPrefix.c_str(); } + virtual void setImagePrefix(const char *newImgPrefix) { imgPrefix = newImgPrefix; } + virtual const char *getHeader() const; + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } +}; + +SWORD_NAMESPACE_END + +#endif diff --git a/include/thmlrtf.h b/include/thmlrtf.h index 9b7d3f2..cf8aef2 100644 --- a/include/thmlrtf.h +++ b/include/thmlrtf.h @@ -2,7 +2,7 @@ * * thmlrtf.h - Implementation of ThMLRTF * - * $Id: thmlrtf.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: thmlrtf.h 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -35,9 +35,9 @@ protected: class MyUserData : public BasicFilterUserData { public: MyUserData(const SWModule *module, const SWKey *key); - bool SecHead; + bool inSecHead; SWBuf version; - bool BiblicalText; + bool isBiblicalText; XMLTag startTag; }; virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) { diff --git a/include/thmlxhtml.h b/include/thmlxhtml.h index c3406ad..9696cb8 100644 --- a/include/thmlxhtml.h +++ b/include/thmlxhtml.h @@ -2,7 +2,7 @@ * * thmlxhtml.h - Implementation of ThMLXHTML * - * $Id: thmlxhtml.h 3196 2014-04-24 03:04:07Z greg.hellings $ + * $Id: thmlxhtml.h 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -38,8 +38,8 @@ protected: public: MyUserData(const SWModule *module, const SWKey *key);//: BasicFilterUserData(module, key) {} bool inscriptRef; - char SecHead; - bool BiblicalText; + char secHeadLevel; + bool isBiblicalText; SWBuf version; XMLTag startTag; }; diff --git a/include/utf8nfc.h b/include/utf8nfc.h index 1240cca..fc64564 100644 --- a/include/utf8nfc.h +++ b/include/utf8nfc.h @@ -2,7 +2,7 @@ * * utf8nfc.h - Implementation of UTF8NFC * - * $Id: utf8nfc.h 3157 2014-04-17 03:56:12Z greg.hellings $ + * $Id: utf8nfc.h 3081 2014-03-05 19:52:08Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/utf8scsu.h b/include/utf8scsu.h new file mode 100644 index 0000000..6936434 --- /dev/null +++ b/include/utf8scsu.h @@ -0,0 +1,49 @@ +/****************************************************************************** + * + * utf8scsu.h - Implementation of UTF8SCSU + * + * $Id: utf8scsu.h 3472 2017-05-22 04:19:02Z scribe $ + * + * Copyright 2001-2014 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. + * + */ + +#ifndef UTF8SCSU_H +#define UTF8SCSU_H + +#include <swfilter.h> + +#include <unicode/utypes.h> +#include <unicode/ucnv.h> +#include <unicode/uchar.h> +#include <unicode/unistr.h> + +SWORD_NAMESPACE_START + +/** This filter converts UTF-8 encoded text to SCSU + */ +class SWDLLEXPORT UTF8SCSU : public SWFilter { +private: + UConverter* scsuConv; + UConverter* utf8Conv; + UErrorCode err; +public: + UTF8SCSU(); + ~UTF8SCSU(); + virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/utilstr.h b/include/utilstr.h index 573b4a1..efb6768 100644 --- a/include/utilstr.h +++ b/include/utilstr.h @@ -2,7 +2,7 @@ * * utilstr.h - prototypes for string utility functions * - * $Id: utilstr.h 2981 2013-09-15 00:05:26Z scribe $ + * $Id: utilstr.h 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,9 +29,29 @@ SWORD_NAMESPACE_START -/** stdstr - clone a string -*/ -SWDLLEXPORT char *stdstr (char **iistr, const char *istr, unsigned int memPadFactor = 1); + +/****************************************************************************** + * stdstr - clones a string + * + * ENT: ipstr - pointer to a string pointer to set if necessary + * istr - string to set to *ipstr + * 0 - only get + * + * RET: *ipstr + */ + +inline char *stdstr(char **ipstr, const char *istr, unsigned int memPadFactor = 1) { + if (*ipstr) + delete [] *ipstr; + if (istr) { + int len = (int)strlen(istr) + 1; + *ipstr = new char [ len * memPadFactor ]; + memcpy(*ipstr, istr, len); + } + else *ipstr = 0; + return *ipstr; +} + SWDLLEXPORT char *strstrip (char *istr); SWDLLEXPORT const char *stristr (const char *s1, const char *s2); SWDLLEXPORT int strnicmp(const char *s1, const char *s2, int len); @@ -55,7 +75,80 @@ extern const unsigned char SW_toupper_array[256]; * unicode codepoint value (0 with buf incremented is invalid UTF8 byte */ -__u32 getUniCharFromUTF8(const unsigned char **buf); + +/****************************************************************************** + * getUniCharFromUTF8 - retrieves the next Unicode codepoint from a UTF8 string + * and increments buf to start of next codepoint + * + * ENT: buf - address of a utf8 buffer + * + * RET: buf - incremented past last byte used in computing the current codepoint + * unicode codepoint value (0 with buf incremented is invalid UTF8 byte + */ + +inline __u32 getUniCharFromUTF8(const unsigned char **buf, bool skipValidation = false) { + __u32 ch = 0; + + //case: We're at the end + if (!(**buf)) { + return ch; + } + + //case: ANSI + if (!(**buf & 128)) { + ch = **buf; + (*buf)++; + return ch; + } + + //case: Invalid UTF-8 (illegal continuing byte in initial position) + if ((**buf >> 6) == 2) { + (*buf)++; + return ch; + } + + + //case: 2+ byte codepoint + int subsequent = 1; + if ((**buf & 32) == 0) { subsequent = 1; } + else if ((**buf & 16) == 0) { subsequent = 2; } + else if ((**buf & 8) == 0) { subsequent = 3; } + else if ((**buf & 4) == 0) { subsequent = 4; } + else if ((**buf & 2) == 0) { subsequent = 5; } + else if ((**buf & 1) == 0) { subsequent = 6; } + else subsequent = 7; // is this legal? + + ch = **buf & (0xFF>>(subsequent + 1)); + + for (int i = 1; i <= subsequent; ++i) { + // subsequent byte did not begin with 10XXXXXX + // move our buffer to here and error out + // this also catches our null if we hit the string terminator + if (((*buf)[i] >> 6) != 2) { + *buf += i; + return 0; + } + ch <<= 6; + ch |= (*buf)[i] & 63; + } + *buf += (subsequent+1); + + if (!skipValidation) { + // I THINK THIS IS STUPID BUT THE SPEC SAYS NO MORE THAN 4 BYTES + if (subsequent > 3) ch = 0; + // AGAIN stupid, but spec says UTF-8 can't use more than 21 bits + if (ch > 0x1FFFFF) ch = 0; + // This would be out of Unicode bounds + if (ch > 0x10FFFF) ch = 0; + // these would be values which could be represented in less bytes + if (ch < 0x80 && subsequent > 0) ch = 0; + if (ch < 0x800 && subsequent > 1) ch = 0; + if (ch < 0x10000 && subsequent > 2) ch = 0; + if (ch < 0x200000 && subsequent > 3) ch = 0; + } + + return ch; +} /****************************************************************************** @@ -66,9 +159,93 @@ __u32 getUniCharFromUTF8(const unsigned char **buf); * * RET: buf - a UTF8 string which consists of the proper UTF8 sequence of * bytes for the given Unicode codepoint + * NOTE: for speed and thread safety, this method now requires a buffer + * to work with */ -SWBuf getUTF8FromUniChar(__u32 uchar); +inline SWBuf *getUTF8FromUniChar(__u32 uchar, SWBuf *appendTo) { + unsigned long base = appendTo->size(); + + // This would be out of Unicode bounds + if (uchar > 0x10FFFF) uchar = 0xFFFD; + char bytes = uchar < 0x80 ? 1 : uchar < 0x800 ? 2 : uchar < 0x10000 ? 3 : 4; + appendTo->setSize(base+bytes); + switch (bytes) { + case 1: + (*appendTo)[base ] = (unsigned char)uchar; + break; + case 2: + (*appendTo)[base+1] = (unsigned char)(0x80 | (uchar & 0x3f)); + uchar >>= 6; + (*appendTo)[base ] = (unsigned char)(0xc0 | (uchar & 0x1f)); + break; + case 3: + (*appendTo)[base+2] = (unsigned char)(0x80 | (uchar & 0x3f)); + uchar >>= 6; + (*appendTo)[base+1] = (unsigned char)(0x80 | (uchar & 0x3f)); + uchar >>= 6; + (*appendTo)[base ] = (unsigned char)(0xe0 | (uchar & 0x0f)); + break; + case 4: + (*appendTo)[base+3] = (unsigned char)(0x80 | (uchar & 0x3f)); + uchar >>= 6; + (*appendTo)[base+2] = (unsigned char)(0x80 | (uchar & 0x3f)); + uchar >>= 6; + (*appendTo)[base+1] = (unsigned char)(0x80 | (uchar & 0x3f)); + uchar >>= 6; + (*appendTo)[base ] = (unsigned char)(0xf0 | (uchar & 0x07)); + break; + } +/* + else if (uchar < 0x4000000) { + appendTo->setSize(base+5); + i = uchar & 0x3f; + (*appendTo)[base+4] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + (*appendTo)[base+3] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + (*appendTo)[base+2] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + (*appendTo)[base+1] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x03; + (*appendTo)[base] = (unsigned char)(0xf8 | i); + } + else if (uchar < 0x80000000) { + appendTo->setSize(base+6); + i = uchar & 0x3f; + (*appendTo)[base+5] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + (*appendTo)[base+4] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + (*appendTo)[base+3] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + (*appendTo)[base+2] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + (*appendTo)[base+1] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x01; + (*appendTo)[base] = (unsigned char)(0xfc | i); + } +*/ + return appendTo; +} /****************************************************************************** diff --git a/include/versekey.h b/include/versekey.h index acddc9d..b32b0f9 100644 --- a/include/versekey.h +++ b/include/versekey.h @@ -3,7 +3,7 @@ * versekey.h - code for class 'VerseKey'- a standard Biblical verse * key * - * $Id: versekey.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: versekey.h 3541 2017-12-03 18:40:33Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -176,7 +176,6 @@ public: /** sets the upper boundary for this VerseKey * @param ub the new upper boundary for this VerseKey - * @return the upper boundary the key was set to */ void setUpperBound(const VerseKey &ub); SWDEPRECATED VerseKey &UpperBound(const VerseKey &ub) { setUpperBound(ub); return getUpperBound(); } @@ -223,21 +222,18 @@ public: /** Positions this key * * @param newpos Position to set to. - * @return *this */ virtual void setPosition(SW_POSITION newpos); /** Decrements key a number of verses * * @param steps Number of verses to jump backward - * @return *this */ virtual void decrement(int steps = 1); /** Increments key a number of verses * * @param steps Number of verses to jump forward - * @return *this */ virtual void increment(int steps = 1); virtual bool isTraversable() const { return true; } @@ -348,7 +344,6 @@ public: * Matthew 29:47 = Mark 2:2). If last verse is * exceeded, key is set to last Book CH:VS * - * @return *this */ virtual void normalize(bool autocheck = false); SWDEPRECATED void Normalize(char autocheck = 0) { normalize(autocheck!=0); } @@ -357,9 +352,6 @@ public: * automatically normalize itself when modified * * @param iautonorm value which to set autonorm - * [MAXPOS(char)] - only get - * @return if unchanged -> value of autonorm, - * if changed -> previous value of autonorm */ virtual void setAutoNormalize(bool iautonorm); virtual bool isAutoNormalize() const; @@ -402,7 +394,6 @@ public: /** Sets index based upon current verse * * @param iindex value to set index to - * @return offset */ virtual void setIndex(long iindex); @@ -423,7 +414,7 @@ public: /** Tries to parse a string and convert it into an OSIS reference * @param inRef reference string to try to parse - * @param defaultKey @see ParseVerseList(..., defaultKey, ...) + * @param defaultKey for details @see ParseVerseList(..., defaultKey, ...) */ static const char *convertToOSIS(const char *inRef, const SWKey *defaultKey); diff --git a/include/versificationmgr.h b/include/versificationmgr.h index 4ed8a62..a488d0e 100644 --- a/include/versificationmgr.h +++ b/include/versificationmgr.h @@ -3,7 +3,7 @@ * versification.h - definition of class VersificationMgr used for managing * versification systems * - * $Id: versificationmgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: versificationmgr.h 3240 2014-07-12 16:27:35Z scribe $ * * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -142,11 +142,12 @@ public: int getBookNumberByOSISName(const char *bookName) const; const Book *getBook(int number) const; int getBookCount() const; - void loadFromSBook(const sbook *ot, const sbook *nt, int *chMax); + void loadFromSBook(const sbook *ot, const sbook *nt, int *chMax, const unsigned char *mappings=NULL); long getOffsetFromVerse(int book, int chapter, int verse) const; char getVerseFromOffset(long offset, int *book, int *chapter, int *verse) const; const int *getBMAX() const { return BMAX; }; long getNTStartOffset() const { return ntStartOffset; } + void translateVerse(const System *dstSys, const char **book, int *chapter, int *verse, int *verse_end) const; }; VersificationMgr() { init(); } ~VersificationMgr(); @@ -154,7 +155,7 @@ public: static void setSystemVersificationMgr(VersificationMgr *newVersificationMgr); const StringList getVersificationSystems() const; const System *getVersificationSystem(const char *name) const; - void registerVersificationSystem(const char *name, const sbook *ot, const sbook *nt, int *chMax); + void registerVersificationSystem(const char *name, const sbook *ot, const sbook *nt, int *chMax, const unsigned char *mappings=NULL); void registerVersificationSystem(const char *name, const TreeKey *); }; diff --git a/include/xzcomprs.h b/include/xzcomprs.h index 49b43bc..c9059be 100644 --- a/include/xzcomprs.h +++ b/include/xzcomprs.h @@ -3,7 +3,7 @@ * xzcomprs.h - XzCompress, a driver class that provides xz (LZMA2) * compression * - * $Id: xzcomprs.h 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: xzcomprs.h 3249 2014-08-24 01:55:08Z scribe $ * * Copyright 2000-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -27,6 +27,7 @@ #include <swcomprs.h> #include <defs.h> +#include <sysdata.h> SWORD_NAMESPACE_START @@ -39,6 +40,9 @@ public: virtual void Encode(void); virtual void Decode(void); + virtual void setLevel(int l); +private: + __u64 memlimit; // memory usage limit during decompression }; SWORD_NAMESPACE_END diff --git a/include/zcom4.h b/include/zcom4.h new file mode 100644 index 0000000..aaf8541 --- /dev/null +++ b/include/zcom4.h @@ -0,0 +1,78 @@ +/****************************************************************************** + * + * zcom4.h - code for class 'zCom4'- a module that reads compressed text + * files: ot and nt using indexs ??.vss + * + * $Id: zcom4.h 3141 2014-03-19 01:24:04Z chrislit $ + * + * Copyright 1996-2014 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. + * + */ + +#ifndef ZCOM4_H +#define ZCOM4_H + +#include <swcom.h> + +#include <defs.h> + +SWORD_NAMESPACE_START + +class SWDLLEXPORT zCom4 : public zVerse4, public SWCom { + + VerseKey *lastWriteKey; + bool sameBlock(VerseKey * lastWriteKey, VerseKey * key); + int blockType; + + +public: + + zCom4(const char *ipath, const char *iname = 0, const char *idesc = 0, + int blockType = CHAPTERBLOCKS, SWCompress *icomp = 0, + SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, + SWTextDirection dir = DIRECTION_LTR, + SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0, + const char *versification = "KJV"); + virtual ~zCom4(); + virtual SWBuf &getRawEntryBuf() const; + virtual void increment(int steps = 1); + virtual void decrement(int steps = 1) { increment(-steps); } + + // write interface ---------------------------- + virtual bool isWritable() const; + static char createModule(const char *path, int blockBound, const char *v11n = "KJV") { + return zVerse4::createModule(path, blockBound, v11n); + } + virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry + virtual void linkEntry(const SWKey * linkKey); // Link current module entry to other module entry + virtual void deleteEntry(); // Delete current module entry + // end write interface ------------------------ + + virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering + + // swcacher interface ---------------------- + virtual void flush() { flushCache(); } + // end swcacher interface ---------------------- + + virtual bool isLinked(const SWKey *k1, const SWKey *k2) const; + virtual bool hasEntry(const SWKey *k) const; + + SWMODULE_OPERATORS + +}; + +SWORD_NAMESPACE_END + +#endif diff --git a/include/ztext.h b/include/ztext.h index 4bdcc8d..6222a7c 100644 --- a/include/ztext.h +++ b/include/ztext.h @@ -3,7 +3,7 @@ * ztext.h - code for class 'zText'- a module that reads compressed text * files: ot and nt using indexs ??.vss * - * $Id: ztext.h 3176 2014-04-17 04:22:36Z greg.hellings $ + * $Id: ztext.h 3126 2014-03-14 11:59:36Z chrislit $ * * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/include/ztext4.h b/include/ztext4.h new file mode 100644 index 0000000..2582fc2 --- /dev/null +++ b/include/ztext4.h @@ -0,0 +1,90 @@ +/****************************************************************************** + * + * ztext4.h - code for class 'zText4'- a module that reads compressed text + * files: ot and nt using indexs ??.vss + * + * $Id: ztext4.h 3141 2014-03-19 01:24:04Z chrislit $ + * + * Copyright 1996-2014 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. + * + */ + +#ifndef ZTEXT4_H +#define ZTEXT4_H + +#include <zverse4.h> +#include <swtext.h> + +#include <defs.h> + +namespace lucene { namespace index { +class IndexReader; +}} + +namespace lucene { namespace search { +class IndexSearcher; +}} + +SWORD_NAMESPACE_START + +/*** SWModule implementation for compressed modules +* This class handles compressed modules. +* It should not be used in frontends, unless you are doing very special things. +*/ +class SWDLLEXPORT zText4:public zVerse4, public SWText { + + VerseKey *lastWriteKey; + bool sameBlock(VerseKey * lastWriteKey, VerseKey * key); + int blockType; + +public: + zText4(const char *ipath, const char *iname = 0, const char *idesc = 0, + int blockType = CHAPTERBLOCKS, SWCompress *icomp = 0, + SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, + SWTextDirection dir = DIRECTION_LTR, + SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0, + const char *versification = "KJV"); + + virtual ~zText4(); + virtual SWBuf &getRawEntryBuf() const; + + virtual void increment(int steps = 1); + virtual void decrement(int steps = 1) { increment(-steps); } + + // write interface ---------------------------- + virtual bool isWritable() const; + static char createModule(const char *path, int blockBound, const char *v11n = "KJV") { + return zVerse4::createModule(path, blockBound, v11n); + } + + virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry + virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry + virtual void deleteEntry(); // Delete current module entry + // end write interface ------------------------ + + virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering + + // swcacher interface ---------------------- + virtual void flush() { flushCache(); } + // end swcacher interface ---------------------- + + virtual bool isLinked(const SWKey *k1, const SWKey *k2) const; + virtual bool hasEntry(const SWKey *k) const; + + SWMODULE_OPERATORS +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/zverse.h b/include/zverse.h index 22bf913..5a1e197 100644 --- a/include/zverse.h +++ b/include/zverse.h @@ -5,7 +5,7 @@ * and provides lookup and parsing functions based on * class VerseKey * - * $Id: zverse.h 3180 2014-04-17 04:26:37Z greg.hellings $ + * $Id: zverse.h 3136 2014-03-17 09:38:48Z chrislit $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -61,8 +61,6 @@ public: #define BOOKBLOCKS 4 static const char uniqueIndexID[]; - char nl; - // fileMode default = RDONLY zVerse(const char *ipath, int fileMode = -1, int blockType = CHAPTERBLOCKS, SWCompress * icomp = 0); diff --git a/include/zverse4.h b/include/zverse4.h new file mode 100644 index 0000000..f7fbdaa --- /dev/null +++ b/include/zverse4.h @@ -0,0 +1,77 @@ +/****************************************************************************** + * + * zverse4.h - code for class 'zVerse4'- a module that reads raw text + * files: ot and nt using indexs ??.bks ??.cps ??.vss + * and provides lookup and parsing functions based on + * class VerseKey + * + * $Id: zverse4.h 3141 2014-03-19 01:24:04Z chrislit $ + * + * Copyright 2000-2014 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. + * + */ + + +#ifndef ZVERSE4_H +#define ZVERSE4_H + +#include <defs.h> + +SWORD_NAMESPACE_START + +class FileDesc; +class SWCompress; +class SWBuf; + +class SWDLLEXPORT zVerse4 { + SWCompress *compressor; + +protected: + static int instance; // number of instantiated zVerse4 objects or derivitives + + FileDesc *idxfp[2]; + FileDesc *textfp[2]; + FileDesc *compfp[2]; + char *path; + void doSetText(char testmt, long idxoff, const char *buf, long len = 0); + void doLinkEntry(char testmt, long destidxoff, long srcidxoff); + void flushCache() const; + mutable char *cacheBuf; + mutable unsigned int cacheBufSize; + mutable char cacheTestament; + mutable long cacheBufIdx; + mutable bool dirtyCache; + +public: + +#define VERSEBLOCKS 2 +#define CHAPTERBLOCKS 3 +#define BOOKBLOCKS 4 + + static const char uniqueIndexID[]; + + + // fileMode default = RDONLY + zVerse4(const char *ipath, int fileMode = -1, int blockType = CHAPTERBLOCKS, SWCompress * icomp = 0); + virtual ~zVerse4(); + + void findOffset(char testmt, long idxoff, long *start, unsigned long *size, unsigned long *buffnum) const; + void zReadText(char testmt, long start, unsigned long size, unsigned long buffnum, SWBuf &buf) const; + virtual void rawZFilter(SWBuf &buf, char direction = 0) const { (void) buf; (void) direction; } + static char createModule(const char *path, int blockBound, const char *v11n = "KJV"); +}; + +SWORD_NAMESPACE_END +#endif diff --git a/lib/Makefile.in b/lib/Makefile.in index dbc388d..cf70588 100644 --- a/lib/Makefile.in +++ b/lib/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. @@ -96,11 +96,13 @@ DIST_COMMON = $(srcdir)/../src/keys/Makefile.am \ $(srcdir)/../src/modules/texts/rawtext/Makefile.am \ $(srcdir)/../src/modules/texts/rawtext4/Makefile.am \ $(srcdir)/../src/modules/texts/ztext/Makefile.am \ + $(srcdir)/../src/modules/texts/ztext4/Makefile.am \ $(srcdir)/../src/modules/comments/Makefile.am \ $(srcdir)/../src/modules/comments/rawcom/Makefile.am \ $(srcdir)/../src/modules/comments/rawcom4/Makefile.am \ $(srcdir)/../src/modules/comments/rawfiles/Makefile.am \ $(srcdir)/../src/modules/comments/zcom/Makefile.am \ + $(srcdir)/../src/modules/comments/zcom4/Makefile.am \ $(srcdir)/../src/modules/comments/hrefcom/Makefile.am \ $(srcdir)/../src/modules/lexdict/Makefile.am \ $(srcdir)/../src/modules/lexdict/rawld/Makefile.am \ @@ -110,7 +112,11 @@ DIST_COMMON = $(srcdir)/../src/keys/Makefile.am \ $(srcdir)/Makefile.am $(top_srcdir)/depcomp \ $(am__pkginclude_HEADERS_DIST) README @HAVE_VSNPRINTF_FALSE@am__append_2 = -DNO_VSNPRINTF -@USE_INTERNAL_REGEX_TRUE@am__append_3 = $(swincludedir)/internal/regex/regex.h +@WITHGAPI_TRUE@am__append_3 = $(mgrdir)/rtranspgdrive.cpp +@HAVE_LIBZ_TRUE@am__append_4 = $(commondir)/zipcomprs.cpp +@HAVE_BZIP2_TRUE@am__append_5 = $(commondir)/bz2comprs.cpp +@HAVE_XZ_TRUE@am__append_6 = $(commondir)/xzcomprs.cpp +@USE_INTERNAL_REGEX_TRUE@am__append_7 = $(swincludedir)/internal/regex/regex.h subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ @@ -164,28 +170,30 @@ am__libsword_la_SOURCES_DIST = $(keysdir)/swkey.cpp \ $(utilfunsdir)/url.cpp $(utilfunsdir)/zlib/untgz.c \ $(utilfunsdir)/ftplib.c $(utilfunsdir)/regex.c \ $(utilfunsdir)/roman.cpp $(mgrdir)/ftplibftpt.cpp \ - $(mgrdir)/curlftpt.cpp $(mgrdir)/curlhttpt.cpp \ - $(mgrdir)/swconfig.cpp $(mgrdir)/swmgr.cpp \ - $(mgrdir)/swfiltermgr.cpp $(mgrdir)/encfiltmgr.cpp \ - $(mgrdir)/markupfiltmgr.cpp $(mgrdir)/filemgr.cpp \ - $(mgrdir)/versificationmgr.cpp $(mgrdir)/remotetrans.cpp \ - $(mgrdir)/swlocale.cpp $(mgrdir)/localemgr.cpp \ - $(mgrdir)/swcacher.cpp $(mgrdir)/swsearchable.cpp \ - $(mgrdir)/installmgr.cpp $(mgrdir)/stringmgr.cpp \ - $(frontenddir)/swdisp.cpp $(frontenddir)/swlog.cpp \ - $(modulesdir)/swmodule.cpp $(commondir)/rawstr.cpp \ - $(commondir)/rawstr4.cpp $(commondir)/swcomprs.cpp \ - $(commondir)/lzsscomprs.cpp $(commondir)/zipcomprs.cpp \ - $(commondir)/bz2comprs.cpp $(commondir)/xzcomprs.cpp \ - $(commondir)/rawverse.cpp $(commondir)/rawverse4.cpp \ - $(commondir)/swcipher.cpp $(commondir)/zverse.cpp \ + $(mgrdir)/rtranspgdrive.cpp $(mgrdir)/curlftpt.cpp \ + $(mgrdir)/curlhttpt.cpp $(mgrdir)/swconfig.cpp \ + $(mgrdir)/swmgr.cpp $(mgrdir)/swfiltermgr.cpp \ + $(mgrdir)/encfiltmgr.cpp $(mgrdir)/markupfiltmgr.cpp \ + $(mgrdir)/filemgr.cpp $(mgrdir)/versificationmgr.cpp \ + $(mgrdir)/remotetrans.cpp $(mgrdir)/swlocale.cpp \ + $(mgrdir)/localemgr.cpp $(mgrdir)/swcacher.cpp \ + $(mgrdir)/swsearchable.cpp $(mgrdir)/installmgr.cpp \ + $(mgrdir)/stringmgr.cpp $(frontenddir)/swdisp.cpp \ + $(frontenddir)/swlog.cpp $(modulesdir)/swmodule.cpp \ + $(commondir)/rawstr.cpp $(commondir)/rawstr4.cpp \ + $(commondir)/swcomprs.cpp $(commondir)/lzsscomprs.cpp \ + $(commondir)/zipcomprs.cpp $(commondir)/bz2comprs.cpp \ + $(commondir)/xzcomprs.cpp $(commondir)/rawverse.cpp \ + $(commondir)/rawverse4.cpp $(commondir)/swcipher.cpp \ + $(commondir)/zverse.cpp $(commondir)/zverse4.cpp \ $(commondir)/zstr.cpp $(commondir)/entriesblk.cpp \ $(commondir)/sapphire.cpp $(filtersdir)/swbasicfilter.cpp \ $(filtersdir)/swoptfilter.cpp $(filtersdir)/latin1utf8.cpp \ $(filtersdir)/latin1utf16.cpp $(filtersdir)/utf8utf16.cpp \ $(filtersdir)/utf16utf8.cpp $(filtersdir)/utf8html.cpp \ $(filtersdir)/utf8latin1.cpp $(filtersdir)/unicodertf.cpp \ - $(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8cantillation.cpp \ + $(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8scsu.cpp \ + $(filtersdir)/utf8cantillation.cpp \ $(filtersdir)/utf8hebrewpoints.cpp \ $(filtersdir)/utf8arabicpoints.cpp \ $(filtersdir)/utf8greekaccents.cpp $(filtersdir)/cipherfil.cpp \ @@ -203,82 +211,93 @@ am__libsword_la_SOURCES_DIST = $(keysdir)/swkey.cpp \ $(filtersdir)/osismorphsegmentation.cpp \ $(filtersdir)/osisglosses.cpp $(filtersdir)/osisenum.cpp \ $(filtersdir)/osisxlit.cpp \ - $(filtersdir)/osisreferencelinks.cpp $(filtersdir)/gbfhtml.cpp \ + $(filtersdir)/osisreferencelinks.cpp \ + $(filtersdir)/osislatex.cpp $(filtersdir)/gbfhtml.cpp \ $(filtersdir)/gbfhtmlhref.cpp $(filtersdir)/gbfxhtml.cpp \ $(filtersdir)/gbfwebif.cpp $(filtersdir)/gbfplain.cpp \ $(filtersdir)/gbfrtf.cpp $(filtersdir)/gbfstrongs.cpp \ $(filtersdir)/gbffootnotes.cpp $(filtersdir)/gbfheadings.cpp \ $(filtersdir)/gbfredletterwords.cpp $(filtersdir)/gbfmorph.cpp \ - $(filtersdir)/gbfwordjs.cpp $(filtersdir)/thmlstrongs.cpp \ - $(filtersdir)/thmlfootnotes.cpp $(filtersdir)/thmlheadings.cpp \ - $(filtersdir)/thmlmorph.cpp $(filtersdir)/thmllemma.cpp \ - $(filtersdir)/thmlscripref.cpp $(filtersdir)/thmlvariants.cpp \ - $(filtersdir)/thmlgbf.cpp $(filtersdir)/thmlrtf.cpp \ - $(filtersdir)/thmlhtml.cpp $(filtersdir)/thmlhtmlhref.cpp \ - $(filtersdir)/thmlxhtml.cpp $(filtersdir)/thmlwebif.cpp \ - $(filtersdir)/thmlwordjs.cpp $(filtersdir)/gbfthml.cpp \ + $(filtersdir)/gbfwordjs.cpp $(filtersdir)/gbflatex.cpp \ + $(filtersdir)/thmlstrongs.cpp $(filtersdir)/thmlfootnotes.cpp \ + $(filtersdir)/thmlheadings.cpp $(filtersdir)/thmlmorph.cpp \ + $(filtersdir)/thmllemma.cpp $(filtersdir)/thmlscripref.cpp \ + $(filtersdir)/thmlvariants.cpp $(filtersdir)/thmlgbf.cpp \ + $(filtersdir)/thmlrtf.cpp $(filtersdir)/thmlhtml.cpp \ + $(filtersdir)/thmlhtmlhref.cpp $(filtersdir)/thmlxhtml.cpp \ + $(filtersdir)/thmlwebif.cpp $(filtersdir)/thmlwordjs.cpp \ + $(filtersdir)/thmllatex.cpp $(filtersdir)/gbfthml.cpp \ $(filtersdir)/gbfosis.cpp $(filtersdir)/thmlosis.cpp \ $(filtersdir)/thmlplain.cpp $(filtersdir)/osisosis.cpp \ $(filtersdir)/rtfhtml.cpp $(filtersdir)/greeklexattribs.cpp \ $(filtersdir)/papyriplain.cpp $(filtersdir)/teiplain.cpp \ $(filtersdir)/teirtf.cpp $(filtersdir)/teihtmlhref.cpp \ - $(filtersdir)/teixhtml.cpp $(genbookdir)/swgenbook.cpp \ - $(rawgenbookdir)/rawgenbook.cpp $(textsdir)/swtext.cpp \ - $(rawtextdir)/rawtext.cpp $(rawtext4dir)/rawtext4.cpp \ - $(ztextdir)/ztext.cpp $(commentsdir)/swcom.cpp \ + $(filtersdir)/teixhtml.cpp $(filtersdir)/teilatex.cpp \ + $(genbookdir)/swgenbook.cpp $(rawgenbookdir)/rawgenbook.cpp \ + $(textsdir)/swtext.cpp $(rawtextdir)/rawtext.cpp \ + $(rawtext4dir)/rawtext4.cpp $(ztextdir)/ztext.cpp \ + $(ztext4dir)/ztext4.cpp $(commentsdir)/swcom.cpp \ $(rawcomdir)/rawcom.cpp $(rawcom4dir)/rawcom4.cpp \ $(rawfilesdir)/rawfiles.cpp $(zcomdir)/zcom.cpp \ - $(hrefcomdir)/hrefcom.cpp $(lexdictdir)/swld.cpp \ - $(rawlddir)/rawld.cpp $(rawld4dir)/rawld4.cpp \ - $(zlddir)/zld.cpp $(bindingsdir)/flatapi.cpp + $(zcom4dir)/zcom4.cpp $(hrefcomdir)/hrefcom.cpp \ + $(lexdictdir)/swld.cpp $(rawlddir)/rawld.cpp \ + $(rawld4dir)/rawld4.cpp $(zlddir)/zld.cpp \ + $(bindingsdir)/flatapi.cpp @HAVE_LIBZ_TRUE@am__objects_1 = untgz.lo @INTERNALFTPLIB_TRUE@am__objects_2 = ftplib.lo @USE_INTERNAL_REGEX_TRUE@am__objects_3 = regex.lo -@WITHCURL_FALSE@am__objects_4 = ftplibftpt.lo -@WITHCURL_TRUE@am__objects_4 = curlftpt.lo curlhttpt.lo -@HAVE_LIBZ_TRUE@am__objects_5 = zipcomprs.lo bz2comprs.lo xzcomprs.lo -am__objects_6 = utf8transliterator.lo utf8nfc.lo utf8nfkd.lo \ +@WITHGAPI_TRUE@am__objects_4 = rtranspgdrive.lo +@WITHCURL_FALSE@am__objects_5 = ftplibftpt.lo $(am__objects_4) +@WITHCURL_TRUE@am__objects_5 = curlftpt.lo curlhttpt.lo \ +@WITHCURL_TRUE@ $(am__objects_4) +@HAVE_LIBZ_TRUE@am__objects_6 = zipcomprs.lo +@HAVE_BZIP2_TRUE@am__objects_7 = bz2comprs.lo +@HAVE_XZ_TRUE@am__objects_8 = xzcomprs.lo +am__objects_9 = utf8transliterator.lo utf8nfc.lo utf8nfkd.lo \ utf8arshaping.lo utf8bidireorder.lo -@HAVE_ICUSWORD_TRUE@@HAVE_ICU_FALSE@am__objects_7 = $(am__objects_6) -@HAVE_ICU_TRUE@am__objects_7 = $(am__objects_6) -am__objects_8 = osisheadings.lo osisfootnotes.lo osishtmlhref.lo \ +@HAVE_ICUSWORD_TRUE@@HAVE_ICU_FALSE@am__objects_10 = $(am__objects_9) +@HAVE_ICU_TRUE@am__objects_10 = $(am__objects_9) +am__objects_11 = osisheadings.lo osisfootnotes.lo osishtmlhref.lo \ osisxhtml.lo osiswebif.lo osismorph.lo osisstrongs.lo \ osisplain.lo osisrtf.lo osislemma.lo osisredletterwords.lo \ osisscripref.lo osisvariants.lo osiswordjs.lo \ osismorphsegmentation.lo osisglosses.lo osisenum.lo \ - osisxlit.lo osisreferencelinks.lo -am__objects_9 = gbfhtml.lo gbfhtmlhref.lo gbfxhtml.lo gbfwebif.lo \ + osisxlit.lo osisreferencelinks.lo osislatex.lo +am__objects_12 = gbfhtml.lo gbfhtmlhref.lo gbfxhtml.lo gbfwebif.lo \ gbfplain.lo gbfrtf.lo gbfstrongs.lo gbffootnotes.lo \ - gbfheadings.lo gbfredletterwords.lo gbfmorph.lo gbfwordjs.lo -am__objects_10 = thmlstrongs.lo thmlfootnotes.lo thmlheadings.lo \ + gbfheadings.lo gbfredletterwords.lo gbfmorph.lo gbfwordjs.lo \ + gbflatex.lo +am__objects_13 = thmlstrongs.lo thmlfootnotes.lo thmlheadings.lo \ thmlmorph.lo thmllemma.lo thmlscripref.lo thmlvariants.lo \ thmlgbf.lo thmlrtf.lo thmlhtml.lo thmlhtmlhref.lo thmlxhtml.lo \ - thmlwebif.lo thmlwordjs.lo -am__objects_11 = gbfthml.lo gbfosis.lo thmlosis.lo thmlplain.lo \ + thmlwebif.lo thmlwordjs.lo thmllatex.lo +am__objects_14 = gbfthml.lo gbfosis.lo thmlosis.lo thmlplain.lo \ osisosis.lo -am__objects_12 = rtfhtml.lo greeklexattribs.lo papyriplain.lo -am__objects_13 = teiplain.lo teirtf.lo teihtmlhref.lo teixhtml.lo +am__objects_15 = rtfhtml.lo greeklexattribs.lo papyriplain.lo +am__objects_16 = teiplain.lo teirtf.lo teihtmlhref.lo teixhtml.lo \ + teilatex.lo am_libsword_la_OBJECTS = swkey.lo listkey.lo strkey.lo treekey.lo \ treekeyidx.lo versekey.lo versetreekey.lo swobject.lo \ utilstr.lo utilxml.lo swversion.lo swbuf.lo ftpparse.lo url.lo \ $(am__objects_1) $(am__objects_2) $(am__objects_3) roman.lo \ - $(am__objects_4) swconfig.lo swmgr.lo swfiltermgr.lo \ + $(am__objects_5) swconfig.lo swmgr.lo swfiltermgr.lo \ encfiltmgr.lo markupfiltmgr.lo filemgr.lo versificationmgr.lo \ remotetrans.lo swlocale.lo localemgr.lo swcacher.lo \ swsearchable.lo installmgr.lo stringmgr.lo swdisp.lo swlog.lo \ swmodule.lo rawstr.lo rawstr4.lo swcomprs.lo lzsscomprs.lo \ - $(am__objects_5) rawverse.lo rawverse4.lo swcipher.lo \ - zverse.lo zstr.lo entriesblk.lo sapphire.lo swbasicfilter.lo \ - swoptfilter.lo latin1utf8.lo latin1utf16.lo utf8utf16.lo \ - utf16utf8.lo utf8html.lo utf8latin1.lo unicodertf.lo \ - scsuutf8.lo utf8cantillation.lo utf8hebrewpoints.lo \ + $(am__objects_6) $(am__objects_7) $(am__objects_8) rawverse.lo \ + rawverse4.lo swcipher.lo zverse.lo zverse4.lo zstr.lo \ + entriesblk.lo sapphire.lo swbasicfilter.lo swoptfilter.lo \ + latin1utf8.lo latin1utf16.lo utf8utf16.lo utf16utf8.lo \ + utf8html.lo utf8latin1.lo unicodertf.lo scsuutf8.lo \ + utf8scsu.lo utf8cantillation.lo utf8hebrewpoints.lo \ utf8arabicpoints.lo utf8greekaccents.lo cipherfil.lo \ - $(am__objects_7) $(am__objects_8) $(am__objects_9) \ $(am__objects_10) $(am__objects_11) $(am__objects_12) \ - $(am__objects_13) swgenbook.lo rawgenbook.lo swtext.lo \ - rawtext.lo rawtext4.lo ztext.lo swcom.lo rawcom.lo rawcom4.lo \ - rawfiles.lo zcom.lo hrefcom.lo swld.lo rawld.lo rawld4.lo \ - zld.lo flatapi.lo + $(am__objects_13) $(am__objects_14) $(am__objects_15) \ + $(am__objects_16) swgenbook.lo rawgenbook.lo swtext.lo \ + rawtext.lo rawtext4.lo ztext.lo ztext4.lo swcom.lo rawcom.lo \ + rawcom4.lo rawfiles.lo zcom.lo zcom4.lo hrefcom.lo swld.lo \ + rawld.lo rawld4.lo zld.lo flatapi.lo libsword_la_OBJECTS = $(am_libsword_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -354,14 +373,15 @@ am__pkginclude_HEADERS_DIST = $(swincludedir)/canon.h \ $(swincludedir)/femain.h $(swincludedir)/filemgr.h \ $(swincludedir)/versificationmgr.h $(swincludedir)/flatapi.h \ $(swincludedir)/ftpparse.h $(swincludedir)/remotetrans.h \ - $(swincludedir)/ftplibftpt.h $(swincludedir)/ftplib.h \ - $(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h \ - $(swincludedir)/gbfhtml.h $(swincludedir)/gbfxhtml.h \ - $(swincludedir)/gbfhtmlhref.h $(swincludedir)/gbfwebif.h \ - $(swincludedir)/gbfmorph.h $(swincludedir)/gbfosis.h \ - $(swincludedir)/gbfplain.h $(swincludedir)/gbfredletterwords.h \ - $(swincludedir)/gbfrtf.h $(swincludedir)/gbfstrongs.h \ - $(swincludedir)/gbfwordjs.h $(swincludedir)/gbfthml.h \ + $(swincludedir)/rtranspgdrive.h $(swincludedir)/ftplibftpt.h \ + $(swincludedir)/ftplib.h $(swincludedir)/gbffootnotes.h \ + $(swincludedir)/gbfheadings.h $(swincludedir)/gbfhtml.h \ + $(swincludedir)/gbfxhtml.h $(swincludedir)/gbfhtmlhref.h \ + $(swincludedir)/gbfwebif.h $(swincludedir)/gbfmorph.h \ + $(swincludedir)/gbfosis.h $(swincludedir)/gbfplain.h \ + $(swincludedir)/gbfredletterwords.h $(swincludedir)/gbfrtf.h \ + $(swincludedir)/gbfstrongs.h $(swincludedir)/gbfwordjs.h \ + $(swincludedir)/gbfthml.h $(swincludedir)/gbflatex.h \ $(swincludedir)/greeklexattribs.h $(swincludedir)/hebrewmcim.h \ $(swincludedir)/hrefcom.h $(swincludedir)/installmgr.h \ $(swincludedir)/latin1utf16.h $(swincludedir)/latin1utf8.h \ @@ -380,13 +400,13 @@ am__pkginclude_HEADERS_DIST = $(swincludedir)/canon.h \ $(swincludedir)/osisreferencelinks.h \ $(swincludedir)/osisscripref.h $(swincludedir)/osiswordjs.h \ $(swincludedir)/osisvariants.h $(swincludedir)/osisxlit.h \ - $(swincludedir)/papyriplain.h $(swincludedir)/rawcom.h \ - $(swincludedir)/rawcom4.h $(swincludedir)/rawfiles.h \ - $(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h \ - $(swincludedir)/rawld4.h $(swincludedir)/rawstr.h \ - $(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \ - $(swincludedir)/rawtext4.h $(swincludedir)/rawverse.h \ - $(swincludedir)/rawverse4.h \ + $(swincludedir)/osislatex.h $(swincludedir)/papyriplain.h \ + $(swincludedir)/rawcom.h $(swincludedir)/rawcom4.h \ + $(swincludedir)/rawfiles.h $(swincludedir)/rawgenbook.h \ + $(swincludedir)/rawld.h $(swincludedir)/rawld4.h \ + $(swincludedir)/rawstr.h $(swincludedir)/rawstr4.h \ + $(swincludedir)/rawtext.h $(swincludedir)/rawtext4.h \ + $(swincludedir)/rawverse.h $(swincludedir)/rawverse4.h \ $(swincludedir)/internal/regex/regex.h $(swincludedir)/roman.h \ $(swincludedir)/rtfhtml.h $(swincludedir)/sapphire.h \ $(swincludedir)/scsuutf8.h $(swincludedir)/strkey.h \ @@ -411,8 +431,9 @@ am__pkginclude_HEADERS_DIST = $(swincludedir)/canon.h \ $(swincludedir)/thmlplain.h $(swincludedir)/thmlrtf.h \ $(swincludedir)/thmlscripref.h $(swincludedir)/thmlstrongs.h \ $(swincludedir)/thmlvariants.h $(swincludedir)/thmlwordjs.h \ - $(swincludedir)/teiplain.h $(swincludedir)/teirtf.h \ - $(swincludedir)/teixhtml.h $(swincludedir)/teihtmlhref.h \ + $(swincludedir)/thmllatex.h $(swincludedir)/teiplain.h \ + $(swincludedir)/teirtf.h $(swincludedir)/teixhtml.h \ + $(swincludedir)/teihtmlhref.h $(swincludedir)/teilatex.h \ $(swincludedir)/treekey.h $(swincludedir)/treekeyidx.h \ $(swincludedir)/unicodertf.h $(swincludedir)/url.h \ $(swincludedir)/untgz.h $(swincludedir)/utf16utf8.h \ @@ -423,23 +444,27 @@ am__pkginclude_HEADERS_DIST = $(swincludedir)/canon.h \ $(swincludedir)/utf8hebrewpoints.h \ $(swincludedir)/utf8arabicpoints.h $(swincludedir)/utf8html.h \ $(swincludedir)/utf8latin1.h $(swincludedir)/utf8nfc.h \ - $(swincludedir)/utf8nfkd.h \ + $(swincludedir)/utf8nfkd.h $(swincludedir)/utf8scsu.h \ $(swincludedir)/utf8transliterator.h \ $(swincludedir)/utf8utf16.h $(swincludedir)/utilstr.h \ $(swincludedir)/utilxml.h $(swincludedir)/versekey.h \ $(swincludedir)/versetreekey.h $(swincludedir)/zcom.h \ - $(swincludedir)/zipcomprs.h $(swincludedir)/zld.h \ - $(swincludedir)/zstr.h $(swincludedir)/ztext.h \ - $(swincludedir)/zverse.h $(swincludedir)/canon_kjva.h \ - $(swincludedir)/canon_leningrad.h $(swincludedir)/canon_mt.h \ - $(swincludedir)/canon_nrsv.h $(swincludedir)/canon_nrsva.h \ - $(swincludedir)/canon_synodal.h \ + $(swincludedir)/zcom4.h $(swincludedir)/zipcomprs.h \ + $(swincludedir)/bz2comprs.h $(swincludedir)/xzcomprs.h \ + $(swincludedir)/zld.h $(swincludedir)/zstr.h \ + $(swincludedir)/ztext.h $(swincludedir)/ztext4.h \ + $(swincludedir)/zverse.h $(swincludedir)/zverse4.h \ + $(swincludedir)/canon_kjva.h $(swincludedir)/canon_leningrad.h \ + $(swincludedir)/canon_mt.h $(swincludedir)/canon_nrsv.h \ + $(swincludedir)/canon_nrsva.h $(swincludedir)/canon_synodal.h \ $(swincludedir)/canon_synodalprot.h \ $(swincludedir)/canon_vulg.h $(swincludedir)/canon_german.h \ $(swincludedir)/canon_luther.h \ $(swincludedir)/canon_catholic.h \ $(swincludedir)/canon_catholic2.h $(swincludedir)/canon_lxx.h \ - $(swincludedir)/canon_orthodox.h $(swincludedir)/canon_null.h + $(swincludedir)/canon_orthodox.h $(swincludedir)/canon_null.h \ + $(swincludedir)/canon_segond.h $(swincludedir)/canon_calvin.h \ + $(swincludedir)/canon_darbyfr.h HEADERS = $(pkginclude_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, @@ -614,9 +639,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 AM_CPPFLAGS = -I$(top_srcdir)/include $(am__append_1) -I$(includedir) \ @@ -644,16 +671,18 @@ libsword_la_SOURCES = $(keysdir)/swkey.cpp $(keysdir)/listkey.cpp \ $(frontenddir)/swdisp.cpp $(frontenddir)/swlog.cpp \ $(modulesdir)/swmodule.cpp $(commondir)/rawstr.cpp \ $(commondir)/rawstr4.cpp $(commondir)/swcomprs.cpp \ - $(commondir)/lzsscomprs.cpp $(SWZLIB) \ - $(commondir)/rawverse.cpp $(commondir)/rawverse4.cpp \ - $(commondir)/swcipher.cpp $(commondir)/zverse.cpp \ + $(commondir)/lzsscomprs.cpp $(am__append_4) $(am__append_5) \ + $(am__append_6) $(commondir)/rawverse.cpp \ + $(commondir)/rawverse4.cpp $(commondir)/swcipher.cpp \ + $(commondir)/zverse.cpp $(commondir)/zverse4.cpp \ $(commondir)/zstr.cpp $(commondir)/entriesblk.cpp \ $(commondir)/sapphire.cpp $(filtersdir)/swbasicfilter.cpp \ $(filtersdir)/swoptfilter.cpp $(filtersdir)/latin1utf8.cpp \ $(filtersdir)/latin1utf16.cpp $(filtersdir)/utf8utf16.cpp \ $(filtersdir)/utf16utf8.cpp $(filtersdir)/utf8html.cpp \ $(filtersdir)/utf8latin1.cpp $(filtersdir)/unicodertf.cpp \ - $(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8cantillation.cpp \ + $(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8scsu.cpp \ + $(filtersdir)/utf8cantillation.cpp \ $(filtersdir)/utf8hebrewpoints.cpp \ $(filtersdir)/utf8arabicpoints.cpp \ $(filtersdir)/utf8greekaccents.cpp $(filtersdir)/cipherfil.cpp \ @@ -661,9 +690,10 @@ libsword_la_SOURCES = $(keysdir)/swkey.cpp $(keysdir)/listkey.cpp \ $(PLFIL) $(TEIFIL) $(genbookdir)/swgenbook.cpp \ $(rawgenbookdir)/rawgenbook.cpp $(textsdir)/swtext.cpp \ $(rawtextdir)/rawtext.cpp $(rawtext4dir)/rawtext4.cpp \ - $(ztextdir)/ztext.cpp $(commentsdir)/swcom.cpp \ - $(rawcomdir)/rawcom.cpp $(rawcom4dir)/rawcom4.cpp \ - $(rawfilesdir)/rawfiles.cpp $(zcomdir)/zcom.cpp \ + $(ztextdir)/ztext.cpp $(ztext4dir)/ztext4.cpp \ + $(commentsdir)/swcom.cpp $(rawcomdir)/rawcom.cpp \ + $(rawcom4dir)/rawcom4.cpp $(rawfilesdir)/rawfiles.cpp \ + $(zcomdir)/zcom.cpp $(zcom4dir)/zcom4.cpp \ $(hrefcomdir)/hrefcom.cpp $(lexdictdir)/swld.cpp \ $(rawlddir)/rawld.cpp $(rawld4dir)/rawld4.cpp \ $(zlddir)/zld.cpp $(bindingsdir)/flatapi.cpp @@ -681,16 +711,12 @@ utilfunsdir = $(top_srcdir)/src/utilfuns mgrdir = $(top_srcdir)/src/mgr @CONFDEF_FALSE@globdef = @CONFDEF_TRUE@globdef = -DGLOBCONFPATH=\"${globalconfdir}/sword.conf\" -@WITHCURL_FALSE@FTP_SOURCES = $(mgrdir)/ftplibftpt.cpp +@WITHCURL_FALSE@FTP_SOURCES = $(mgrdir)/ftplibftpt.cpp $(am__append_3) @WITHCURL_TRUE@FTP_SOURCES = $(mgrdir)/curlftpt.cpp \ -@WITHCURL_TRUE@ $(mgrdir)/curlhttpt.cpp +@WITHCURL_TRUE@ $(mgrdir)/curlhttpt.cpp $(am__append_3) frontenddir = $(top_srcdir)/src/frontend modulesdir = $(top_srcdir)/src/modules commondir = $(top_srcdir)/src/modules/common -@HAVE_LIBZ_FALSE@SWZLIB = -@HAVE_LIBZ_TRUE@SWZLIB = $(commondir)/zipcomprs.cpp \ -@HAVE_LIBZ_TRUE@ $(commondir)/bz2comprs.cpp \ -@HAVE_LIBZ_TRUE@ $(commondir)/xzcomprs.cpp filtersdir = $(top_srcdir)/src/modules/filters GBFFIL = $(filtersdir)/gbfhtml.cpp $(filtersdir)/gbfhtmlhref.cpp \ $(filtersdir)/gbfxhtml.cpp $(filtersdir)/gbfwebif.cpp \ @@ -698,7 +724,7 @@ GBFFIL = $(filtersdir)/gbfhtml.cpp $(filtersdir)/gbfhtmlhref.cpp \ $(filtersdir)/gbfstrongs.cpp $(filtersdir)/gbffootnotes.cpp \ $(filtersdir)/gbfheadings.cpp \ $(filtersdir)/gbfredletterwords.cpp $(filtersdir)/gbfmorph.cpp \ - $(filtersdir)/gbfwordjs.cpp + $(filtersdir)/gbfwordjs.cpp $(filtersdir)/gbflatex.cpp THMLFIL = $(filtersdir)/thmlstrongs.cpp \ $(filtersdir)/thmlfootnotes.cpp $(filtersdir)/thmlheadings.cpp \ $(filtersdir)/thmlmorph.cpp $(filtersdir)/thmllemma.cpp \ @@ -706,9 +732,10 @@ THMLFIL = $(filtersdir)/thmlstrongs.cpp \ $(filtersdir)/thmlgbf.cpp $(filtersdir)/thmlrtf.cpp \ $(filtersdir)/thmlhtml.cpp $(filtersdir)/thmlhtmlhref.cpp \ $(filtersdir)/thmlxhtml.cpp $(filtersdir)/thmlwebif.cpp \ - $(filtersdir)/thmlwordjs.cpp + $(filtersdir)/thmlwordjs.cpp $(filtersdir)/thmllatex.cpp TEIFIL = $(filtersdir)/teiplain.cpp $(filtersdir)/teirtf.cpp \ - $(filtersdir)/teihtmlhref.cpp $(filtersdir)/teixhtml.cpp + $(filtersdir)/teihtmlhref.cpp $(filtersdir)/teixhtml.cpp \ + $(filtersdir)/teilatex.cpp CONVFIL = $(filtersdir)/gbfthml.cpp $(filtersdir)/gbfosis.cpp \ $(filtersdir)/thmlosis.cpp $(filtersdir)/thmlplain.cpp \ $(filtersdir)/osisosis.cpp @@ -724,7 +751,8 @@ OSISFIL = $(filtersdir)/osisheadings.cpp \ $(filtersdir)/osismorphsegmentation.cpp \ $(filtersdir)/osisglosses.cpp $(filtersdir)/osisenum.cpp \ $(filtersdir)/osisxlit.cpp \ - $(filtersdir)/osisreferencelinks.cpp + $(filtersdir)/osisreferencelinks.cpp \ + $(filtersdir)/osislatex.cpp PLFIL = $(filtersdir)/rtfhtml.cpp $(filtersdir)/greeklexattribs.cpp \ $(filtersdir)/papyriplain.cpp SWICUSRC = $(filtersdir)/utf8transliterator.cpp \ @@ -744,11 +772,13 @@ textsdir = $(top_srcdir)/src/modules/texts rawtextdir = $(top_srcdir)/src/modules/texts/rawtext rawtext4dir = $(top_srcdir)/src/modules/texts/rawtext4 ztextdir = $(top_srcdir)/src/modules/texts/ztext +ztext4dir = $(top_srcdir)/src/modules/texts/ztext4 commentsdir = $(top_srcdir)/src/modules/comments rawcomdir = $(top_srcdir)/src/modules/comments/rawcom rawcom4dir = $(top_srcdir)/src/modules/comments/rawcom4 rawfilesdir = $(top_srcdir)/src/modules/comments/rawfiles zcomdir = $(top_srcdir)/src/modules/comments/zcom +zcom4dir = $(top_srcdir)/src/modules/comments/zcom4 hrefcomdir = $(top_srcdir)/src/modules/comments/hrefcom lexdictdir = $(top_srcdir)/src/modules/lexdict rawlddir = $(top_srcdir)/src/modules/lexdict/rawld @@ -766,14 +796,15 @@ pkginclude_HEADERS = $(swincludedir)/canon.h \ $(swincludedir)/femain.h $(swincludedir)/filemgr.h \ $(swincludedir)/versificationmgr.h $(swincludedir)/flatapi.h \ $(swincludedir)/ftpparse.h $(swincludedir)/remotetrans.h \ - $(swincludedir)/ftplibftpt.h $(swincludedir)/ftplib.h \ - $(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h \ - $(swincludedir)/gbfhtml.h $(swincludedir)/gbfxhtml.h \ - $(swincludedir)/gbfhtmlhref.h $(swincludedir)/gbfwebif.h \ - $(swincludedir)/gbfmorph.h $(swincludedir)/gbfosis.h \ - $(swincludedir)/gbfplain.h $(swincludedir)/gbfredletterwords.h \ - $(swincludedir)/gbfrtf.h $(swincludedir)/gbfstrongs.h \ - $(swincludedir)/gbfwordjs.h $(swincludedir)/gbfthml.h \ + $(swincludedir)/rtranspgdrive.h $(swincludedir)/ftplibftpt.h \ + $(swincludedir)/ftplib.h $(swincludedir)/gbffootnotes.h \ + $(swincludedir)/gbfheadings.h $(swincludedir)/gbfhtml.h \ + $(swincludedir)/gbfxhtml.h $(swincludedir)/gbfhtmlhref.h \ + $(swincludedir)/gbfwebif.h $(swincludedir)/gbfmorph.h \ + $(swincludedir)/gbfosis.h $(swincludedir)/gbfplain.h \ + $(swincludedir)/gbfredletterwords.h $(swincludedir)/gbfrtf.h \ + $(swincludedir)/gbfstrongs.h $(swincludedir)/gbfwordjs.h \ + $(swincludedir)/gbfthml.h $(swincludedir)/gbflatex.h \ $(swincludedir)/greeklexattribs.h $(swincludedir)/hebrewmcim.h \ $(swincludedir)/hrefcom.h $(swincludedir)/installmgr.h \ $(swincludedir)/latin1utf16.h $(swincludedir)/latin1utf8.h \ @@ -792,70 +823,76 @@ pkginclude_HEADERS = $(swincludedir)/canon.h \ $(swincludedir)/osisreferencelinks.h \ $(swincludedir)/osisscripref.h $(swincludedir)/osiswordjs.h \ $(swincludedir)/osisvariants.h $(swincludedir)/osisxlit.h \ - $(swincludedir)/papyriplain.h $(swincludedir)/rawcom.h \ - $(swincludedir)/rawcom4.h $(swincludedir)/rawfiles.h \ - $(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h \ - $(swincludedir)/rawld4.h $(swincludedir)/rawstr.h \ - $(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \ - $(swincludedir)/rawtext4.h $(swincludedir)/rawverse.h \ - $(swincludedir)/rawverse4.h $(am__append_3) \ - $(swincludedir)/roman.h $(swincludedir)/rtfhtml.h \ - $(swincludedir)/sapphire.h $(swincludedir)/scsuutf8.h \ - $(swincludedir)/strkey.h $(swincludedir)/swbasicfilter.h \ - $(swincludedir)/swbuf.h $(swincludedir)/swcacher.h \ - $(swincludedir)/swcipher.h $(swincludedir)/swcom.h \ - $(swincludedir)/swcomprs.h $(swincludedir)/swconfig.h \ - $(swincludedir)/swdisp.h $(swincludedir)/swfilter.h \ - $(swincludedir)/swfiltermgr.h $(swincludedir)/swgenbook.h \ - $(swincludedir)/swinputmeth.h $(swincludedir)/swkey.h \ - $(swincludedir)/swld.h $(swincludedir)/swlocale.h \ - $(swincludedir)/swlog.h $(swincludedir)/swmacs.h \ - $(swincludedir)/swmgr.h $(swincludedir)/stringmgr.h \ - $(swincludedir)/swmodule.h $(swincludedir)/swoptfilter.h \ - $(swincludedir)/swobject.h $(swincludedir)/swsearchable.h \ - $(swincludedir)/swtext.h $(swincludedir)/swversion.h \ - $(swincludedir)/sysdata.h $(swincludedir)/thmlfootnotes.h \ - $(swincludedir)/thmlgbf.h $(swincludedir)/thmlheadings.h \ - $(swincludedir)/thmlhtml.h $(swincludedir)/thmlxhtml.h \ - $(swincludedir)/thmlhtmlhref.h $(swincludedir)/thmlwebif.h \ - $(swincludedir)/thmllemma.h $(swincludedir)/thmlmorph.h \ - $(swincludedir)/thmlosis.h $(swincludedir)/thmlplain.h \ - $(swincludedir)/thmlrtf.h $(swincludedir)/thmlscripref.h \ - $(swincludedir)/thmlstrongs.h $(swincludedir)/thmlvariants.h \ - $(swincludedir)/thmlwordjs.h $(swincludedir)/teiplain.h \ + $(swincludedir)/osislatex.h $(swincludedir)/papyriplain.h \ + $(swincludedir)/rawcom.h $(swincludedir)/rawcom4.h \ + $(swincludedir)/rawfiles.h $(swincludedir)/rawgenbook.h \ + $(swincludedir)/rawld.h $(swincludedir)/rawld4.h \ + $(swincludedir)/rawstr.h $(swincludedir)/rawstr4.h \ + $(swincludedir)/rawtext.h $(swincludedir)/rawtext4.h \ + $(swincludedir)/rawverse.h $(swincludedir)/rawverse4.h \ + $(am__append_7) $(swincludedir)/roman.h \ + $(swincludedir)/rtfhtml.h $(swincludedir)/sapphire.h \ + $(swincludedir)/scsuutf8.h $(swincludedir)/strkey.h \ + $(swincludedir)/swbasicfilter.h $(swincludedir)/swbuf.h \ + $(swincludedir)/swcacher.h $(swincludedir)/swcipher.h \ + $(swincludedir)/swcom.h $(swincludedir)/swcomprs.h \ + $(swincludedir)/swconfig.h $(swincludedir)/swdisp.h \ + $(swincludedir)/swfilter.h $(swincludedir)/swfiltermgr.h \ + $(swincludedir)/swgenbook.h $(swincludedir)/swinputmeth.h \ + $(swincludedir)/swkey.h $(swincludedir)/swld.h \ + $(swincludedir)/swlocale.h $(swincludedir)/swlog.h \ + $(swincludedir)/swmacs.h $(swincludedir)/swmgr.h \ + $(swincludedir)/stringmgr.h $(swincludedir)/swmodule.h \ + $(swincludedir)/swoptfilter.h $(swincludedir)/swobject.h \ + $(swincludedir)/swsearchable.h $(swincludedir)/swtext.h \ + $(swincludedir)/swversion.h $(swincludedir)/sysdata.h \ + $(swincludedir)/thmlfootnotes.h $(swincludedir)/thmlgbf.h \ + $(swincludedir)/thmlheadings.h $(swincludedir)/thmlhtml.h \ + $(swincludedir)/thmlxhtml.h $(swincludedir)/thmlhtmlhref.h \ + $(swincludedir)/thmlwebif.h $(swincludedir)/thmllemma.h \ + $(swincludedir)/thmlmorph.h $(swincludedir)/thmlosis.h \ + $(swincludedir)/thmlplain.h $(swincludedir)/thmlrtf.h \ + $(swincludedir)/thmlscripref.h $(swincludedir)/thmlstrongs.h \ + $(swincludedir)/thmlvariants.h $(swincludedir)/thmlwordjs.h \ + $(swincludedir)/thmllatex.h $(swincludedir)/teiplain.h \ $(swincludedir)/teirtf.h $(swincludedir)/teixhtml.h \ - $(swincludedir)/teihtmlhref.h $(swincludedir)/treekey.h \ - $(swincludedir)/treekeyidx.h $(swincludedir)/unicodertf.h \ - $(swincludedir)/url.h $(swincludedir)/untgz.h \ - $(swincludedir)/utf16utf8.h $(swincludedir)/utf8arshaping.h \ + $(swincludedir)/teihtmlhref.h $(swincludedir)/teilatex.h \ + $(swincludedir)/treekey.h $(swincludedir)/treekeyidx.h \ + $(swincludedir)/unicodertf.h $(swincludedir)/url.h \ + $(swincludedir)/untgz.h $(swincludedir)/utf16utf8.h \ + $(swincludedir)/utf8arshaping.h \ $(swincludedir)/utf8bidireorder.h \ $(swincludedir)/utf8cantillation.h \ $(swincludedir)/utf8greekaccents.h \ $(swincludedir)/utf8hebrewpoints.h \ $(swincludedir)/utf8arabicpoints.h $(swincludedir)/utf8html.h \ $(swincludedir)/utf8latin1.h $(swincludedir)/utf8nfc.h \ - $(swincludedir)/utf8nfkd.h \ + $(swincludedir)/utf8nfkd.h $(swincludedir)/utf8scsu.h \ $(swincludedir)/utf8transliterator.h \ $(swincludedir)/utf8utf16.h $(swincludedir)/utilstr.h \ $(swincludedir)/utilxml.h $(swincludedir)/versekey.h \ $(swincludedir)/versetreekey.h $(swincludedir)/zcom.h \ - $(swincludedir)/zipcomprs.h $(swincludedir)/zld.h \ - $(swincludedir)/zstr.h $(swincludedir)/ztext.h \ - $(swincludedir)/zverse.h $(swincludedir)/canon_kjva.h \ - $(swincludedir)/canon_leningrad.h $(swincludedir)/canon_mt.h \ - $(swincludedir)/canon_nrsv.h $(swincludedir)/canon_nrsva.h \ - $(swincludedir)/canon_synodal.h \ + $(swincludedir)/zcom4.h $(swincludedir)/zipcomprs.h \ + $(swincludedir)/bz2comprs.h $(swincludedir)/xzcomprs.h \ + $(swincludedir)/zld.h $(swincludedir)/zstr.h \ + $(swincludedir)/ztext.h $(swincludedir)/ztext4.h \ + $(swincludedir)/zverse.h $(swincludedir)/zverse4.h \ + $(swincludedir)/canon_kjva.h $(swincludedir)/canon_leningrad.h \ + $(swincludedir)/canon_mt.h $(swincludedir)/canon_nrsv.h \ + $(swincludedir)/canon_nrsva.h $(swincludedir)/canon_synodal.h \ $(swincludedir)/canon_synodalprot.h \ $(swincludedir)/canon_vulg.h $(swincludedir)/canon_german.h \ $(swincludedir)/canon_luther.h \ $(swincludedir)/canon_catholic.h \ $(swincludedir)/canon_catholic2.h $(swincludedir)/canon_lxx.h \ - $(swincludedir)/canon_orthodox.h $(swincludedir)/canon_null.h + $(swincludedir)/canon_orthodox.h $(swincludedir)/canon_null.h \ + $(swincludedir)/canon_segond.h $(swincludedir)/canon_calvin.h \ + $(swincludedir)/canon_darbyfr.h all: all-am .SUFFIXES: .SUFFIXES: .c .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../src/keys/Makefile.am $(srcdir)/../src/utilfuns/Makefile.am $(srcdir)/../src/mgr/Makefile.am $(srcdir)/../src/frontend/Makefile.am $(srcdir)/../src/modules/Makefile.am $(srcdir)/../src/modules/common/Makefile.am $(srcdir)/../src/modules/filters/Makefile.am $(srcdir)/../src/modules/genbook/Makefile.am $(srcdir)/../src/modules/genbook/rawgenbook/Makefile.am $(srcdir)/../src/modules/texts/Makefile.am $(srcdir)/../src/modules/texts/rawtext/Makefile.am $(srcdir)/../src/modules/texts/rawtext4/Makefile.am $(srcdir)/../src/modules/texts/ztext/Makefile.am $(srcdir)/../src/modules/comments/Makefile.am $(srcdir)/../src/modules/comments/rawcom/Makefile.am $(srcdir)/../src/modules/comments/rawcom4/Makefile.am $(srcdir)/../src/modules/comments/rawfiles/Makefile.am $(srcdir)/../src/modules/comments/zcom/Makefile.am $(srcdir)/../src/modules/comments/hrefcom/Makefile.am $(srcdir)/../src/modules/lexdict/Makefile.am $(srcdir)/../src/modules/lexdict/rawld/Makefile.am $(srcdir)/../src/modules/lexdict/rawld4/Makefile.am $(srcdir)/../src/modules/lexdict/zld/Makefile.am $(srcdir)/../include/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../src/keys/Makefile.am $(srcdir)/../src/utilfuns/Makefile.am $(srcdir)/../src/mgr/Makefile.am $(srcdir)/../src/frontend/Makefile.am $(srcdir)/../src/modules/Makefile.am $(srcdir)/../src/modules/common/Makefile.am $(srcdir)/../src/modules/filters/Makefile.am $(srcdir)/../src/modules/genbook/Makefile.am $(srcdir)/../src/modules/genbook/rawgenbook/Makefile.am $(srcdir)/../src/modules/texts/Makefile.am $(srcdir)/../src/modules/texts/rawtext/Makefile.am $(srcdir)/../src/modules/texts/rawtext4/Makefile.am $(srcdir)/../src/modules/texts/ztext/Makefile.am $(srcdir)/../src/modules/texts/ztext4/Makefile.am $(srcdir)/../src/modules/comments/Makefile.am $(srcdir)/../src/modules/comments/rawcom/Makefile.am $(srcdir)/../src/modules/comments/rawcom4/Makefile.am $(srcdir)/../src/modules/comments/rawfiles/Makefile.am $(srcdir)/../src/modules/comments/zcom/Makefile.am $(srcdir)/../src/modules/comments/zcom4/Makefile.am $(srcdir)/../src/modules/comments/hrefcom/Makefile.am $(srcdir)/../src/modules/lexdict/Makefile.am $(srcdir)/../src/modules/lexdict/rawld/Makefile.am $(srcdir)/../src/modules/lexdict/rawld4/Makefile.am $(srcdir)/../src/modules/lexdict/zld/Makefile.am $(srcdir)/../include/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -876,7 +913,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../src/keys/Makefile.am $(srcdir)/../src/utilfuns/Makefile.am $(srcdir)/../src/mgr/Makefile.am $(srcdir)/../src/frontend/Makefile.am $(srcdir)/../src/modules/Makefile.am $(srcdir)/../src/modules/common/Makefile.am $(srcdir)/../src/modules/filters/Makefile.am $(srcdir)/../src/modules/genbook/Makefile.am $(srcdir)/../src/modules/genbook/rawgenbook/Makefile.am $(srcdir)/../src/modules/texts/Makefile.am $(srcdir)/../src/modules/texts/rawtext/Makefile.am $(srcdir)/../src/modules/texts/rawtext4/Makefile.am $(srcdir)/../src/modules/texts/ztext/Makefile.am $(srcdir)/../src/modules/comments/Makefile.am $(srcdir)/../src/modules/comments/rawcom/Makefile.am $(srcdir)/../src/modules/comments/rawcom4/Makefile.am $(srcdir)/../src/modules/comments/rawfiles/Makefile.am $(srcdir)/../src/modules/comments/zcom/Makefile.am $(srcdir)/../src/modules/comments/hrefcom/Makefile.am $(srcdir)/../src/modules/lexdict/Makefile.am $(srcdir)/../src/modules/lexdict/rawld/Makefile.am $(srcdir)/../src/modules/lexdict/rawld4/Makefile.am $(srcdir)/../src/modules/lexdict/zld/Makefile.am $(srcdir)/../include/Makefile.am: +$(srcdir)/../src/keys/Makefile.am $(srcdir)/../src/utilfuns/Makefile.am $(srcdir)/../src/mgr/Makefile.am $(srcdir)/../src/frontend/Makefile.am $(srcdir)/../src/modules/Makefile.am $(srcdir)/../src/modules/common/Makefile.am $(srcdir)/../src/modules/filters/Makefile.am $(srcdir)/../src/modules/genbook/Makefile.am $(srcdir)/../src/modules/genbook/rawgenbook/Makefile.am $(srcdir)/../src/modules/texts/Makefile.am $(srcdir)/../src/modules/texts/rawtext/Makefile.am $(srcdir)/../src/modules/texts/rawtext4/Makefile.am $(srcdir)/../src/modules/texts/ztext/Makefile.am $(srcdir)/../src/modules/texts/ztext4/Makefile.am $(srcdir)/../src/modules/comments/Makefile.am $(srcdir)/../src/modules/comments/rawcom/Makefile.am $(srcdir)/../src/modules/comments/rawcom4/Makefile.am $(srcdir)/../src/modules/comments/rawfiles/Makefile.am $(srcdir)/../src/modules/comments/zcom/Makefile.am $(srcdir)/../src/modules/comments/zcom4/Makefile.am $(srcdir)/../src/modules/comments/hrefcom/Makefile.am $(srcdir)/../src/modules/lexdict/Makefile.am $(srcdir)/../src/modules/lexdict/rawld/Makefile.am $(srcdir)/../src/modules/lexdict/rawld4/Makefile.am $(srcdir)/../src/modules/lexdict/zld/Makefile.am $(srcdir)/../include/Makefile.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -946,6 +983,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfheadings.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfhtml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfhtmlhref.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbflatex.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfmorph.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfosis.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfplain.Plo@am__quote@ @@ -970,6 +1008,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisglosses.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisheadings.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osishtmlhref.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osislatex.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osislemma.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osismorph.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osismorphsegmentation.Plo@am__quote@ @@ -1002,6 +1041,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remotetrans.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/roman.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtfhtml.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtranspgdrive.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sapphire.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsuutf8.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringmgr.Plo@am__quote@ @@ -1028,6 +1068,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swtext.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swversion.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teihtmlhref.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teilatex.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teiplain.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teirtf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teixhtml.Plo@am__quote@ @@ -1036,6 +1077,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlheadings.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlhtml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlhtmlhref.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmllatex.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmllemma.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlmorph.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlosis.Plo@am__quote@ @@ -1063,6 +1105,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8latin1.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8nfc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8nfkd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8scsu.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8transliterator.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8utf16.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilstr.Plo@am__quote@ @@ -1072,25 +1115,28 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versificationmgr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xzcomprs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zcom.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zcom4.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zipcomprs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zld.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zstr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztext4.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zverse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zverse4.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @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 $@ $< @@ -1253,6 +1299,13 @@ ftplibftpt.lo: $(mgrdir)/ftplibftpt.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftplibftpt.lo `test -f '$(mgrdir)/ftplibftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/ftplibftpt.cpp +rtranspgdrive.lo: $(mgrdir)/rtranspgdrive.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rtranspgdrive.lo -MD -MP -MF $(DEPDIR)/rtranspgdrive.Tpo -c -o rtranspgdrive.lo `test -f '$(mgrdir)/rtranspgdrive.cpp' || echo '$(srcdir)/'`$(mgrdir)/rtranspgdrive.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rtranspgdrive.Tpo $(DEPDIR)/rtranspgdrive.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/rtranspgdrive.cpp' object='rtranspgdrive.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rtranspgdrive.lo `test -f '$(mgrdir)/rtranspgdrive.cpp' || echo '$(srcdir)/'`$(mgrdir)/rtranspgdrive.cpp + curlftpt.lo: $(mgrdir)/curlftpt.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT curlftpt.lo -MD -MP -MF $(DEPDIR)/curlftpt.Tpo -c -o curlftpt.lo `test -f '$(mgrdir)/curlftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlftpt.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/curlftpt.Tpo $(DEPDIR)/curlftpt.Plo @@ -1463,6 +1516,13 @@ zverse.lo: $(commondir)/zverse.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zverse.lo `test -f '$(commondir)/zverse.cpp' || echo '$(srcdir)/'`$(commondir)/zverse.cpp +zverse4.lo: $(commondir)/zverse4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zverse4.lo -MD -MP -MF $(DEPDIR)/zverse4.Tpo -c -o zverse4.lo `test -f '$(commondir)/zverse4.cpp' || echo '$(srcdir)/'`$(commondir)/zverse4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zverse4.Tpo $(DEPDIR)/zverse4.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/zverse4.cpp' object='zverse4.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zverse4.lo `test -f '$(commondir)/zverse4.cpp' || echo '$(srcdir)/'`$(commondir)/zverse4.cpp + zstr.lo: $(commondir)/zstr.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zstr.lo -MD -MP -MF $(DEPDIR)/zstr.Tpo -c -o zstr.lo `test -f '$(commondir)/zstr.cpp' || echo '$(srcdir)/'`$(commondir)/zstr.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zstr.Tpo $(DEPDIR)/zstr.Plo @@ -1554,6 +1614,13 @@ scsuutf8.lo: $(filtersdir)/scsuutf8.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o scsuutf8.lo `test -f '$(filtersdir)/scsuutf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/scsuutf8.cpp +utf8scsu.lo: $(filtersdir)/utf8scsu.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8scsu.lo -MD -MP -MF $(DEPDIR)/utf8scsu.Tpo -c -o utf8scsu.lo `test -f '$(filtersdir)/utf8scsu.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8scsu.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8scsu.Tpo $(DEPDIR)/utf8scsu.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8scsu.cpp' object='utf8scsu.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8scsu.lo `test -f '$(filtersdir)/utf8scsu.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8scsu.cpp + utf8cantillation.lo: $(filtersdir)/utf8cantillation.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8cantillation.lo -MD -MP -MF $(DEPDIR)/utf8cantillation.Tpo -c -o utf8cantillation.lo `test -f '$(filtersdir)/utf8cantillation.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8cantillation.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8cantillation.Tpo $(DEPDIR)/utf8cantillation.Plo @@ -1757,6 +1824,13 @@ osisreferencelinks.lo: $(filtersdir)/osisreferencelinks.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisreferencelinks.lo `test -f '$(filtersdir)/osisreferencelinks.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisreferencelinks.cpp +osislatex.lo: $(filtersdir)/osislatex.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osislatex.lo -MD -MP -MF $(DEPDIR)/osislatex.Tpo -c -o osislatex.lo `test -f '$(filtersdir)/osislatex.cpp' || echo '$(srcdir)/'`$(filtersdir)/osislatex.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osislatex.Tpo $(DEPDIR)/osislatex.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osislatex.cpp' object='osislatex.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osislatex.lo `test -f '$(filtersdir)/osislatex.cpp' || echo '$(srcdir)/'`$(filtersdir)/osislatex.cpp + gbfhtml.lo: $(filtersdir)/gbfhtml.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfhtml.lo -MD -MP -MF $(DEPDIR)/gbfhtml.Tpo -c -o gbfhtml.lo `test -f '$(filtersdir)/gbfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtml.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfhtml.Tpo $(DEPDIR)/gbfhtml.Plo @@ -1841,6 +1915,13 @@ gbfwordjs.lo: $(filtersdir)/gbfwordjs.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfwordjs.lo `test -f '$(filtersdir)/gbfwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwordjs.cpp +gbflatex.lo: $(filtersdir)/gbflatex.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbflatex.lo -MD -MP -MF $(DEPDIR)/gbflatex.Tpo -c -o gbflatex.lo `test -f '$(filtersdir)/gbflatex.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbflatex.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbflatex.Tpo $(DEPDIR)/gbflatex.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbflatex.cpp' object='gbflatex.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbflatex.lo `test -f '$(filtersdir)/gbflatex.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbflatex.cpp + thmlstrongs.lo: $(filtersdir)/thmlstrongs.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlstrongs.lo -MD -MP -MF $(DEPDIR)/thmlstrongs.Tpo -c -o thmlstrongs.lo `test -f '$(filtersdir)/thmlstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlstrongs.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlstrongs.Tpo $(DEPDIR)/thmlstrongs.Plo @@ -1939,6 +2020,13 @@ thmlwordjs.lo: $(filtersdir)/thmlwordjs.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlwordjs.lo `test -f '$(filtersdir)/thmlwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwordjs.cpp +thmllatex.lo: $(filtersdir)/thmllatex.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmllatex.lo -MD -MP -MF $(DEPDIR)/thmllatex.Tpo -c -o thmllatex.lo `test -f '$(filtersdir)/thmllatex.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmllatex.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmllatex.Tpo $(DEPDIR)/thmllatex.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmllatex.cpp' object='thmllatex.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmllatex.lo `test -f '$(filtersdir)/thmllatex.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmllatex.cpp + gbfthml.lo: $(filtersdir)/gbfthml.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfthml.lo -MD -MP -MF $(DEPDIR)/gbfthml.Tpo -c -o gbfthml.lo `test -f '$(filtersdir)/gbfthml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfthml.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfthml.Tpo $(DEPDIR)/gbfthml.Plo @@ -2023,6 +2111,13 @@ teixhtml.lo: $(filtersdir)/teixhtml.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teixhtml.lo `test -f '$(filtersdir)/teixhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/teixhtml.cpp +teilatex.lo: $(filtersdir)/teilatex.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teilatex.lo -MD -MP -MF $(DEPDIR)/teilatex.Tpo -c -o teilatex.lo `test -f '$(filtersdir)/teilatex.cpp' || echo '$(srcdir)/'`$(filtersdir)/teilatex.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/teilatex.Tpo $(DEPDIR)/teilatex.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/teilatex.cpp' object='teilatex.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teilatex.lo `test -f '$(filtersdir)/teilatex.cpp' || echo '$(srcdir)/'`$(filtersdir)/teilatex.cpp + swgenbook.lo: $(genbookdir)/swgenbook.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swgenbook.lo -MD -MP -MF $(DEPDIR)/swgenbook.Tpo -c -o swgenbook.lo `test -f '$(genbookdir)/swgenbook.cpp' || echo '$(srcdir)/'`$(genbookdir)/swgenbook.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swgenbook.Tpo $(DEPDIR)/swgenbook.Plo @@ -2065,6 +2160,13 @@ ztext.lo: $(ztextdir)/ztext.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ztext.lo `test -f '$(ztextdir)/ztext.cpp' || echo '$(srcdir)/'`$(ztextdir)/ztext.cpp +ztext4.lo: $(ztext4dir)/ztext4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ztext4.lo -MD -MP -MF $(DEPDIR)/ztext4.Tpo -c -o ztext4.lo `test -f '$(ztext4dir)/ztext4.cpp' || echo '$(srcdir)/'`$(ztext4dir)/ztext4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ztext4.Tpo $(DEPDIR)/ztext4.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(ztext4dir)/ztext4.cpp' object='ztext4.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ztext4.lo `test -f '$(ztext4dir)/ztext4.cpp' || echo '$(srcdir)/'`$(ztext4dir)/ztext4.cpp + swcom.lo: $(commentsdir)/swcom.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcom.lo -MD -MP -MF $(DEPDIR)/swcom.Tpo -c -o swcom.lo `test -f '$(commentsdir)/swcom.cpp' || echo '$(srcdir)/'`$(commentsdir)/swcom.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swcom.Tpo $(DEPDIR)/swcom.Plo @@ -2100,6 +2202,13 @@ zcom.lo: $(zcomdir)/zcom.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zcom.lo `test -f '$(zcomdir)/zcom.cpp' || echo '$(srcdir)/'`$(zcomdir)/zcom.cpp +zcom4.lo: $(zcom4dir)/zcom4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zcom4.lo -MD -MP -MF $(DEPDIR)/zcom4.Tpo -c -o zcom4.lo `test -f '$(zcom4dir)/zcom4.cpp' || echo '$(srcdir)/'`$(zcom4dir)/zcom4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zcom4.Tpo $(DEPDIR)/zcom4.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(zcom4dir)/zcom4.cpp' object='zcom4.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zcom4.lo `test -f '$(zcom4dir)/zcom4.cpp' || echo '$(srcdir)/'`$(zcom4dir)/zcom4.cpp + hrefcom.lo: $(hrefcomdir)/hrefcom.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hrefcom.lo -MD -MP -MF $(DEPDIR)/hrefcom.Tpo -c -o hrefcom.lo `test -f '$(hrefcomdir)/hrefcom.cpp' || echo '$(srcdir)/'`$(hrefcomdir)/hrefcom.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hrefcom.Tpo $(DEPDIR)/hrefcom.Plo diff --git a/lib/bcppmake/libsword.bdsproj b/lib/bcppmake/libsword.bdsproj index 4f1abda..35366f7 100644 --- a/lib/bcppmake/libsword.bdsproj +++ b/lib/bcppmake/libsword.bdsproj @@ -1,689 +1,689 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppStaticLibrary</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{42E205EF-ACE1-43B1-B144-7CC5BFF5A26A}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="libsword.lib"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.Gn.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="UNICODE"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.4" value="USBINARY"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.6" value="USELUCENE"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.7" value="_WIN32"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.9" value="CURLAVAILABLE"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\..\src\modules\tests"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.10" value="..\..\src\modules\texts"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.11" value="..\..\src\modules\lexdict\rawld"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.12" value="..\..\src\modules\lexdict"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.13" value="..\..\src\modules\filters"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.14" value="..\..\src\modules\common"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.15" value="..\..\src\modules\comments\rawfiles"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.16" value="..\..\src\modules\comments\rawcom"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.17" value="..\..\src\modules\comments\hrefcom"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.18" value="..\..\src\modules\comments"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.19" value="..\..\src\modules"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="..\..\src\utilfuns\zlib"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.20" value="..\..\src\frontend"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.21" value="..\..\src\utilfuns"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.22" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.23" value="..\..\src\keys"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.24" value="..\..\..\icu-sword\source\common"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.26" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.27" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.28" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.29" value="..\..\..\icu-sword\source\i18n"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\src\modules\lexdict\zld"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.30" value="..\..\..\biblecs\clucene\src"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.32" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="..\..\src\modules\lexdict\rawld4"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="..\..\src\modules\comments\zcom"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="..\..\src\modules\genbook\rawgenbook"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="..\..\src\modules\genbook"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.8" value="..\..\src\modules\texts\ztext"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.9" value="..\..\src\modules\texts\rawtext"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tW.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="UNICODE"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.4" value="USBINARY"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.6" value="USELUCENE"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.7" value="_WIN32"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\..\src\modules\tests"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.10" value="..\..\src\modules\texts"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.11" value="..\..\src\modules\lexdict\rawld"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.12" value="..\..\src\modules\lexdict"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.13" value="..\..\src\modules\filters"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.14" value="..\..\src\modules\common"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.15" value="..\..\src\modules\comments\rawfiles"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.16" value="..\..\src\modules\comments\rawcom"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.17" value="..\..\src\modules\comments\hrefcom"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.18" value="..\..\src\modules\comments"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.19" value="..\..\src\modules"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value="..\..\src\utilfuns\zlib"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.20" value="..\..\src\frontend"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.21" value="..\..\src\utilfuns"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.22" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.23" value="..\..\src\keys"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.24" value="..\..\..\icu-sword\source\common"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.26" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.27" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.28" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.29" value="..\..\..\icu-sword\source\i18n"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\src\modules\lexdict\zld"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.30" value="..\..\..\biblecs\clucene\src"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.32" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="..\..\src\modules\lexdict\rawld4"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="..\..\src\modules\comments\zcom"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="..\..\src\modules\genbook\rawgenbook"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.7" value="..\..\src\modules\genbook"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.8" value="..\..\src\modules\texts\ztext"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.9" value="..\..\src\modules\texts\rawtext"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\..\src\frontend"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.10" value="..\..\src\modules\common"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.11" value="..\..\src\modules\filters"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.12" value="..\..\src\modules\genbook\rawgenbook"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.13" value="..\..\src\modules\genbook"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.14" value="..\..\src\modules\lexdict\rawld"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.15" value="..\..\src\modules\lexdict\rawld4"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.16" value="..\..\src\modules\lexdict\zld"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.17" value="..\..\src\modules\lexdict"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.18" value="..\..\src\modules\tests"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.19" value="..\..\src\modules\texts\rawtext"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.2" value="..\..\src\keys"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.20" value="..\..\src\modules\texts\ztext"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.21" value="..\..\src\modules\texts"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.22" value="..\..\src\modules"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.23" value="..\..\src\utilfuns\zlib"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.3" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.4" value="..\..\src\utilfuns"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.5" value="..\..\src\modules\comments\hrefcom"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.6" value="..\..\src\modules\comments\rawcom"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.7" value="..\..\src\modules\comments\rawfiles"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.8" value="..\..\src\modules\comments\zcom"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.9" value="..\..\src\modules\comments"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\..\src\frontend"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.10" value="..\..\src\modules\common"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.11" value="..\..\src\modules\filters"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.12" value="..\..\src\modules\genbook\rawgenbook"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.13" value="..\..\src\modules\genbook"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.14" value="..\..\src\modules\lexdict\rawld"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.15" value="..\..\src\modules\lexdict\rawld4"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.16" value="..\..\src\modules\lexdict\zld"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.17" value="..\..\src\modules\lexdict"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.18" value="..\..\src\modules\tests"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.19" value="..\..\src\modules\texts\rawtext"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.2" value="..\..\src\keys"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.20" value="..\..\src\modules\texts\ztext"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.21" value="..\..\src\modules\texts"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.22" value="..\..\src\modules"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.23" value="..\..\src\utilfuns\zlib"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.3" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.4" value="..\..\src\utilfuns"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.5" value="..\..\src\modules\comments\hrefcom"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.6" value="..\..\src\modules\comments\rawcom"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.7" value="..\..\src\modules\comments\rawfiles"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.8" value="..\..\src\modules\comments\zcom"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.9" value="..\..\src\modules\comments"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\..\src\frontend"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.10" value="..\..\src\modules\common"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.11" value="..\..\src\modules\filters"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.12" value="..\..\src\modules\genbook\rawgenbook"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.13" value="..\..\src\modules\genbook"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.14" value="..\..\src\modules\lexdict\rawld"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.15" value="..\..\src\modules\lexdict\rawld4"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.16" value="..\..\src\modules\lexdict\zld"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.17" value="..\..\src\modules\lexdict"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.18" value="..\..\src\modules\tests"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.19" value="..\..\src\modules\texts\rawtext"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.2" value="..\..\src\keys"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.20" value="..\..\src\modules\texts\ztext"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.21" value="..\..\src\modules\texts"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.22" value="..\..\src\modules"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.23" value="..\..\src\utilfuns\zlib"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.3" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.4" value="..\..\src\utilfuns"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.5" value="..\..\src\modules\comments\hrefcom"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.6" value="..\..\src\modules\comments\rawcom"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.7" value="..\..\src\modules\comments\rawfiles"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.8" value="..\..\src\modules\comments\zcom"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.9" value="..\..\src\modules\comments"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\..\src\frontend"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.10" value="..\..\src\modules\common"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.11" value="..\..\src\modules\filters"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.12" value="..\..\src\modules\genbook\rawgenbook"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.13" value="..\..\src\modules\genbook"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.14" value="..\..\src\modules\lexdict\rawld"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.15" value="..\..\src\modules\lexdict\rawld4"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.16" value="..\..\src\modules\lexdict\zld"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.17" value="..\..\src\modules\lexdict"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.18" value="..\..\src\modules\tests"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.19" value="..\..\src\modules\texts\rawtext"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value="..\..\src\keys"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.20" value="..\..\src\modules\texts\ztext"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.21" value="..\..\src\modules\texts"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.22" value="..\..\src\modules"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.23" value="..\..\src\utilfuns\zlib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.24" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.25" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.26" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="..\..\src\utilfuns"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.5" value="..\..\src\modules\comments\hrefcom"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.6" value="..\..\src\modules\comments\rawcom"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.7" value="..\..\src\modules\comments\rawfiles"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.8" value="..\..\src\modules\comments\zcom"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.9" value="..\..\src\modules\comments"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="UNICODE"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.4" value="USBINARY"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.6" value="USELUCENE"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.7" value="_WIN32"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\..\src\modules\tests"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.10" value="..\..\src\modules\texts"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.11" value="..\..\src\modules\lexdict\rawld"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.12" value="..\..\src\modules\lexdict"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.13" value="..\..\src\modules\filters"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.14" value="..\..\src\modules\common"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.15" value="..\..\src\modules\comments\rawfiles"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.16" value="..\..\src\modules\comments\rawcom"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.17" value="..\..\src\modules\comments\hrefcom"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.18" value="..\..\src\modules\comments"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.19" value="..\..\src\modules"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\..\src\utilfuns\zlib"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.20" value="..\..\src\frontend"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.21" value="..\..\src\utilfuns"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.22" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.23" value="..\..\src\keys"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.24" value="..\..\..\icu-sword\source\common"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.26" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.27" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.28" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.29" value="..\..\..\icu-sword\source\i18n"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="..\..\src\modules\lexdict\zld"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.30" value="..\..\..\biblecs\clucene\src"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\src\modules\lexdict\rawld4"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="..\..\src\modules\comments\zcom"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="..\..\src\modules\genbook\rawgenbook"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.7" value="..\..\src\modules\genbook"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.8" value="..\..\src\modules\texts\ztext"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.9" value="..\..\src\modules\texts\rawtext"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.tie.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="$(BDS)\lib\psdk"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="UNICODE"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.4" value="USBINARY"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.6" value="USELUCENE"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.7" value="_WIN32"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.8" value="_CL_DISABLE_MULTITHREADING"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\..\src\modules\tests"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.10" value="..\..\src\modules\texts"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.11" value="..\..\src\modules\lexdict\rawld"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.12" value="..\..\src\modules\lexdict"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.13" value="..\..\src\modules\filters"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.14" value="..\..\src\modules\common"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.15" value="..\..\src\modules\comments\rawfiles"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.16" value="..\..\src\modules\comments\rawcom"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.17" value="..\..\src\modules\comments\hrefcom"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.18" value="..\..\src\modules\comments"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.19" value="..\..\src\modules"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value="..\..\src\utilfuns\zlib"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.20" value="..\..\src\frontend"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.21" value="..\..\src\utilfuns"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.22" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.23" value="..\..\src\keys"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.24" value="..\..\..\icu-sword\source\common"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.26" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.27" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.28" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.29" value="..\..\..\icu-sword\source\i18n"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\src\modules\lexdict\zld"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.30" value="..\..\..\biblecs\clucene\src"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.32" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="..\..\src\modules\lexdict\rawld4"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="..\..\src\modules\comments\zcom"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="..\..\src\modules\genbook\rawgenbook"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.7" value="..\..\src\modules\genbook"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.8" value="..\..\src\modules\texts\ztext"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.9" value="..\..\src\modules\texts\rawtext"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- <property category="win32.*.win32b.tlib" name="option.P.arg" value="512"/>
- <property category="win32.*.win32b.tlib" name="option.P.arg.merge" value="1"/>
- <property category="win32.*.win32b.tlib" name="option.P.enabled" value="1"/>
- <property category="win32.*.win32b.tlib" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tlib" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tlib" name="option.outputdir.enabled" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="libsword.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\frontend\swdisp.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swdisp" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\frontend\swlog.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swlog" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\keys\versekey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="versekey" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\keys\strkey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="strkey" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\keys\swkey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swkey" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\keys\treekey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="treekey" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\keys\treekeyidx.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="treekeyidx" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\keys\listkey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="listkey" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\swsearchable.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swsearchable" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\encfiltmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="encfiltmgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\filemgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="filemgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\ftptrans.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ftptrans" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\installmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="installmgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\localemgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="localemgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\markupfiltmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="markupfiltmgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\stringmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="stringmgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\swcacher.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcacher" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\swconfig.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swconfig" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\swfiltermgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swfiltermgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\swlocale.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swlocale" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\swmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swmgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\mgr\curlftpt.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="curlftpt" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\utilxml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utilxml" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\roman.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="roman" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\swbuf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swbuf" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\swobject.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swobject" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\swversion.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swversion" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\url.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="url" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\utilstr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utilstr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\Greek2Greek.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="Greek2Greek" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\comments\hrefcom\hrefcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="hrefcom" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\comments\rawcom\rawcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawcom" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\comments\rawfiles\rawfiles.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawfiles" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\comments\zcom\zcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zcom" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\comments\swcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcom" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\zverse.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zverse" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\entriesblk.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="entriesblk" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\lzsscomprs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="lzsscomprs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\rawstr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawstr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\rawstr4.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawstr4" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\rawverse.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawverse" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\sapphire.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="sapphire" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\swcipher.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcipher" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\swcomprs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcomprs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\zipcomprs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zipcomprs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\common\zstr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zstr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8utf16.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8utf16" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbffootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbffootnotes" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfheadings.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfheadings" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfhtml" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfhtmlhref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfhtmlhref" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfmorph.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfmorph" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfosis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfosis" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfplain" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfredletterwords.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfredletterwords" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfrtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfrtf" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfstrongs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfstrongs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfthml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfthml" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\gbfwebif.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfwebif" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\greeklexattribs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="greeklexattribs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\latin1utf16.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="latin1utf16" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\latin1utf8.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="latin1utf8" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osisfootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisfootnotes" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osisheadings.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisheadings" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osishtmlhref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osishtmlhref" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osislemma.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osislemma" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osismorph.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osismorph" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osisosis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisosis" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osisplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisplain" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osisredletterwords.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisredletterwords" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osisrtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisrtf" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osisscripref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisscripref" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osisstrongs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisstrongs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osiswebif.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osiswebif" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osiswordjs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osiswordjs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\plainfootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="plainfootnotes" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\plainhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="plainhtml" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\rtfhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rtfhtml" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\swbasicfilter.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swbasicfilter" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\swoptfilter.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swoptfilter" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlfootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlfootnotes" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlgbf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlgbf" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlheadings.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlheadings" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlhtml" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlhtmlhref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlhtmlhref" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmllemma.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmllemma" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlmorph.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlmorph" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlosis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlosis" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlplain" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlrtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlrtf" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlscripref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlscripref" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlstrongs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlstrongs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlvariants.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlvariants" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlwebif.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlwebif" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\thmlwordjs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlwordjs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\unicodertf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="unicodertf" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf16utf8.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf16utf8" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8arshaping.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8arshaping" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8bidireorder.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8bidireorder" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8cantillation.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8cantillation" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8greekaccents.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8greekaccents" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8hebrewpoints.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8hebrewpoints" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8arabicpoints.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8arabicpoints" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8html.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8html" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8latin1.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8latin1" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8nfc.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8nfc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8nfkd.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8nfkd" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\utf8transliterator.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8transliterator" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\cipherfil.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="cipherfil" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawgenbook" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\genbook\swgenbook.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swgenbook" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\lexdict\rawld\rawld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawld" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\lexdict\rawld4\rawld4.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawld4" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\lexdict\zld\zld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zld" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\lexdict\swld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swld" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\tests\echomod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="echomod" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\texts\rawtext\rawtext.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawtext" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\texts\ztext\ztext.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ztext" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\texts\swtext.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swtext" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\swmodule.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swmodule" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\zutil.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zutil" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\compress.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="compress" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\crc32.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="crc32" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\deflate.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="deflate" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\gzio.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gzio" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\infblock.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="infblock" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\infcodes.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="infcodes" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\inffast.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="inffast" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\inflate.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="inflate" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\inftrees.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="inftrees" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\infutil.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="infutil" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\maketree.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="maketree" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\trees.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="trees" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\uncompr.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="uncompr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\untgz.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="untgz" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\zlib\adler32.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="adler32" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\papyriplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="papyriplain" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\utilfuns\ftpparse.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ftpparse" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\osismorphsegmentation.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osismorphsegmentation" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\keys\versetreekey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="versetreekey" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\teiplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="teiplain" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\src\modules\filters\teirtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="teirtf" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">20</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item4">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item5">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item6">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item7">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item8">..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item9">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item10">..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item11">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item12">..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item13">..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item14">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item15">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item16">..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item17">..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item18">..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item19">..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">7</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item5">..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item6">..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">22</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item2">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item3">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item4">_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item5">_ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item6">__ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item7">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item8">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item9">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item10">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item11">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item12">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item13">_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item14">_ICU_;_ICUSWORD_;USBINARY;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item15">_ICU_;_ICUSWORD_;USBINARY</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item16">_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item17">_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item18">;USBINARY;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item19">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item20">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item21">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <HistoryLists_hlFinalOutputDir>
- <HistoryLists_hlFinalOutputDir Name="Count">3</HistoryLists_hlFinalOutputDir>
- <HistoryLists_hlFinalOutputDir Name="Item0">..\</HistoryLists_hlFinalOutputDir>
- <HistoryLists_hlFinalOutputDir Name="Item1">../\</HistoryLists_hlFinalOutputDir>
- <HistoryLists_hlFinalOutputDir Name="Item2">../</HistoryLists_hlFinalOutputDir>
- </HistoryLists_hlFinalOutputDir>
- <HistoryLists_hlTlibPageSize>
- <HistoryLists_hlTlibPageSize Name="Count">5</HistoryLists_hlTlibPageSize>
- <HistoryLists_hlTlibPageSize Name="Item0">0x0200</HistoryLists_hlTlibPageSize>
- <HistoryLists_hlTlibPageSize Name="Item1">0x0080</HistoryLists_hlTlibPageSize>
- <HistoryLists_hlTlibPageSize Name="Item2">0x0040</HistoryLists_hlTlibPageSize>
- <HistoryLists_hlTlibPageSize Name="Item3">0x0020</HistoryLists_hlTlibPageSize>
- <HistoryLists_hlTlibPageSize Name="Item4">0x0010</HistoryLists_hlTlibPageSize>
- </HistoryLists_hlTlibPageSize>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams"></Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">libsword.bpf</Source>
- </Source> <buildevents/>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppStaticLibrary</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{42E205EF-ACE1-43B1-B144-7CC5BFF5A26A}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="libsword.lib"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.Gn.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="UNICODE"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.4" value="USBINARY"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.6" value="USELUCENE"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.7" value="_WIN32"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.9" value="CURLAVAILABLE"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\..\src\modules\tests"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.10" value="..\..\src\modules\texts"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.11" value="..\..\src\modules\lexdict\rawld"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.12" value="..\..\src\modules\lexdict"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.13" value="..\..\src\modules\filters"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.14" value="..\..\src\modules\common"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.15" value="..\..\src\modules\comments\rawfiles"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.16" value="..\..\src\modules\comments\rawcom"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.17" value="..\..\src\modules\comments\hrefcom"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.18" value="..\..\src\modules\comments"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.19" value="..\..\src\modules"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="..\..\src\utilfuns\zlib"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.20" value="..\..\src\frontend"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.21" value="..\..\src\utilfuns"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.22" value="..\..\src\mgr"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.23" value="..\..\src\keys"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.24" value="..\..\..\icu-sword\source\common"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.26" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.27" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.28" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.29" value="..\..\..\icu-sword\source\i18n"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\src\modules\lexdict\zld"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.30" value="..\..\..\biblecs\clucene\src"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.32" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="..\..\src\modules\lexdict\rawld4"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="..\..\src\modules\comments\zcom"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="..\..\src\modules\genbook\rawgenbook"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="..\..\src\modules\genbook"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.8" value="..\..\src\modules\texts\ztext"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.9" value="..\..\src\modules\texts\rawtext"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tW.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="UNICODE"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.4" value="USBINARY"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.6" value="USELUCENE"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.7" value="_WIN32"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\..\src\modules\tests"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.10" value="..\..\src\modules\texts"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.11" value="..\..\src\modules\lexdict\rawld"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.12" value="..\..\src\modules\lexdict"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.13" value="..\..\src\modules\filters"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.14" value="..\..\src\modules\common"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.15" value="..\..\src\modules\comments\rawfiles"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.16" value="..\..\src\modules\comments\rawcom"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.17" value="..\..\src\modules\comments\hrefcom"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.18" value="..\..\src\modules\comments"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.19" value="..\..\src\modules"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value="..\..\src\utilfuns\zlib"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.20" value="..\..\src\frontend"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.21" value="..\..\src\utilfuns"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.22" value="..\..\src\mgr"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.23" value="..\..\src\keys"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.24" value="..\..\..\icu-sword\source\common"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.26" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.27" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.28" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.29" value="..\..\..\icu-sword\source\i18n"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\src\modules\lexdict\zld"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.30" value="..\..\..\biblecs\clucene\src"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.32" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="..\..\src\modules\lexdict\rawld4"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="..\..\src\modules\comments\zcom"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="..\..\src\modules\genbook\rawgenbook"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.7" value="..\..\src\modules\genbook"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.8" value="..\..\src\modules\texts\ztext"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.9" value="..\..\src\modules\texts\rawtext"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\..\src\frontend"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.10" value="..\..\src\modules\common"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.11" value="..\..\src\modules\filters"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.12" value="..\..\src\modules\genbook\rawgenbook"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.13" value="..\..\src\modules\genbook"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.14" value="..\..\src\modules\lexdict\rawld"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.15" value="..\..\src\modules\lexdict\rawld4"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.16" value="..\..\src\modules\lexdict\zld"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.17" value="..\..\src\modules\lexdict"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.18" value="..\..\src\modules\tests"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.19" value="..\..\src\modules\texts\rawtext"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.2" value="..\..\src\keys"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.20" value="..\..\src\modules\texts\ztext"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.21" value="..\..\src\modules\texts"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.22" value="..\..\src\modules"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.23" value="..\..\src\utilfuns\zlib"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.3" value="..\..\src\mgr"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.4" value="..\..\src\utilfuns"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.5" value="..\..\src\modules\comments\hrefcom"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.6" value="..\..\src\modules\comments\rawcom"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.7" value="..\..\src\modules\comments\rawfiles"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.8" value="..\..\src\modules\comments\zcom"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.9" value="..\..\src\modules\comments"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\..\src\frontend"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.10" value="..\..\src\modules\common"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.11" value="..\..\src\modules\filters"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.12" value="..\..\src\modules\genbook\rawgenbook"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.13" value="..\..\src\modules\genbook"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.14" value="..\..\src\modules\lexdict\rawld"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.15" value="..\..\src\modules\lexdict\rawld4"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.16" value="..\..\src\modules\lexdict\zld"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.17" value="..\..\src\modules\lexdict"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.18" value="..\..\src\modules\tests"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.19" value="..\..\src\modules\texts\rawtext"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.2" value="..\..\src\keys"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.20" value="..\..\src\modules\texts\ztext"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.21" value="..\..\src\modules\texts"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.22" value="..\..\src\modules"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.23" value="..\..\src\utilfuns\zlib"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.3" value="..\..\src\mgr"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.4" value="..\..\src\utilfuns"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.5" value="..\..\src\modules\comments\hrefcom"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.6" value="..\..\src\modules\comments\rawcom"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.7" value="..\..\src\modules\comments\rawfiles"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.8" value="..\..\src\modules\comments\zcom"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.9" value="..\..\src\modules\comments"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\..\src\frontend"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.10" value="..\..\src\modules\common"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.11" value="..\..\src\modules\filters"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.12" value="..\..\src\modules\genbook\rawgenbook"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.13" value="..\..\src\modules\genbook"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.14" value="..\..\src\modules\lexdict\rawld"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.15" value="..\..\src\modules\lexdict\rawld4"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.16" value="..\..\src\modules\lexdict\zld"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.17" value="..\..\src\modules\lexdict"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.18" value="..\..\src\modules\tests"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.19" value="..\..\src\modules\texts\rawtext"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.2" value="..\..\src\keys"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.20" value="..\..\src\modules\texts\ztext"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.21" value="..\..\src\modules\texts"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.22" value="..\..\src\modules"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.23" value="..\..\src\utilfuns\zlib"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.3" value="..\..\src\mgr"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.4" value="..\..\src\utilfuns"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.5" value="..\..\src\modules\comments\hrefcom"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.6" value="..\..\src\modules\comments\rawcom"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.7" value="..\..\src\modules\comments\rawfiles"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.8" value="..\..\src\modules\comments\zcom"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.9" value="..\..\src\modules\comments"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\..\src\frontend"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.10" value="..\..\src\modules\common"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.11" value="..\..\src\modules\filters"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.12" value="..\..\src\modules\genbook\rawgenbook"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.13" value="..\..\src\modules\genbook"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.14" value="..\..\src\modules\lexdict\rawld"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.15" value="..\..\src\modules\lexdict\rawld4"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.16" value="..\..\src\modules\lexdict\zld"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.17" value="..\..\src\modules\lexdict"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.18" value="..\..\src\modules\tests"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.19" value="..\..\src\modules\texts\rawtext"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value="..\..\src\keys"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.20" value="..\..\src\modules\texts\ztext"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.21" value="..\..\src\modules\texts"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.22" value="..\..\src\modules"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.23" value="..\..\src\utilfuns\zlib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.24" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.25" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.26" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="..\..\src\mgr"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="..\..\src\utilfuns"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.5" value="..\..\src\modules\comments\hrefcom"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.6" value="..\..\src\modules\comments\rawcom"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.7" value="..\..\src\modules\comments\rawfiles"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.8" value="..\..\src\modules\comments\zcom"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.9" value="..\..\src\modules\comments"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="UNICODE"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.4" value="USBINARY"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.6" value="USELUCENE"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.7" value="_WIN32"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\..\src\modules\tests"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.10" value="..\..\src\modules\texts"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.11" value="..\..\src\modules\lexdict\rawld"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.12" value="..\..\src\modules\lexdict"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.13" value="..\..\src\modules\filters"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.14" value="..\..\src\modules\common"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.15" value="..\..\src\modules\comments\rawfiles"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.16" value="..\..\src\modules\comments\rawcom"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.17" value="..\..\src\modules\comments\hrefcom"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.18" value="..\..\src\modules\comments"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.19" value="..\..\src\modules"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\..\src\utilfuns\zlib"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.20" value="..\..\src\frontend"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.21" value="..\..\src\utilfuns"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.22" value="..\..\src\mgr"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.23" value="..\..\src\keys"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.24" value="..\..\..\icu-sword\source\common"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.26" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.27" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.28" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.29" value="..\..\..\icu-sword\source\i18n"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="..\..\src\modules\lexdict\zld"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.30" value="..\..\..\biblecs\clucene\src"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\src\modules\lexdict\rawld4"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="..\..\src\modules\comments\zcom"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="..\..\src\modules\genbook\rawgenbook"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.7" value="..\..\src\modules\genbook"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.8" value="..\..\src\modules\texts\ztext"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.9" value="..\..\src\modules\texts\rawtext"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.tie.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="$(BDS)\lib\psdk"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="UNICODE"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.4" value="USBINARY"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.6" value="USELUCENE"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.7" value="_WIN32"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.8" value="_CL_DISABLE_MULTITHREADING"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\..\src\modules\tests"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.10" value="..\..\src\modules\texts"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.11" value="..\..\src\modules\lexdict\rawld"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.12" value="..\..\src\modules\lexdict"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.13" value="..\..\src\modules\filters"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.14" value="..\..\src\modules\common"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.15" value="..\..\src\modules\comments\rawfiles"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.16" value="..\..\src\modules\comments\rawcom"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.17" value="..\..\src\modules\comments\hrefcom"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.18" value="..\..\src\modules\comments"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.19" value="..\..\src\modules"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value="..\..\src\utilfuns\zlib"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.20" value="..\..\src\frontend"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.21" value="..\..\src\utilfuns"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.22" value="..\..\src\mgr"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.23" value="..\..\src\keys"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.24" value="..\..\..\icu-sword\source\common"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.26" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.27" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.28" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.29" value="..\..\..\icu-sword\source\i18n"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\src\modules\lexdict\zld"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.30" value="..\..\..\biblecs\clucene\src"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.32" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="..\..\src\modules\lexdict\rawld4"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="..\..\src\modules\comments\zcom"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="..\..\src\modules\genbook\rawgenbook"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.7" value="..\..\src\modules\genbook"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.8" value="..\..\src\modules\texts\ztext"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.9" value="..\..\src\modules\texts\rawtext"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + <property category="win32.*.win32b.tlib" name="option.P.arg" value="512"/> + <property category="win32.*.win32b.tlib" name="option.P.arg.merge" value="1"/> + <property category="win32.*.win32b.tlib" name="option.P.enabled" value="1"/> + <property category="win32.*.win32b.tlib" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tlib" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tlib" name="option.outputdir.enabled" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="libsword.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\frontend\swdisp.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swdisp" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\frontend\swlog.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swlog" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\keys\versekey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="versekey" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\keys\strkey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="strkey" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\keys\swkey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swkey" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\keys\treekey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="treekey" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\keys\treekeyidx.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="treekeyidx" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\keys\listkey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="listkey" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\swsearchable.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swsearchable" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\encfiltmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="encfiltmgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\filemgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="filemgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\ftptrans.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ftptrans" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\installmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="installmgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\localemgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="localemgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\markupfiltmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="markupfiltmgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\stringmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="stringmgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\swcacher.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcacher" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\swconfig.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swconfig" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\swfiltermgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swfiltermgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\swlocale.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swlocale" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\swmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swmgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\mgr\curlftpt.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="curlftpt" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\utilxml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utilxml" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\roman.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="roman" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\swbuf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swbuf" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\swobject.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swobject" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\swversion.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swversion" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\url.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="url" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\utilstr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utilstr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\Greek2Greek.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="Greek2Greek" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\comments\hrefcom\hrefcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="hrefcom" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\comments\rawcom\rawcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawcom" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\comments\rawfiles\rawfiles.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawfiles" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\comments\zcom\zcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zcom" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\comments\swcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcom" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\zverse.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zverse" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\entriesblk.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="entriesblk" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\lzsscomprs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="lzsscomprs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\rawstr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawstr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\rawstr4.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawstr4" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\rawverse.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawverse" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\sapphire.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="sapphire" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\swcipher.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcipher" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\swcomprs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcomprs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\zipcomprs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zipcomprs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\common\zstr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zstr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8utf16.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8utf16" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbffootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbffootnotes" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfheadings.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfheadings" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfhtml" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfhtmlhref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfhtmlhref" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfmorph.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfmorph" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfosis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfosis" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfplain" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfredletterwords.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfredletterwords" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfrtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfrtf" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfstrongs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfstrongs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfthml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfthml" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\gbfwebif.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfwebif" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\greeklexattribs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="greeklexattribs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\latin1utf16.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="latin1utf16" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\latin1utf8.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="latin1utf8" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osisfootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisfootnotes" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osisheadings.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisheadings" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osishtmlhref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osishtmlhref" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osislemma.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osislemma" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osismorph.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osismorph" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osisosis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisosis" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osisplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisplain" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osisredletterwords.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisredletterwords" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osisrtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisrtf" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osisscripref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisscripref" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osisstrongs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisstrongs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osiswebif.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osiswebif" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osiswordjs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osiswordjs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\plainfootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="plainfootnotes" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\plainhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="plainhtml" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\rtfhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rtfhtml" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\swbasicfilter.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swbasicfilter" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\swoptfilter.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swoptfilter" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlfootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlfootnotes" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlgbf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlgbf" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlheadings.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlheadings" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlhtml" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlhtmlhref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlhtmlhref" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmllemma.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmllemma" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlmorph.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlmorph" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlosis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlosis" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlplain" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlrtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlrtf" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlscripref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlscripref" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlstrongs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlstrongs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlvariants.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlvariants" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlwebif.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlwebif" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\thmlwordjs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlwordjs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\unicodertf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="unicodertf" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf16utf8.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf16utf8" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8arshaping.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8arshaping" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8bidireorder.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8bidireorder" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8cantillation.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8cantillation" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8greekaccents.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8greekaccents" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8hebrewpoints.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8hebrewpoints" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8arabicpoints.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8arabicpoints" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8html.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8html" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8latin1.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8latin1" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8nfc.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8nfc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8nfkd.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8nfkd" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\utf8transliterator.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8transliterator" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\cipherfil.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="cipherfil" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawgenbook" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\genbook\swgenbook.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swgenbook" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\lexdict\rawld\rawld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawld" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\lexdict\rawld4\rawld4.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawld4" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\lexdict\zld\zld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zld" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\lexdict\swld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swld" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\tests\echomod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="echomod" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\texts\rawtext\rawtext.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawtext" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\texts\ztext\ztext.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ztext" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\texts\swtext.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swtext" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\swmodule.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swmodule" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\zutil.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zutil" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\compress.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="compress" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\crc32.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="crc32" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\deflate.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="deflate" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\gzio.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gzio" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\infblock.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="infblock" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\infcodes.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="infcodes" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\inffast.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="inffast" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\inflate.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="inflate" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\inftrees.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="inftrees" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\infutil.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="infutil" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\maketree.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="maketree" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\trees.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="trees" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\uncompr.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="uncompr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\untgz.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="untgz" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\zlib\adler32.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="adler32" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\papyriplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="papyriplain" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\utilfuns\ftpparse.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ftpparse" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\osismorphsegmentation.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osismorphsegmentation" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\keys\versetreekey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="versetreekey" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\teiplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="teiplain" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\src\modules\filters\teirtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="teirtf" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">20</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item4">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item5">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item6">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item7">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item8">..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item9">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item10">..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item11">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item12">..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item13">..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item14">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item15">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item16">..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item17">..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item18">..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item19">..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">7</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item5">..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item6">..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">22</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item2">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item3">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item4">_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item5">_ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item6">__ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item7">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item8">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item9">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item10">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item11">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item12">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item13">_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item14">_ICU_;_ICUSWORD_;USBINARY;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item15">_ICU_;_ICUSWORD_;USBINARY</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item16">_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item17">_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item18">;USBINARY;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item19">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item20">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item21">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <HistoryLists_hlFinalOutputDir> + <HistoryLists_hlFinalOutputDir Name="Count">3</HistoryLists_hlFinalOutputDir> + <HistoryLists_hlFinalOutputDir Name="Item0">..\</HistoryLists_hlFinalOutputDir> + <HistoryLists_hlFinalOutputDir Name="Item1">../\</HistoryLists_hlFinalOutputDir> + <HistoryLists_hlFinalOutputDir Name="Item2">../</HistoryLists_hlFinalOutputDir> + </HistoryLists_hlFinalOutputDir> + <HistoryLists_hlTlibPageSize> + <HistoryLists_hlTlibPageSize Name="Count">5</HistoryLists_hlTlibPageSize> + <HistoryLists_hlTlibPageSize Name="Item0">0x0200</HistoryLists_hlTlibPageSize> + <HistoryLists_hlTlibPageSize Name="Item1">0x0080</HistoryLists_hlTlibPageSize> + <HistoryLists_hlTlibPageSize Name="Item2">0x0040</HistoryLists_hlTlibPageSize> + <HistoryLists_hlTlibPageSize Name="Item3">0x0020</HistoryLists_hlTlibPageSize> + <HistoryLists_hlTlibPageSize Name="Item4">0x0010</HistoryLists_hlTlibPageSize> + </HistoryLists_hlTlibPageSize> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams"></Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">libsword.bpf</Source> + </Source> <buildevents/> + </CPlusPlusBuilder.Personality> +</BorlandProject> diff --git a/lib/bcppmake/libsword.bpf b/lib/bcppmake/libsword.bpf index bbb5e27..61ae64a 100644 --- a/lib/bcppmake/libsword.bpf +++ b/lib/bcppmake/libsword.bpf @@ -155,12 +155,18 @@ USEUNIT("..\..\src\utilfuns\zlib\gzread.c"); USEUNIT("..\..\src\utilfuns\zlib\gzwrite.c"); USEUNIT("..\..\src\utilfuns\zlib\infback.c"); USEUNIT("..\..\src\mgr\versificationmgr.cpp"); -USEUNIT("..\..\src\modules\common\xzcomprs.cpp"); -USEUNIT("..\..\src\modules\common\bz2comprs.cpp"); USEUNIT("..\..\src\modules\filters\osisvariants.cpp"); USEUNIT("..\..\src\modules\filters\osisxlit.cpp"); USEUNIT("..\..\src\modules\filters\osisreferencelinks.cpp"); USEUNIT("..\..\src\modules\filters\scsuutf8.cpp"); +USEUNIT("..\..\src\modules\filters\gbflatex.cpp"); +USEUNIT("..\..\src\modules\filters\osislatex.cpp"); +USEUNIT("..\..\src\modules\filters\thmllatex.cpp"); +USEUNIT("..\..\src\modules\texts\ztext4\ztext4.cpp"); +USEUNIT("..\..\src\modules\comments\zcom4\zcom4.cpp"); +USEUNIT("..\..\src\modules\common\zverse4.cpp"); +USEUNIT("..\..\src\modules\filters\teilatex.cpp"); +USEUNIT("..\..\src\modules\filters\utf8scsu.cpp"); //--------------------------------------------------------------------------- #define Library diff --git a/lib/bcppmake/libsword.bpr b/lib/bcppmake/libsword.bpr index e2cccb6..cb87daf 100644 --- a/lib/bcppmake/libsword.bpr +++ b/lib/bcppmake/libsword.bpr @@ -16,9 +16,8 @@ ..\..\src\mgr\swlocale.obj ..\..\src\mgr\swmgr.obj ..\..\src\mgr\curlftpt.obj ..\..\src\utilfuns\utilxml.obj ..\..\src\utilfuns\roman.obj ..\..\src\utilfuns\swbuf.obj - ..\..\src\utilfuns\swobject.obj - ..\..\src\utilfuns\swversion.obj ..\..\src\utilfuns\url.obj - ..\..\src\utilfuns\utilstr.obj + ..\..\src\utilfuns\swobject.obj ..\..\src\utilfuns\swversion.obj + ..\..\src\utilfuns\url.obj ..\..\src\utilfuns\utilstr.obj ..\..\src\modules\comments\hrefcom\hrefcom.obj ..\..\src\modules\comments\rawcom\rawcom.obj ..\..\src\modules\comments\rawfiles\rawfiles.obj @@ -122,11 +121,18 @@ ..\..\src\modules\filters\osisenum.obj ..\..\src\utilfuns\zlib\gzclose.obj ..\..\src\utilfuns\zlib\gzlib.obj ..\..\src\utilfuns\zlib\gzread.obj ..\..\src\utilfuns\zlib\gzwrite.obj ..\..\src\utilfuns\zlib\infback.obj - ..\..\src\mgr\versificationmgr.obj ..\..\src\modules\common\xzcomprs.obj - ..\..\src\modules\common\bz2comprs.obj + ..\..\src\mgr\versificationmgr.obj ..\..\src\modules\filters\osisvariants.obj ..\..\src\modules\filters\osisxlit.obj - ..\..\src\modules\filters\scsuutf8.obj"/> + ..\..\src\modules\filters\osisreferencelinks.obj + ..\..\src\modules\filters\scsuutf8.obj + ..\..\src\modules\filters\gbflatex.obj + ..\..\src\modules\filters\osislatex.obj + ..\..\src\modules\filters\thmllatex.obj + ..\..\src\modules\texts\ztext4\ztext4.obj + ..\..\src\modules\comments\zcom4\zcom4.obj + ..\..\src\modules\common\zverse4.obj + ..\..\src\modules\filters\teilatex.obj ..\..\src\modules\filters\utf8scsu.obj"/> <RESFILES value=""/> <IDLFILES value=""/> <IDLGENFILES value=""/> @@ -135,16 +141,16 @@ <LIBFILES value=""/> <LIBRARIES value=""/> <PACKAGES value=""/> - <PATHCPP value=".;..\..\src\frontend;..\..\src\keys;..\..\src\mgr;..\..\src\utilfuns;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\zcom;..\..\src\modules\comments;..\..\src\modules\common;..\..\src\modules\filters;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict;..\..\src\modules\tests;..\..\src\modules\texts\rawtext;..\..\src\modules\texts\ztext;..\..\src\modules\texts;..\..\src\modules;..\..\src\utilfuns\zlib;..\..\src\modules\texts\rawtext4;..\..\src\modules\comments\rawcom4"/> + <PATHCPP value=".;..\..\src\frontend;..\..\src\keys;..\..\src\mgr;..\..\src\utilfuns;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\zcom;..\..\src\modules\comments;..\..\src\modules\common;..\..\src\modules\filters;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict;..\..\src\modules\tests;..\..\src\modules\texts\rawtext;..\..\src\modules\texts\ztext;..\..\src\modules\texts;..\..\src\modules;..\..\src\utilfuns\zlib;..\..\src\modules\texts\rawtext4;..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\ztext4;..\..\src\modules\comments\zcom4"/> <PATHPAS value=".;"/> <PATHRC value=".;"/> <PATHASM value=".;"/> <LINKER value="TLib"/> - <USERDEFINES value="UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT"/> + <USERDEFINES value="UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2"/> <SYSDEFINES value="NO_STRICT"/> <MAINSOURCE value="libsword.bpf"/> - <INCLUDEPATH value="..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;..\..\include\internal\regex;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include"/> - <LIBPATH value="..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib"/> + <INCLUDEPATH value="..\..\src\modules\comments\zcom4;..\..\src\modules\texts\ztext4;..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;..\..\include\internal\regex;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include"/> + <LIBPATH value="..\..\src\modules\comments\zcom4;..\..\src\modules\texts\ztext4;..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> <LISTFILE value=""/> </MACROS> @@ -206,72 +212,75 @@ ProductVersion=1.0.0.0 Comments= [HistoryLists\hlIncludePath] -Count=22 -Item0=..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;..\..\include\internal\regex;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include -Item1=..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include -Item2=..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include -Item3=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include -Item4=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src +Count=23 +Item0=..\..\src\modules\comments\zcom4;..\..\src\modules\texts\ztext4;..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;..\..\include\internal\regex;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include +Item1=..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;..\..\include\internal\regex;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include +Item2=..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include +Item3=..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include +Item4=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include Item5=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src -Item6=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n -Item7=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item8=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item9=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item10=..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item11=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item12=..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item13=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n -Item14=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n -Item15=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n -Item16=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common -Item17=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item18=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item19=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl -Item20=..\include;$(BCB)\include;$(BCB)\include\vcl -Item21=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\include;$(BCB)\include\vcl +Item6=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src +Item7=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n +Item8=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item9=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item10=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item11=..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item12=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item13=..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item14=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n +Item15=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n +Item16=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n +Item17=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common +Item18=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item19=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item20=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl +Item21=..\include;$(BCB)\include;$(BCB)\include\vcl +Item22=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\include;$(BCB)\include\vcl [HistoryLists\hlLibraryPath] -Count=8 -Item0=..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib -Item1=..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib -Item2=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib -Item3=$(BCB)\lib\obj;$(BCB)\lib -Item4=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib -Item5=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib -Item6=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib -Item7=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\lib\obj;$(BCB)\lib +Count=9 +Item0=..\..\src\modules\comments\zcom4;..\..\src\modules\texts\ztext4;..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib +Item1=..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib +Item2=..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib +Item3=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib +Item4=$(BCB)\lib\obj;$(BCB)\lib +Item5=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib +Item6=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib +Item7=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib +Item8=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] Count=1 Item0=$(BCB)\source\vcl [HistoryLists\hlConditionals] -Count=25 -Item0=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT -Item1=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;_DEBUG -Item2=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE -Item3=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING -Item4=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG -Item5=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING -Item6=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE -Item7=_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING -Item8=_ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING -Item9=__ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING -Item10=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT -Item11=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG -Item12=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT -Item13=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE -Item14=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG -Item15=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0 -Item16=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0 -Item17=_ICU_;_ICUSWORD_;USBINARY;_DEBUG -Item18=_ICU_;_ICUSWORD_;USBINARY -Item19=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG -Item20=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE -Item21=;USBINARY;_DEBUG -Item22=_ICU_;_ICUSWORD_ -Item23=_ICU_;_ICUSWORD_;_DEBUG -Item24=_DEBUG +Count=26 +Item0=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2 +Item1=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT +Item2=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;_DEBUG +Item3=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE +Item4=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING +Item5=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG +Item6=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING +Item7=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE +Item8=_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING +Item9=_ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING +Item10=__ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING +Item11=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT +Item12=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG +Item13=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT +Item14=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE +Item15=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG +Item16=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0 +Item17=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0 +Item18=_ICU_;_ICUSWORD_;USBINARY;_DEBUG +Item19=_ICU_;_ICUSWORD_;USBINARY +Item20=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG +Item21=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE +Item22=;USBINARY;_DEBUG +Item23=_ICU_;_ICUSWORD_ +Item24=_ICU_;_ICUSWORD_;_DEBUG +Item25=_DEBUG [HistoryLists\hlFinalOutputDir] Count=3 @@ -309,4 +318,4 @@ ActiveLang= ProjectLang= RootDir= </IDEOPTIONS> -</PROJECT> +</PROJECT>
\ No newline at end of file diff --git a/lib/vcppmake/libsword.sln b/lib/vcppmake/libsword.sln index 3a09b7c..f465b5d 100644 --- a/lib/vcppmake/libsword.sln +++ b/lib/vcppmake/libsword.sln @@ -1,20 +1,20 @@ -
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "libsword.vcxproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}"
-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
- 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}") = "libsword", "libsword.vcxproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}" +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 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/lib/vcppmake/libsword.vcxproj b/lib/vcppmake/libsword.vcxproj index fdf4854..d28da78 100644 --- a/lib/vcppmake/libsword.vcxproj +++ b/lib/vcppmake/libsword.vcxproj @@ -1,479 +1,498 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{97449E5E-F880-4D22-933A-0D2FC32034D4}</ProjectGuid>
- <RootNamespace>libsword</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <AdditionalOptions>/D _CRT_SECURE_NO_DEPRECATE %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>.\Debug/libsword.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
- <ObjectFileName>.\Debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <WarningLevel>Level1</WarningLevel>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- <EnableCOMDATFolding>false</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>
- </StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>.\Release/libsword.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
- <ObjectFileName>.\Release/</ObjectFileName>
- <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>Default</CompileAs>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <WarningLevel>Level1</WarningLevel>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\src\mgr\remotetrans.cpp" />
- <ClCompile Include="..\..\src\mgr\versificationmgr.cpp" />
- <ClCompile Include="..\..\src\modules\filters\cipherfil.cpp" />
- <ClCompile Include="..\..\src\mgr\curlftpt.cpp" />
- <ClCompile Include="..\..\src\mgr\curlhttpt.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisenum.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisglosses.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisxlit.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisreferencelinks.cpp" />
- <ClCompile Include="..\..\src\modules\filters\scsuutf8.cpp" />
- <ClCompile Include="..\..\src\utilfuns\win32\dirent.cpp" />
- <ClCompile Include="..\..\src\mgr\encfiltmgr.cpp" />
- <ClCompile Include="..\..\src\modules\common\entriesblk.cpp" />
- <ClCompile Include="..\..\src\mgr\filemgr.cpp" />
- <ClCompile Include="..\..\src\utilfuns\ftpparse.c" />
- <ClCompile Include="..\..\src\modules\filters\gbffootnotes.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfheadings.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfhtml.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfhtmlhref.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfmorph.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfosis.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfplain.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfredletterwords.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfrtf.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfstrongs.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfthml.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfwebif.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfwordjs.cpp" />
- <ClCompile Include="..\..\src\modules\filters\gbfxhtml.cpp" />
- <ClCompile Include="..\..\src\modules\filters\greeklexattribs.cpp" />
- <ClCompile Include="..\..\src\modules\comments\hrefcom\hrefcom.cpp" />
- <ClCompile Include="..\..\src\mgr\installmgr.cpp" />
- <ClCompile Include="..\..\src\modules\filters\latin1utf16.cpp" />
- <ClCompile Include="..\..\src\modules\filters\latin1utf8.cpp" />
- <ClCompile Include="..\..\src\keys\listkey.cpp" />
- <ClCompile Include="..\..\src\mgr\localemgr.cpp" />
- <ClCompile Include="..\..\src\modules\common\lzsscomprs.cpp" />
- <ClCompile Include="..\..\src\mgr\markupfiltmgr.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisfootnotes.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisheadings.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osishtmlhref.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osislemma.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osismorph.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osismorphsegmentation.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisosis.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisplain.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisredletterwords.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisrtf.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisscripref.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisstrongs.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisvariants.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osiswebif.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osiswordjs.cpp" />
- <ClCompile Include="..\..\src\modules\filters\osisxhtml.cpp" />
- <ClCompile Include="..\..\src\modules\filters\papyriplain.cpp" />
- <ClCompile Include="..\..\src\modules\comments\rawcom\rawcom.cpp" />
- <ClCompile Include="..\..\src\modules\comments\rawcom4\rawcom4.cpp" />
- <ClCompile Include="..\..\src\modules\comments\rawfiles\rawfiles.cpp" />
- <ClCompile Include="..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp" />
- <ClCompile Include="..\..\src\modules\lexdict\rawld\rawld.cpp" />
- <ClCompile Include="..\..\src\modules\lexdict\rawld4\rawld4.cpp" />
- <ClCompile Include="..\..\src\modules\common\rawstr.cpp" />
- <ClCompile Include="..\..\src\modules\common\rawstr4.cpp" />
- <ClCompile Include="..\..\src\modules\texts\rawtext\rawtext.cpp" />
- <ClCompile Include="..\..\src\modules\texts\rawtext4\rawtext4.cpp" />
- <ClCompile Include="..\..\src\modules\common\rawverse.cpp" />
- <ClCompile Include="..\..\src\modules\common\rawverse4.cpp" />
- <ClCompile Include="..\..\src\utilfuns\regex.c" />
- <ClCompile Include="..\..\src\utilfuns\roman.cpp" />
- <ClCompile Include="..\..\src\modules\filters\rtfhtml.cpp" />
- <ClCompile Include="..\..\src\modules\common\sapphire.cpp" />
- <ClCompile Include="..\..\src\mgr\stringmgr.cpp" />
- <ClCompile Include="..\..\src\keys\strkey.cpp" />
- <ClCompile Include="..\..\src\modules\filters\swbasicfilter.cpp" />
- <ClCompile Include="..\..\src\utilfuns\swbuf.cpp" />
- <ClCompile Include="..\..\src\mgr\swcacher.cpp" />
- <ClCompile Include="..\..\src\modules\common\swcipher.cpp" />
- <ClCompile Include="..\..\src\modules\comments\swcom.cpp" />
- <ClCompile Include="..\..\src\modules\common\swcomprs.cpp" />
- <ClCompile Include="..\..\src\mgr\swconfig.cpp" />
- <ClCompile Include="..\..\src\frontend\swdisp.cpp" />
- <ClCompile Include="..\..\src\mgr\swfiltermgr.cpp" />
- <ClCompile Include="..\..\src\modules\genbook\swgenbook.cpp" />
- <ClCompile Include="..\..\src\keys\swkey.cpp" />
- <ClCompile Include="..\..\src\modules\lexdict\swld.cpp" />
- <ClCompile Include="..\..\src\mgr\swlocale.cpp" />
- <ClCompile Include="..\..\src\frontend\swlog.cpp" />
- <ClCompile Include="..\..\src\mgr\swmgr.cpp" />
- <ClCompile Include="..\..\src\modules\swmodule.cpp" />
- <ClCompile Include="..\..\src\utilfuns\swobject.cpp" />
- <ClCompile Include="..\..\src\modules\filters\swoptfilter.cpp" />
- <ClCompile Include="..\..\src\mgr\swsearchable.cpp" />
- <ClCompile Include="..\..\src\modules\texts\swtext.cpp" />
- <ClCompile Include="..\..\src\utilfuns\swversion.cpp" />
- <ClCompile Include="..\..\src\modules\filters\teixhtml.cpp" />
- <ClCompile Include="..\..\src\modules\filters\teihtmlhref.cpp" />
- <ClCompile Include="..\..\src\modules\filters\teiplain.cpp" />
- <ClCompile Include="..\..\src\modules\filters\teirtf.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlfootnotes.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlgbf.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlheadings.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlhtml.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlhtmlhref.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmllemma.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlmorph.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlosis.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlplain.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlrtf.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlscripref.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlstrongs.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlvariants.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlwebif.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlwordjs.cpp" />
- <ClCompile Include="..\..\src\modules\filters\thmlxhtml.cpp" />
- <ClCompile Include="..\..\src\keys\treekey.cpp" />
- <ClCompile Include="..\..\src\keys\treekeyidx.cpp" />
- <ClCompile Include="..\..\src\modules\filters\unicodertf.cpp" />
- <ClCompile Include="..\..\src\utilfuns\zlib\adler32.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\compress.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\crc32.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\deflate.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\gzclose.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\gzlib.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\gzread.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\gzwrite.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\infback.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\inffast.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\inflate.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\inftrees.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\trees.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\uncompr.c" />
- <ClCompile Include="..\..\src\utilfuns\zlib\untgz.c" />
- <ClCompile Include="..\..\src\utilfuns\url.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf16utf8.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8arabicpoints.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8arshaping.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8bidireorder.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8cantillation.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8greekaccents.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8hebrewpoints.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8html.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8latin1.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8nfc.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8nfkd.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8transliterator.cpp" />
- <ClCompile Include="..\..\src\modules\filters\utf8utf16.cpp" />
- <ClCompile Include="..\..\src\utilfuns\utilstr.cpp" />
- <ClCompile Include="..\..\src\utilfuns\utilxml.cpp" />
- <ClCompile Include="..\..\src\keys\versekey.cpp" />
- <ClCompile Include="..\..\src\keys\versetreekey.cpp" />
- <ClCompile Include="..\..\src\modules\comments\zcom\zcom.cpp" />
- <ClCompile Include="..\..\src\modules\common\zipcomprs.cpp" />
- <ClCompile Include="..\..\src\modules\common\bz2comprs.cpp" />
- <ClCompile Include="..\..\src\modules\common\xzcomprs.cpp" />
- <ClCompile Include="..\..\src\modules\lexdict\zld\zld.cpp" />
- <ClCompile Include="..\..\src\modules\common\zstr.cpp" />
- <ClCompile Include="..\..\src\modules\texts\ztext\ztext.cpp" />
- <ClCompile Include="..\..\src\modules\common\zverse.cpp" />
- <ClCompile Include="..\..\src\utilfuns\zlib\zutil.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\include\canon.h" />
- <ClInclude Include="..\..\include\canon_abbrevs.h" />
- <ClInclude Include="..\..\include\canon_catholic.h" />
- <ClInclude Include="..\..\include\canon_catholic2.h" />
- <ClInclude Include="..\..\include\canon_german.h" />
- <ClInclude Include="..\..\include\canon_kjva.h" />
- <ClInclude Include="..\..\include\canon_leningrad.h" />
- <ClInclude Include="..\..\include\canon_luther.h" />
- <ClInclude Include="..\..\include\canon_lxx.h" />
- <ClInclude Include="..\..\include\canon_mt.h" />
- <ClInclude Include="..\..\include\canon_nrsv.h" />
- <ClInclude Include="..\..\include\canon_nrsva.h" />
- <ClInclude Include="..\..\include\canon_null.h" />
- <ClInclude Include="..\..\include\canon_orthodox.h" />
- <ClInclude Include="..\..\include\canon_synodal.h" />
- <ClInclude Include="..\..\include\canon_synodalprot.h" />
- <ClInclude Include="..\..\include\canon_vulg.h" />
- <ClInclude Include="..\..\include\cipherfil.h" />
- <ClInclude Include="..\..\include\curlftpt.h" />
- <ClInclude Include="..\..\include\curlhttpt.h" />
- <ClInclude Include="..\..\include\defs.h" />
- <ClInclude Include="..\..\include\encfiltmgr.h" />
- <ClInclude Include="..\..\include\entriesblk.h" />
- <ClInclude Include="..\..\include\filemgr.h" />
- <ClInclude Include="..\..\include\flatapi.h" />
- <ClInclude Include="..\..\include\ftplib.h" />
- <ClInclude Include="..\..\include\ftplibftpt.h" />
- <ClInclude Include="..\..\include\ftpparse.h" />
- <ClInclude Include="..\..\include\gbffootnotes.h" />
- <ClInclude Include="..\..\include\gbfheadings.h" />
- <ClInclude Include="..\..\include\gbfhtml.h" />
- <ClInclude Include="..\..\include\gbfhtmlhref.h" />
- <ClInclude Include="..\..\include\gbfmorph.h" />
- <ClInclude Include="..\..\include\gbfosis.h" />
- <ClInclude Include="..\..\include\gbfplain.h" />
- <ClInclude Include="..\..\include\gbfredletterwords.h" />
- <ClInclude Include="..\..\include\gbfrtf.h" />
- <ClInclude Include="..\..\include\gbfstrongs.h" />
- <ClInclude Include="..\..\include\gbfthml.h" />
- <ClInclude Include="..\..\include\gbfwebif.h" />
- <ClInclude Include="..\..\include\gbfwordjs.h" />
- <ClInclude Include="..\..\include\gbfxhtml.h" />
- <ClInclude Include="..\..\include\greeklexattribs.h" />
- <ClInclude Include="..\..\include\hrefcom.h" />
- <ClInclude Include="..\..\include\installmgr.h" />
- <ClInclude Include="..\..\include\latin1utf16.h" />
- <ClInclude Include="..\..\include\latin1utf8.h" />
- <ClInclude Include="..\..\include\listkey.h" />
- <ClInclude Include="..\..\include\localemgr.h" />
- <ClInclude Include="..\..\include\lzsscomprs.h" />
- <ClInclude Include="..\..\include\markupfiltmgr.h" />
- <ClInclude Include="..\..\include\multimapwdef.h" />
- <ClInclude Include="..\..\include\osisenum.h" />
- <ClInclude Include="..\..\include\osisfootnotes.h" />
- <ClInclude Include="..\..\include\osisglosses.h" />
- <ClInclude Include="..\..\include\osisheadings.h" />
- <ClInclude Include="..\..\include\osishtmlhref.h" />
- <ClInclude Include="..\..\include\osislemma.h" />
- <ClInclude Include="..\..\include\osismorph.h" />
- <ClInclude Include="..\..\include\osismorphsegmentation.h" />
- <ClInclude Include="..\..\include\osisosis.h" />
- <ClInclude Include="..\..\include\osisplain.h" />
- <ClInclude Include="..\..\include\osisredletterwords.h" />
- <ClInclude Include="..\..\include\osisrtf.h" />
- <ClInclude Include="..\..\include\osisscripref.h" />
- <ClInclude Include="..\..\include\osisstrongs.h" />
- <ClInclude Include="..\..\include\osisvariants.h" />
- <ClInclude Include="..\..\include\osiswebif.h" />
- <ClInclude Include="..\..\include\osiswordjs.h" />
- <ClInclude Include="..\..\include\osisxhtml.h" />
- <ClInclude Include="..\..\include\osisxlit.h" />
- <ClInclude Include="..\..\include\osisreferencelinks.h" />
- <ClInclude Include="..\..\include\papyriplain.h" />
- <ClInclude Include="..\..\include\rawcom.h" />
- <ClInclude Include="..\..\include\rawcom4.h" />
- <ClInclude Include="..\..\include\rawfiles.h" />
- <ClInclude Include="..\..\include\rawgenbook.h" />
- <ClInclude Include="..\..\include\rawld.h" />
- <ClInclude Include="..\..\include\rawld4.h" />
- <ClInclude Include="..\..\include\rawstr.h" />
- <ClInclude Include="..\..\include\rawstr4.h" />
- <ClInclude Include="..\..\include\rawtext.h" />
- <ClInclude Include="..\..\include\rawtext4.h" />
- <ClInclude Include="..\..\include\rawverse.h" />
- <ClInclude Include="..\..\include\rawverse4.h" />
- <ClInclude Include="..\..\include\remotetrans.h" />
- <ClInclude Include="..\..\include\roman.h" />
- <ClInclude Include="..\..\include\rtfhtml.h" />
- <ClInclude Include="..\..\include\sapphire.h" />
- <ClInclude Include="..\..\include\scsuutf8.h" />
- <ClInclude Include="..\..\include\stringmgr.h" />
- <ClInclude Include="..\..\include\strkey.h" />
- <ClInclude Include="..\..\include\swbasicfilter.h" />
- <ClInclude Include="..\..\include\swbuf.h" />
- <ClInclude Include="..\..\include\swcacher.h" />
- <ClInclude Include="..\..\include\swcipher.h" />
- <ClInclude Include="..\..\include\swcom.h" />
- <ClInclude Include="..\..\include\swcomprs.h" />
- <ClInclude Include="..\..\include\swconfig.h" />
- <ClInclude Include="..\..\include\swdisp.h" />
- <ClInclude Include="..\..\include\swfilter.h" />
- <ClInclude Include="..\..\include\swfiltermgr.h" />
- <ClInclude Include="..\..\include\swgenbook.h" />
- <ClInclude Include="..\..\include\swkey.h" />
- <ClInclude Include="..\..\include\swld.h" />
- <ClInclude Include="..\..\include\swlocale.h" />
- <ClInclude Include="..\..\include\swlog.h" />
- <ClInclude Include="..\..\include\swmacs.h" />
- <ClInclude Include="..\..\include\swmgr.h" />
- <ClInclude Include="..\..\include\swmodule.h" />
- <ClInclude Include="..\..\include\swobject.h" />
- <ClInclude Include="..\..\include\swoptfilter.h" />
- <ClInclude Include="..\..\include\swsearchable.h" />
- <ClInclude Include="..\..\include\swtext.h" />
- <ClInclude Include="..\..\include\swversion.h" />
- <ClInclude Include="..\..\include\sysdata.h" />
- <ClInclude Include="..\..\include\teixhtml.h" />
- <ClInclude Include="..\..\include\teihtmlhref.h" />
- <ClInclude Include="..\..\include\teiplain.h" />
- <ClInclude Include="..\..\include\teirtf.h" />
- <ClInclude Include="..\..\include\thmlfootnotes.h" />
- <ClInclude Include="..\..\include\thmlgbf.h" />
- <ClInclude Include="..\..\include\thmlheadings.h" />
- <ClInclude Include="..\..\include\thmlhtml.h" />
- <ClInclude Include="..\..\include\thmlhtmlhref.h" />
- <ClInclude Include="..\..\include\thmllemma.h" />
- <ClInclude Include="..\..\include\thmlmorph.h" />
- <ClInclude Include="..\..\include\thmlosis.h" />
- <ClInclude Include="..\..\include\thmlplain.h" />
- <ClInclude Include="..\..\include\thmlrtf.h" />
- <ClInclude Include="..\..\include\thmlscripref.h" />
- <ClInclude Include="..\..\include\thmlstrongs.h" />
- <ClInclude Include="..\..\include\thmlvariants.h" />
- <ClInclude Include="..\..\include\thmlwebif.h" />
- <ClInclude Include="..\..\include\thmlwordjs.h" />
- <ClInclude Include="..\..\include\thmlxhtml.h" />
- <ClInclude Include="..\..\include\treekey.h" />
- <ClInclude Include="..\..\include\treekeyidx.h" />
- <ClInclude Include="..\..\include\unicodertf.h" />
- <ClInclude Include="..\..\include\untgz.h" />
- <ClInclude Include="..\..\include\url.h" />
- <ClInclude Include="..\..\include\utf16utf8.h" />
- <ClInclude Include="..\..\include\utf8arabicpoints.h" />
- <ClInclude Include="..\..\include\utf8arshaping.h" />
- <ClInclude Include="..\..\include\utf8bidireorder.h" />
- <ClInclude Include="..\..\include\utf8cantillation.h" />
- <ClInclude Include="..\..\include\utf8greekaccents.h" />
- <ClInclude Include="..\..\include\utf8hebrewpoints.h" />
- <ClInclude Include="..\..\include\utf8html.h" />
- <ClInclude Include="..\..\include\utf8latin1.h" />
- <ClInclude Include="..\..\include\utf8nfc.h" />
- <ClInclude Include="..\..\include\utf8nfkd.h" />
- <ClInclude Include="..\..\include\utf8transliterator.h" />
- <ClInclude Include="..\..\include\utf8utf16.h" />
- <ClInclude Include="..\..\include\utilstr.h" />
- <ClInclude Include="..\..\include\utilxml.h" />
- <ClInclude Include="..\..\include\versekey.h" />
- <ClInclude Include="..\..\include\versetreekey.h" />
- <ClInclude Include="..\..\include\versificationmgr.h" />
- <ClInclude Include="..\..\include\zcom.h" />
- <ClInclude Include="..\..\include\zconf.h" />
- <ClInclude Include="..\..\include\zipcomprs.h" />
- <ClInclude Include="..\..\include\bz2comprs.h" />
- <ClInclude Include="..\..\include\xzcomprs.h" />
- <ClInclude Include="..\..\include\zld.h" />
- <ClInclude Include="..\..\include\zlib.h" />
- <ClInclude Include="..\..\include\zstr.h" />
- <ClInclude Include="..\..\include\ztext.h" />
- <ClInclude Include="..\..\include\zverse.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\crc32.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\deflate.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\gzguts.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\inffast.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\inffixed.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\inflate.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\inftrees.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\trees.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\zconf.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\zlib.h" />
- <ClInclude Include="..\..\src\utilfuns\zlib\zutil.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{97449E5E-F880-4D22-933A-0D2FC32034D4}</ProjectGuid> + <RootNamespace>libsword</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)Release\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/D _CRT_SECURE_NO_DEPRECATE %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;../../../xz/include;../../../bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <PrecompiledHeaderOutputFile>.\Debug/libsword.pch</PrecompiledHeaderOutputFile> + <AssemblerListingLocation>.\Debug/</AssemblerListingLocation> + <ObjectFileName>.\Debug/</ObjectFileName> + <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <CompileAs>Default</CompileAs> + <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <WarningLevel>Level1</WarningLevel> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Link> + <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + <EnableCOMDATFolding>false</EnableCOMDATFolding> + <IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;../../../xz/include;../../../bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling> + </StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> + </PrecompiledHeader> + <PrecompiledHeaderOutputFile>.\Release/libsword.pch</PrecompiledHeaderOutputFile> + <AssemblerListingLocation>.\Release/</AssemblerListingLocation> + <ObjectFileName>.\Release/</ObjectFileName> + <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> + <SuppressStartupBanner>true</SuppressStartupBanner> + <CompileAs>Default</CompileAs> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <WarningLevel>Level1</WarningLevel> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Link> + <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <IgnoreSpecificDefaultLibraries> + </IgnoreSpecificDefaultLibraries> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\src\mgr\remotetrans.cpp" /> + <ClCompile Include="..\..\src\mgr\versificationmgr.cpp" /> + <ClCompile Include="..\..\src\modules\filters\cipherfil.cpp" /> + <ClCompile Include="..\..\src\mgr\curlftpt.cpp" /> + <ClCompile Include="..\..\src\mgr\curlhttpt.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbflatex.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisenum.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisglosses.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osislatex.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisxlit.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisreferencelinks.cpp" /> + <ClCompile Include="..\..\src\modules\filters\scsuutf8.cpp" /> + <ClCompile Include="..\..\src\modules\filters\teilatex.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmllatex.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8scsu.cpp" /> + <ClCompile Include="..\..\src\utilfuns\win32\dirent.cpp" /> + <ClCompile Include="..\..\src\mgr\encfiltmgr.cpp" /> + <ClCompile Include="..\..\src\modules\common\entriesblk.cpp" /> + <ClCompile Include="..\..\src\mgr\filemgr.cpp" /> + <ClCompile Include="..\..\src\utilfuns\ftpparse.c" /> + <ClCompile Include="..\..\src\modules\filters\gbffootnotes.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfheadings.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfhtml.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfhtmlhref.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfmorph.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfosis.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfplain.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfredletterwords.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfrtf.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfstrongs.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfthml.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfwebif.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfwordjs.cpp" /> + <ClCompile Include="..\..\src\modules\filters\gbfxhtml.cpp" /> + <ClCompile Include="..\..\src\modules\filters\greeklexattribs.cpp" /> + <ClCompile Include="..\..\src\modules\comments\hrefcom\hrefcom.cpp" /> + <ClCompile Include="..\..\src\mgr\installmgr.cpp" /> + <ClCompile Include="..\..\src\modules\filters\latin1utf16.cpp" /> + <ClCompile Include="..\..\src\modules\filters\latin1utf8.cpp" /> + <ClCompile Include="..\..\src\keys\listkey.cpp" /> + <ClCompile Include="..\..\src\mgr\localemgr.cpp" /> + <ClCompile Include="..\..\src\modules\common\lzsscomprs.cpp" /> + <ClCompile Include="..\..\src\mgr\markupfiltmgr.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisfootnotes.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisheadings.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osishtmlhref.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osislemma.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osismorph.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osismorphsegmentation.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisosis.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisplain.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisredletterwords.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisrtf.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisscripref.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisstrongs.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisvariants.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osiswebif.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osiswordjs.cpp" /> + <ClCompile Include="..\..\src\modules\filters\osisxhtml.cpp" /> + <ClCompile Include="..\..\src\modules\filters\papyriplain.cpp" /> + <ClCompile Include="..\..\src\modules\comments\rawcom\rawcom.cpp" /> + <ClCompile Include="..\..\src\modules\comments\rawcom4\rawcom4.cpp" /> + <ClCompile Include="..\..\src\modules\comments\rawfiles\rawfiles.cpp" /> + <ClCompile Include="..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp" /> + <ClCompile Include="..\..\src\modules\lexdict\rawld\rawld.cpp" /> + <ClCompile Include="..\..\src\modules\lexdict\rawld4\rawld4.cpp" /> + <ClCompile Include="..\..\src\modules\common\rawstr.cpp" /> + <ClCompile Include="..\..\src\modules\common\rawstr4.cpp" /> + <ClCompile Include="..\..\src\modules\texts\rawtext\rawtext.cpp" /> + <ClCompile Include="..\..\src\modules\texts\rawtext4\rawtext4.cpp" /> + <ClCompile Include="..\..\src\modules\common\rawverse.cpp" /> + <ClCompile Include="..\..\src\modules\common\rawverse4.cpp" /> + <ClCompile Include="..\..\src\utilfuns\regex.c" /> + <ClCompile Include="..\..\src\utilfuns\roman.cpp" /> + <ClCompile Include="..\..\src\modules\filters\rtfhtml.cpp" /> + <ClCompile Include="..\..\src\modules\common\sapphire.cpp" /> + <ClCompile Include="..\..\src\mgr\stringmgr.cpp" /> + <ClCompile Include="..\..\src\keys\strkey.cpp" /> + <ClCompile Include="..\..\src\modules\filters\swbasicfilter.cpp" /> + <ClCompile Include="..\..\src\utilfuns\swbuf.cpp" /> + <ClCompile Include="..\..\src\mgr\swcacher.cpp" /> + <ClCompile Include="..\..\src\modules\common\swcipher.cpp" /> + <ClCompile Include="..\..\src\modules\comments\swcom.cpp" /> + <ClCompile Include="..\..\src\modules\common\swcomprs.cpp" /> + <ClCompile Include="..\..\src\mgr\swconfig.cpp" /> + <ClCompile Include="..\..\src\frontend\swdisp.cpp" /> + <ClCompile Include="..\..\src\mgr\swfiltermgr.cpp" /> + <ClCompile Include="..\..\src\modules\genbook\swgenbook.cpp" /> + <ClCompile Include="..\..\src\keys\swkey.cpp" /> + <ClCompile Include="..\..\src\modules\lexdict\swld.cpp" /> + <ClCompile Include="..\..\src\mgr\swlocale.cpp" /> + <ClCompile Include="..\..\src\frontend\swlog.cpp" /> + <ClCompile Include="..\..\src\mgr\swmgr.cpp" /> + <ClCompile Include="..\..\src\modules\swmodule.cpp" /> + <ClCompile Include="..\..\src\utilfuns\swobject.cpp" /> + <ClCompile Include="..\..\src\modules\filters\swoptfilter.cpp" /> + <ClCompile Include="..\..\src\mgr\swsearchable.cpp" /> + <ClCompile Include="..\..\src\modules\texts\swtext.cpp" /> + <ClCompile Include="..\..\src\utilfuns\swversion.cpp" /> + <ClCompile Include="..\..\src\modules\filters\teixhtml.cpp" /> + <ClCompile Include="..\..\src\modules\filters\teihtmlhref.cpp" /> + <ClCompile Include="..\..\src\modules\filters\teiplain.cpp" /> + <ClCompile Include="..\..\src\modules\filters\teirtf.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlfootnotes.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlgbf.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlheadings.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlhtml.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlhtmlhref.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmllemma.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlmorph.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlosis.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlplain.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlrtf.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlscripref.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlstrongs.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlvariants.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlwebif.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlwordjs.cpp" /> + <ClCompile Include="..\..\src\modules\filters\thmlxhtml.cpp" /> + <ClCompile Include="..\..\src\keys\treekey.cpp" /> + <ClCompile Include="..\..\src\keys\treekeyidx.cpp" /> + <ClCompile Include="..\..\src\modules\filters\unicodertf.cpp" /> + <ClCompile Include="..\..\src\utilfuns\zlib\adler32.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\compress.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\crc32.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\deflate.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\gzclose.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\gzlib.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\gzread.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\gzwrite.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\infback.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\inffast.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\inflate.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\inftrees.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\trees.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\uncompr.c" /> + <ClCompile Include="..\..\src\utilfuns\zlib\untgz.c" /> + <ClCompile Include="..\..\src\utilfuns\url.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf16utf8.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8arabicpoints.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8arshaping.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8bidireorder.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8cantillation.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8greekaccents.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8hebrewpoints.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8html.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8latin1.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8nfc.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8nfkd.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8transliterator.cpp" /> + <ClCompile Include="..\..\src\modules\filters\utf8utf16.cpp" /> + <ClCompile Include="..\..\src\utilfuns\utilstr.cpp" /> + <ClCompile Include="..\..\src\utilfuns\utilxml.cpp" /> + <ClCompile Include="..\..\src\keys\versekey.cpp" /> + <ClCompile Include="..\..\src\keys\versetreekey.cpp" /> + <ClCompile Include="..\..\src\modules\comments\zcom\zcom.cpp" /> + <ClCompile Include="..\..\src\modules\comments\zcom4\zcom4.cpp" /> + <ClCompile Include="..\..\src\modules\common\zipcomprs.cpp" /> + <ClCompile Include="..\..\src\modules\common\bz2comprs.cpp" /> + <ClCompile Include="..\..\src\modules\common\xzcomprs.cpp" /> + <ClCompile Include="..\..\src\modules\lexdict\zld\zld.cpp" /> + <ClCompile Include="..\..\src\modules\common\zstr.cpp" /> + <ClCompile Include="..\..\src\modules\texts\ztext\ztext.cpp" /> + <ClCompile Include="..\..\src\modules\texts\ztext4\ztext4.cpp" /> + <ClCompile Include="..\..\src\modules\common\zverse.cpp" /> + <ClCompile Include="..\..\src\modules\common\zverse4.cpp" /> + <ClCompile Include="..\..\src\utilfuns\zlib\zutil.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\canon.h" /> + <ClInclude Include="..\..\include\canon_abbrevs.h" /> + <ClInclude Include="..\..\include\canon_catholic.h" /> + <ClInclude Include="..\..\include\canon_catholic2.h" /> + <ClInclude Include="..\..\include\canon_german.h" /> + <ClInclude Include="..\..\include\canon_kjva.h" /> + <ClInclude Include="..\..\include\canon_leningrad.h" /> + <ClInclude Include="..\..\include\canon_luther.h" /> + <ClInclude Include="..\..\include\canon_lxx.h" /> + <ClInclude Include="..\..\include\canon_mt.h" /> + <ClInclude Include="..\..\include\canon_nrsv.h" /> + <ClInclude Include="..\..\include\canon_nrsva.h" /> + <ClInclude Include="..\..\include\canon_null.h" /> + <ClInclude Include="..\..\include\canon_orthodox.h" /> + <ClInclude Include="..\..\include\canon_synodal.h" /> + <ClInclude Include="..\..\include\canon_synodalprot.h" /> + <ClInclude Include="..\..\include\canon_vulg.h" /> + <ClInclude Include="..\..\include\cipherfil.h" /> + <ClInclude Include="..\..\include\curlftpt.h" /> + <ClInclude Include="..\..\include\curlhttpt.h" /> + <ClInclude Include="..\..\include\defs.h" /> + <ClInclude Include="..\..\include\encfiltmgr.h" /> + <ClInclude Include="..\..\include\entriesblk.h" /> + <ClInclude Include="..\..\include\filemgr.h" /> + <ClInclude Include="..\..\include\flatapi.h" /> + <ClInclude Include="..\..\include\ftplib.h" /> + <ClInclude Include="..\..\include\ftplibftpt.h" /> + <ClInclude Include="..\..\include\ftpparse.h" /> + <ClInclude Include="..\..\include\gbffootnotes.h" /> + <ClInclude Include="..\..\include\gbfheadings.h" /> + <ClInclude Include="..\..\include\gbfhtml.h" /> + <ClInclude Include="..\..\include\gbfhtmlhref.h" /> + <ClInclude Include="..\..\include\gbflatex.h" /> + <ClInclude Include="..\..\include\gbfmorph.h" /> + <ClInclude Include="..\..\include\gbfosis.h" /> + <ClInclude Include="..\..\include\gbfplain.h" /> + <ClInclude Include="..\..\include\gbfredletterwords.h" /> + <ClInclude Include="..\..\include\gbfrtf.h" /> + <ClInclude Include="..\..\include\gbfstrongs.h" /> + <ClInclude Include="..\..\include\gbfthml.h" /> + <ClInclude Include="..\..\include\gbfwebif.h" /> + <ClInclude Include="..\..\include\gbfwordjs.h" /> + <ClInclude Include="..\..\include\gbfxhtml.h" /> + <ClInclude Include="..\..\include\greeklexattribs.h" /> + <ClInclude Include="..\..\include\hrefcom.h" /> + <ClInclude Include="..\..\include\installmgr.h" /> + <ClInclude Include="..\..\include\latin1utf16.h" /> + <ClInclude Include="..\..\include\latin1utf8.h" /> + <ClInclude Include="..\..\include\listkey.h" /> + <ClInclude Include="..\..\include\localemgr.h" /> + <ClInclude Include="..\..\include\lzsscomprs.h" /> + <ClInclude Include="..\..\include\markupfiltmgr.h" /> + <ClInclude Include="..\..\include\multimapwdef.h" /> + <ClInclude Include="..\..\include\osisenum.h" /> + <ClInclude Include="..\..\include\osisfootnotes.h" /> + <ClInclude Include="..\..\include\osisglosses.h" /> + <ClInclude Include="..\..\include\osisheadings.h" /> + <ClInclude Include="..\..\include\osishtmlhref.h" /> + <ClInclude Include="..\..\include\osislatex.h" /> + <ClInclude Include="..\..\include\osislemma.h" /> + <ClInclude Include="..\..\include\osismorph.h" /> + <ClInclude Include="..\..\include\osismorphsegmentation.h" /> + <ClInclude Include="..\..\include\osisosis.h" /> + <ClInclude Include="..\..\include\osisplain.h" /> + <ClInclude Include="..\..\include\osisredletterwords.h" /> + <ClInclude Include="..\..\include\osisrtf.h" /> + <ClInclude Include="..\..\include\osisscripref.h" /> + <ClInclude Include="..\..\include\osisstrongs.h" /> + <ClInclude Include="..\..\include\osisvariants.h" /> + <ClInclude Include="..\..\include\osiswebif.h" /> + <ClInclude Include="..\..\include\osiswordjs.h" /> + <ClInclude Include="..\..\include\osisxhtml.h" /> + <ClInclude Include="..\..\include\osisxlit.h" /> + <ClInclude Include="..\..\include\osisreferencelinks.h" /> + <ClInclude Include="..\..\include\papyriplain.h" /> + <ClInclude Include="..\..\include\rawcom.h" /> + <ClInclude Include="..\..\include\rawcom4.h" /> + <ClInclude Include="..\..\include\rawfiles.h" /> + <ClInclude Include="..\..\include\rawgenbook.h" /> + <ClInclude Include="..\..\include\rawld.h" /> + <ClInclude Include="..\..\include\rawld4.h" /> + <ClInclude Include="..\..\include\rawstr.h" /> + <ClInclude Include="..\..\include\rawstr4.h" /> + <ClInclude Include="..\..\include\rawtext.h" /> + <ClInclude Include="..\..\include\rawtext4.h" /> + <ClInclude Include="..\..\include\rawverse.h" /> + <ClInclude Include="..\..\include\rawverse4.h" /> + <ClInclude Include="..\..\include\remotetrans.h" /> + <ClInclude Include="..\..\include\roman.h" /> + <ClInclude Include="..\..\include\rtfhtml.h" /> + <ClInclude Include="..\..\include\sapphire.h" /> + <ClInclude Include="..\..\include\scsuutf8.h" /> + <ClInclude Include="..\..\include\stringmgr.h" /> + <ClInclude Include="..\..\include\strkey.h" /> + <ClInclude Include="..\..\include\swbasicfilter.h" /> + <ClInclude Include="..\..\include\swbuf.h" /> + <ClInclude Include="..\..\include\swcacher.h" /> + <ClInclude Include="..\..\include\swcipher.h" /> + <ClInclude Include="..\..\include\swcom.h" /> + <ClInclude Include="..\..\include\swcomprs.h" /> + <ClInclude Include="..\..\include\swconfig.h" /> + <ClInclude Include="..\..\include\swdisp.h" /> + <ClInclude Include="..\..\include\swfilter.h" /> + <ClInclude Include="..\..\include\swfiltermgr.h" /> + <ClInclude Include="..\..\include\swgenbook.h" /> + <ClInclude Include="..\..\include\swkey.h" /> + <ClInclude Include="..\..\include\swld.h" /> + <ClInclude Include="..\..\include\swlocale.h" /> + <ClInclude Include="..\..\include\swlog.h" /> + <ClInclude Include="..\..\include\swmacs.h" /> + <ClInclude Include="..\..\include\swmgr.h" /> + <ClInclude Include="..\..\include\swmodule.h" /> + <ClInclude Include="..\..\include\swobject.h" /> + <ClInclude Include="..\..\include\swoptfilter.h" /> + <ClInclude Include="..\..\include\swsearchable.h" /> + <ClInclude Include="..\..\include\swtext.h" /> + <ClInclude Include="..\..\include\swversion.h" /> + <ClInclude Include="..\..\include\sysdata.h" /> + <ClInclude Include="..\..\include\teilatex.h" /> + <ClInclude Include="..\..\include\teixhtml.h" /> + <ClInclude Include="..\..\include\teihtmlhref.h" /> + <ClInclude Include="..\..\include\teiplain.h" /> + <ClInclude Include="..\..\include\teirtf.h" /> + <ClInclude Include="..\..\include\thmlfootnotes.h" /> + <ClInclude Include="..\..\include\thmlgbf.h" /> + <ClInclude Include="..\..\include\thmlheadings.h" /> + <ClInclude Include="..\..\include\thmlhtml.h" /> + <ClInclude Include="..\..\include\thmlhtmlhref.h" /> + <ClInclude Include="..\..\include\thmllatex.h" /> + <ClInclude Include="..\..\include\thmllemma.h" /> + <ClInclude Include="..\..\include\thmlmorph.h" /> + <ClInclude Include="..\..\include\thmlosis.h" /> + <ClInclude Include="..\..\include\thmlplain.h" /> + <ClInclude Include="..\..\include\thmlrtf.h" /> + <ClInclude Include="..\..\include\thmlscripref.h" /> + <ClInclude Include="..\..\include\thmlstrongs.h" /> + <ClInclude Include="..\..\include\thmlvariants.h" /> + <ClInclude Include="..\..\include\thmlwebif.h" /> + <ClInclude Include="..\..\include\thmlwordjs.h" /> + <ClInclude Include="..\..\include\thmlxhtml.h" /> + <ClInclude Include="..\..\include\treekey.h" /> + <ClInclude Include="..\..\include\treekeyidx.h" /> + <ClInclude Include="..\..\include\unicodertf.h" /> + <ClInclude Include="..\..\include\untgz.h" /> + <ClInclude Include="..\..\include\url.h" /> + <ClInclude Include="..\..\include\utf16utf8.h" /> + <ClInclude Include="..\..\include\utf8arabicpoints.h" /> + <ClInclude Include="..\..\include\utf8arshaping.h" /> + <ClInclude Include="..\..\include\utf8bidireorder.h" /> + <ClInclude Include="..\..\include\utf8cantillation.h" /> + <ClInclude Include="..\..\include\utf8greekaccents.h" /> + <ClInclude Include="..\..\include\utf8hebrewpoints.h" /> + <ClInclude Include="..\..\include\utf8html.h" /> + <ClInclude Include="..\..\include\utf8latin1.h" /> + <ClInclude Include="..\..\include\utf8nfc.h" /> + <ClInclude Include="..\..\include\utf8nfkd.h" /> + <ClInclude Include="..\..\include\utf8scsu.h" /> + <ClInclude Include="..\..\include\utf8transliterator.h" /> + <ClInclude Include="..\..\include\utf8utf16.h" /> + <ClInclude Include="..\..\include\utilstr.h" /> + <ClInclude Include="..\..\include\utilxml.h" /> + <ClInclude Include="..\..\include\versekey.h" /> + <ClInclude Include="..\..\include\versetreekey.h" /> + <ClInclude Include="..\..\include\versificationmgr.h" /> + <ClInclude Include="..\..\include\zcom.h" /> + <ClInclude Include="..\..\include\zcom4.h" /> + <ClInclude Include="..\..\include\zconf.h" /> + <ClInclude Include="..\..\include\zipcomprs.h" /> + <ClInclude Include="..\..\include\bz2comprs.h" /> + <ClInclude Include="..\..\include\xzcomprs.h" /> + <ClInclude Include="..\..\include\zld.h" /> + <ClInclude Include="..\..\include\zlib.h" /> + <ClInclude Include="..\..\include\zstr.h" /> + <ClInclude Include="..\..\include\ztext.h" /> + <ClInclude Include="..\..\include\ztext4.h" /> + <ClInclude Include="..\..\include\zverse.h" /> + <ClInclude Include="..\..\include\zverse4.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\crc32.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\deflate.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\gzguts.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\inffast.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\inffixed.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\inflate.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\inftrees.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\trees.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\zconf.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\zlib.h" /> + <ClInclude Include="..\..\src\utilfuns\zlib\zutil.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/locales.d/be-utf8.conf b/locales.d/be-utf8.conf new file mode 100644 index 0000000..b7a845f --- /dev/null +++ b/locales.d/be-utf8.conf @@ -0,0 +1,185 @@ +# Belarussian BIBLE + +[Meta] +Name=be +Description=Belarussian (Unicode) +Encoding=UTF-8 + +[Text] +Genesis=Быцьцё +Exodus=Выхад +Leviticus=Лявіт +Numbers=Лікі +Deuteronomy=Другі закон +Joshua=Ісус Нав +Judges=Кніга Судзьдзяў +Ruth=Рут +1 Samuel=Першая Царстваў +2 Samuel=Другая Царстваў +1 Kings=Трэйцяя Царстваў +2 Kings=Чацьвёртая Царстваў +1 Chronicles=Першая Летапісаў +2 Chronicles=Другая Летапісаў +Ezra=Эздра +Nehemiah=Нээмія +Esther=Эстэр +Job=Ёв +Psalms=Псалтыр +Proverbs=Выслоўі +Ecclesiastes=Эклезіяст +Song of Solomon=Песьня +Isaiah=Ісая +Jeremiah=Ерамія +Lamentations=Плач +Ezekiel=Езэкііль +Daniel=Данііл +Hosea=Асія +Joel=Ёіль +Amos=Амос +Obadiah=Аўдзей +Jonah=Ёна +Micah=Міхей +Nahum=Навум +Habakkuk=Абакум +Zephaniah=Сафон +Haggai=Агей +Zechariah=Захарыя +Malachi=Малахія +Matthew=Мацьвея +Mark=Марка +Luke=Лукаш +John=Яна +Acts=Дзеі +Romans=Да Рымлянаў +1 Corinthians=Першае да Карынфянаў +2 Corinthians=Другое да Карынфянаў +Galatians=Да Галятаў +Ephesians=Да Эфэсянаў +Philippians=Да Піліпянаў +Colossians=Да Каласянаў +1 Thessalonians=Першае да Фесаланікійцаў +2 Thessalonians=Другое да Фесаланікійцаў +1 Timothy=Першае да Цімафея +2 Timothy=Другое да Цімафея +Titus=Да Ціта +Philemon=Да Філімона +Hebrews=Да Габрэяў +James=Якава +1 Peter=Першае Пятра +2 Peter=Другое Пятра +1 John=Першае Яна +2 John=Другое Яна +3 John=Трэйцяе Яна +Jude=Юда +Revelation=Адкрыцьцё + +[Book Abbrevs] +Быцьцё=Gen +Быц=Gen +Быцьцё=Gen +Выхад=Exo +Лявіт=Lev +Лікі=Num +Другі закон=Deu +Ісус Нав=Jos +Кніга Судзьдзяў=Jdg +Рут=Rut + +Першая Царстваў=1Sa +Другая Царстваў=2Sa +Трэйцяя Царстваў=1Ki +Чацьвёртая Царстваў=2Ki +Першая Летапісаў=1Ch +Другая Летапісаў=2Ch + +1 Царстваў=1Sa +2 Царстваў=2Sa +3 Царстваў=1Ki +4 Царстваў=2Ki +1 Летапісаў=1Ch +2 Летапісаў=2Ch + +1Царстваў=1Sa +2Царстваў=2Sa +3Царстваў=1Ki +4Царстваў=2Ki +1Летапісаў=1Ch +1Летапісаў=2Ch + +Эздра=Ezr +Нээмія=Neh +Эстэр=Est +Ёв=Job +Псалтыр=Psa +Выслоўі=Pro +Эклезіяст=Ecc +Песьня=Sng +Ісая=Isa +Ерамія=Jer +Плач=Lam +Езэкііль=Ezk +Данііл=Dan +Асія=Hos +Ёіль=Jol +Амос=Amo +Аўдзей=Oba +Ёна=Jnh +Міхей=Mic +Навум=Nah +Абакум=Hab +Сафон=Zep +Агей=Hag +Захарыя=Zec +Малахія=Mal +Мацьвея=Mat +Марка=Mrk +Лукаш=Luk +Яна=Jhn +Дзеі=Act +Да Рымлянаў=Rom +Першае да Карынфянаў=1Co +Другое да Карынфянаў=2Co +1Карынфянаў=1Co +2Карынфянаў=2Co +1 Карынфянаў=1Co +2 Карынфянаў=2Co + +Да Галятаў=Gal +Да Эфэсянаў=Eph +Да Піліпянаў=Php +Да Каласянаў=Col +Першае да Фесаланікійцаў=1Th +Другое да Фесаланікійцаў=2Th +Першае да Цімафея=1Ti +Другое да Цімафея=2Ti +1Фесаланікійцаў=1Th +2Фесаланікійцаў=2Th +1Цімафея=1Ti +2Цімафея=2Ti + +1 Фесаланікійцаў=1Th +2 Фесаланікійцаў=2Th +1 Цімафея=1Ti +2 Цімафея=2Ti + +Да Ціта=Tts +Да Філімона=Phm +Да Габрэяў=Heb +Якава=Jam +Першае Пятра=1Pe +Другое Пятра=2Pe +Першае Яна=1Jn +Другое Яна=2Jn +Трэйцяе Яна=3Jn +1Пятра=1Pe +2Пятра=2Pe +1Яна=1Jn +2Яна=2Jn +3Яна=3Jn +1 Пятра=1Pe +2 Пятра=2Pe +1 Яна=1Jn +2 Яна=2Jn +3 Яна=3Jn +Юда=Jde +Адкрыцьцё=Rev diff --git a/locales.d/fr-utf8.conf b/locales.d/fr-utf8.conf index 6b7cc91..668a814 100644 --- a/locales.d/fr-utf8.conf +++ b/locales.d/fr-utf8.conf @@ -1,75 +1,350 @@ +# File creation: 2017-01-20 +# French translation for Sword +# Provided by yvand <yvand.sword@gmail.com>, Cyrille <lafricain79@gmail.com>, domcox <dominique@corbex.org> + [Meta] Name=fr Description=French (Unicode) Encoding=UTF-8 [Text] +# Old Testament* (39) +# Genesis Genesis=Genèse +# Exodus Exodus=Exode +# Leviticus Leviticus=Lévitique +# Numbers Numbers=Nombres +# Deuteronomy Deuteronomy=Deutéronome +# Joshua Joshua=Josué +# Judges Judges=Juges +# Ruth Ruth=Ruth +# I Samuel I Samuel=1 Samuel +# II Samuel II Samuel=2 Samuel +# I Kings I Kings=1 Rois +# II Kings II Kings=2 Rois +# I Chronicles I Chronicles=1 Chroniques +# II Chronicles II Chronicles=2 Chroniques +# Ezra Ezra=Esdras +# Nehemiah Nehemiah=Néhémie +# Esther Esther=Esther +# Job Job=Job +# Psalms Psalms=Psaumes +# Proverbs Proverbs=Proverbes -Ecclesiastes=Ecclésiaste +# Ecclesiastes +Ecclesiastes=Ecclésiaste ou Qohélet +# Song of Solomon Song of Solomon=Cantique des cantiques +# Isaiah Isaiah=Ésaïe +# Jeremiah Jeremiah=Jérémie +# Lamentations Lamentations=Lamentations de Jérémie +# Ezekiel Ezekiel=Ézéchiel +# Daniel Daniel=Daniel +# Hosea Hosea=Osée +# Joel Joel=Joël +# Amos Amos=Amos +# Obadiah Obadiah=Abdias +# Jonah Jonah=Jonas +# Micah Micah=Michée +# Nahum Nahum=Nahum -Habakkuk=Habakuk +# Habakkuk +Habakkuk=Habacuc +# Zephaniah Zephaniah=Sophonie +# Haggai Haggai=Aggée +# Zechariah Zechariah=Zacharie +# Malachi Malachi=Malachie + +# New Testament* (27) +# Matthew Matthew=Matthieu +# Mark Mark=Marc +# Luke Luke=Luc +# John John=Jean -Acts=Actes +# Acts +Acts=Actes des Apôtres +# Romans Romans=Romains +# I Corinthians I Corinthians=1 Corinthiens +# II Corinthians II Corinthians=2 Corinthiens +# Galatians Galatians=Galates +# Ephesians Ephesians=Éphésiens +# Philippians Philippians=Philippiens +# Colossians Colossians=Colossiens +# I Thessalonians I Thessalonians=1 Thessaloniciens +# II Thessalonians II Thessalonians=2 Thessaloniciens +# I Timothy I Timothy=1 Timothée +# II Timothy II Timothy=2 Timothée +# Titus Titus=Tite +# Philemon Philemon=Philémon +# Hebrews Hebrews=Hébreux +# James James=Jacques +# I Peter I Peter=1 Pierre +# II Peter II Peter=2 Pierre +# I John I John=1 Jean +# II John II John=2 Jean +# III John III John=3 Jean +# Jude Jude=Jude -Revelation of John=Apocalypse +# Revelation of John +Revelation of John=Apocalypse de Jean + +# Apocrypha/Deuterocanon* (22) +# Tobit +Tobit=Tobie +# Judith +Judith=Judith +# Esther (Greek) +Esther (Greek)=Esther grec +# Additions to Esther +Additions to Esther=Additions à Esther +# Wisdom +Wisdom=Sagesse +# Sirach (Prologue) +Sirach (Prologue)=Prologue du Siracide +# Sirach +Sirach=Siracide +# Baruch +Baruch=Baruch +# Epistle of Jeremiah +Epistle of Jeremiah=Lettre de Jérémie +# Daniel (Greek) +Daniel (Greek)=Daniel grec +# Additions to Daniel +Additions to Daniel=Additions à Daniel +# Prayer of Azariah +Prayer of Azariah=Prière d’Azarias +# Susanna +Susanna=Suzanne +# Bel and the Dragon +Bel and the Dragon=Bel et le dragon +# I Maccabees +I Maccabees=1 Maccabées +# II Maccabees +II Maccabees=2 Maccabées +# III Maccabees +III Maccabees=3 Maccabées +# IV Maccabees +IV Maccabees=4 Maccabées +# Prayer of Manasses +Prayer of Manasses=Prière de Manassé +# I Esdras +I Esdras=1 Esdras +# II Esdras +II Esdras=2 Esdras +# Additional Psalm +Additional Psalm=Psaume 151 + +# Rahlfs' LXX* (2) +# Odes +Odes=Odes de Salomon +# Psalms of Solomon +Psalms of Solomon=Psaumes de Salomon + +# Rahlfs' variant books* (6) +# Joshua Codex Alexandrinus +Joshua Codex Alexandrinus=Josué (Alexandrinus) +# Judges Codex Vaticanus +Judges Codex Vaticanus=Juges (Vaticanus) +# Tobit Codex Sinaiticus +Tobit Codex Sinaiticus=Tobie (Sinaiticus) +# Susanna Theodotion +Susanna Theodotion=Suzanne (Théodotion) +# Daniel Theodotion +Daniel Theodotion=Daniel (Théodotion) +# Bel and the Dragon Theodotion +Bel and the Dragon Theodotion=Bel et le dragon (Théodotion) + +# Vulgate & other later Latin mss* (6) +# Laodiceans +Laodiceans=Laodicéens +# V Ezra +V Ezra=V Esdras +# IV Ezra +IV Ezra=Apocalypse d’Esdras +# VI Ezra +VI Ezra=VI Esdras +# Prayer of Solomon +Prayer of Solomon=Prière de Salomon +# Prayer of Jeremiah +Prayer of Jeremiah=Prière de Jérémie + +# Ethiopian Orthodox Canon/Ge'ez Translation Additions (7) +# I Enoch +I Enoch=Hénoch +# Jubilees +Jubilees=Jubilés +# IV Baruch +IV Baruch=4 Baruch +# I Meqabyan +I Meqabyan=1 Maccabées éthiopiens +# II Meqabyan +II Meqabyan=2 Maccabées éthiopiens +# III Meqabyan +III Meqabyan=3 Maccabées éthiopiens +# Reproof +#Reproof= +# Additions to Jeremiah +#Additions to Jeremiah= +# Pseudo-Josephus +#Pseudo-Josephus= + +# Armenian Orthodox Canon Additions (7/19) +# Epistle of the Corinthians to Paul +Epistle of the Corinthians to Paul=Lettre des Corinthiens à l’Apôtre Paul +# III Corinthians +III Corinthians=3 Corinthiens +# Words of Sirach +#Words of Sirach= +# Prayer of Euthalius +#Prayer of Euthalius= +# Dormition of John +Dormition of John=Dormition de Marie du Pseudo-Jean +# Joseph and Asenath +Joseph and Asenath=Joseph et Aséneth +# Testaments of the Twelve Patriarchs (composed of:) +Testaments of the Twelve Patriarchs (composed of:)=Testaments des 12 Patriarches +# Testament of Asher +Testament of Asher=Testament d’Aser +# Testament of Benjamin +Testament of Benjamin=Testament de Benjamin +# Testament of Dan +Testament of Dan=Testament de Dan +# Testament of Gad +Testament of Gad=Testament de Gad +# Testament of Issachar +Testament of Issachar=Testament d’Issacar +# Testament of Joseph +Testament of Joseph=Testament de Joseph +# Testament of Judah +Testament of Judah=Testament de Juda +# Testament of Levi +Testament of Levi=Testament de Lévi +# Testament of Naphtali +Testament of Naphtali=Testament de Nephtali +# Testament of Reuben +Testament of Reuben=Testament de Ruben +# Testament of Simeon +Testament of Simeon=Testament de Siméon +# Testament of Zebulun +Testament of Zebulun=Testament de Zabulon + +# Peshitta/Syriac Orthodox Canon (4) +# II Baruch +#II Baruch= +# Letter of Baruch +#Letter of Baruch= +# Additional Syriac Psalms +Additional Syriac Psalms=Psaumes surnuméraires +# Josephus' Jewish War VI +#Josephus' Jewish War VI= + +# Apostolic Fathers (19/22) +# I Clement +I Clement=1 Clément +# II Clement +II Clement=2 Clément +# Ignatius to the Ephesians +Ignatius to the Ephesians=Ignace aux Éphésiens +# Ignatius to the Magnesians +Ignatius to the Magnesians=Ignace aux Magnésiens +# Ignatius to the Trallians +Ignatius to the Trallians=Ignace aux Tralliens +# Ignatius to the Romans +Ignatius to the Romans=Ignace aux Romains +# Ignatius to the Philadelphians +Ignatius to the Philadelphians=Ignace aux Philadelphiens +# Ignatius to the Smyrnaeans +Ignatius to the Smyrnaeans=Ignace aux Smyrniens +# Ignatius to Polycarp +Ignatius to Polycarp=Ignace d’Antioche à Polycarpe +# Polycarp to the Philippians +Polycarp to the Philippians=Polycarpe aux Philippiens +# Martyrdom of Polycarp +Martyrdom of Polycarp=Martyr de Polycarpe +# Didache +Didache=Didachè +# Barnabas +Barnabas=Épître de Barnabé +# Shepherd of Hermas (comprised of:) +Shepherd of Hermas (comprised of:)=Pasteur d’Hermas +# Shepherd of Hermas, Mandates +#Shepherd of Hermas, Mandates= +# Shepherd of Hermas, Similitudes +#Shepherd of Hermas, Similitudes= +# Shepherd of Hermas, Visions +#Shepherd of Hermas, Visions= +# Diognetus +#Diognetus= +# Apostles' Creed +#Apostles' Creed= +# Fragments of Papias +Fragments of Papias=Fragments de Papias +# Reliques of the Elders +#Reliques of the Elders= +# Fragment of Quadratus +#Fragment of Quadratus= + +# Other (2) +# Diatessaron +Diatessaron=Diatessaron +# Metrical Psalms +#Metrical Psalms= [Book Abbrevs] GENÈSE=Gen @@ -92,9 +367,9 @@ ESTHER=Esth JOB=Job PSAUMES=Ps PROVERBES=Prov -ECCLÉSIASTE=Eccl +ECCLÉSIASTE OU QOHÉLET=Eccl CANTIQUE DES CANTIQUES=Song -ESAÏE=Isa +ÉSAÏE=Isa JÉRÉMIE=Jer LAMENTATIONS DE JÉRÉMIE=Lam ÉZÉCHIEL=Ezek @@ -106,22 +381,21 @@ ABDIAS=Obad JONAS=Jonah MICHÉE=Mic NAHUM=Nah -HABAKUK=Hab +HABACUC=Hab SOPHONIE=Zeph AGGÉE=Hag ZACHARIE=Zech -ZACCHARIE=Zech MALACHIE=Mal MATTHIEU=Matt MARC=Mark LUC=Luke JEAN=John -ACTES=Acts +ACTES DES APÔTRES=Acts ROMAINS=Rom 1 CORINTHIENS=1Cor 2 CORINTHIENS=2Cor GALATES=Gal -EPHÉSIENS=Eph +ÉPHÉSIENS=Eph PHILIPPIENS=Phil COLOSSIENS=Col 1 THESSALONICIENS=1Thess @@ -138,127 +412,285 @@ JACQUES=Jas 2 JEAN=2John 3 JEAN=3John JUDE=Jude -APOCALYPSE=Rev +APOCALYPSE DE JEAN=Rev +TOBIE=Tob +JUDITH=Jdt +ESTHER GREC=EsthGr +ADDITIONS À ESTHER=AddEsth +SAGESSE=Wis +PROLOGUE DU SIRACIDE=SirP +SIRACIDE=Sir +BARUCH=Bar +LETTRE DE JÉRÉMIE=EpJer +DANIEL GREC=DanGr +ADDITIONS À DANIEL=AddDan +PRIÈRE D’AZARIAS=PrAzar +SUZANNE=Sus +BEL ET LE DRAGON=Bel +1 MACCABÉES=1Macc +2 MACCABÉES=2Macc +3 MACCABÉES=3Macc +4 MACCABÉES=4Macc +PRIÈRE DE MANASSÉ=PrMan +1 ESDRAS=1Esd +2 ESDRAS=2Esd +PSAUME 151=AddPs +ODES DE SALOMON=Odes +PSAUMES DE SALOMON=PssSol +JOSUÉ (ALEXANDRINUS)=JoshA +JUGES (VATICANUS)=JudgB +TOBIE (SINAITICUS)=TobS +SUZANNE (THÉODOTION)=SusTh +DANIEL (THÉODOTION)=DanTh +BEL ET LE DRAGON (THÉODOTION)=BelTh +LAODICÉENS=EpLao +V ESDRAS=5Ezra +APOCALYPSE D’ESDRAS=4Ezra +VI ESDRAS=6Ezra +PRIÈRE DE SALOMON=PrSol +PRIÈRE DE JÉRÉMIE=PrJer +HÉNOCH=1En +JUBILÉS=Jub +4 BARUCH=4Bar +1 MACCABÉES ÉTHIOPIENS=1Meq +2 MACCABÉES ÉTHIOPIENS=2Meq +3 MACCABÉES ÉTHIOPIENS=3Meq +LETTRE DES CORINTHIENS À L’APÔTRE PAUL=EpCorPaul +3 CORINTHIENS=3Cor +DORMITION DE MARIE DU PSEUDO-JEAN=DormJohn +JOSEPH ET ASÉNETH=JosAsen +TESTAMENTS DES 12 PATRIARCHES=T12Patr +TESTAMENT D’ASER=T12Patr.Tash +TESTAMENT DE BENJAMIN=T12Patr.Tbenj +TESTAMENT DE DAN=T12Patr.Tdan +TESTAMENT DE GAD=T12Patr.Tgad +TESTAMENT D’ISSACAR=T12Patr.Tiss +TESTAMENT DE JOSEPH=T12Patr.Tjos +TESTAMENT DE JUDA=T12Patr.Tjud +TESTAMENT DE LÉVI=T12Patr.Tlevi +TESTAMENT DE NEPHTALI=T12Patr.Tnaph +TESTAMENT DE RUBEN=T12Patr.Treu +TESTAMENT DE SIMÉON=T12Patr.Tsim +TESTAMENT DE ZABULON=T12Patr.Tzeb +PSAUMES SURNUMÉRAIRES=5ApocSyrPss +1 CLÉMENT=1Clem +2 CLÉMENT=2Clem +IGNACE AUX ÉPHÉSIENS=IgnEph +IGNACE AUX MAGNÉSIENS=IgnMagn +IGNACE AUX TRALLIENS=IgnTrall +IGNACE AUX ROMAINS=IgnRom +IGNACE AUX PHILADELPHIENS=IgnPhld +IGNACE AUX SMYRNIENS=IgnSmyrn +IGNACE D’ANTIOCHE À POLYCARPE=IgnPol +POLYCARPE AUX PHILIPPIENS=PolPhil +MARTYR DE POLYCARPE=MartPol +DIDACHÈ=Did +ÉPÎTRE DE BARNABÉ=Barn +PASTEUR D’HERMAS=Herm +FRAGMENTS DE PAPIAS=PapFrag +DIATESSARON=TatDiat -1 C=1Cor 1C=1Cor -1 CH=1Chr +1 C=1Cor 1CH=1Chr -1 CHR=1Chr +1 CH=1Chr 1CHR=1Chr -1 CHRO=1Chr -1CHRO=1Chr -1 CO=1Cor +1 CHR=1Chr +1CHRON=1Chr +1 CHRON=1Chr +1CLEM=1Clem +1 CLEM=1Clem +1CLÉM=1Clem +1 CLÉM=1Clem 1CO=1Cor -1 COR=1Cor +1 CO=1Cor 1COR=1Cor -1 J=1John +1 COR=1Cor 1J=1John -1 JE=1John +1 J=1John 1JE=1John -1 JEA=1John +1 JE=1John 1JEA=1John -1 JN=1John +1 JEA=1John 1JN=1John -1 P=1Pet +1 JN=1John +1M=1Macc +1 M=1Macc +1MA=1Macc +1 MA=1Macc +1MAC=1Macc +1 MAC=1Macc +1MÉT=1Meq +1 MÉT=1Meq +1 M ÉT=1Meq 1P=1Pet -1 PI=1Pet +1 P=1Pet 1PI=1Pet -1 PIE=1Pet +1 PI=1Pet 1PIE=1Pet -1 R=1Kgs +1 PIE=1Pet 1R=1Kgs -1 RO=1Kgs +1 R=1Kgs 1RO=1Kgs -1 ROI=1Kgs +1 RO=1Kgs 1ROI=1Kgs -1 S=1Sam +1 ROI=1Kgs 1S=1Sam -1 SA=1Sam +1 S=1Sam 1SA=1Sam -1 SAM=1Sam +1 SA=1Sam 1SAM=1Sam -1 T=1Thess -1T=1Thess -1 TH=1Thess +1 SAM=1Sam +1T=1Tim +1 T=1Tim 1TH=1Thess -1 THE=1Thess +1 TH=1Thess 1THE=1Thess -1 TI=1Tim +1 THE=1Thess +1THESS=1Thess +1 THESS=1Thess 1TI=1Tim -1 TIM=1Tim +1 TI=1Tim 1TIM=1Tim -1 TIMOTHEE=1Tim +1 TIM=1Tim 1TIMOTHEE=1Tim -1 TM=1Tim +1 TIMOTHEE=1Tim 1TM=1Tim -2 C=2Cor +1 TM=1Tim 2C=2Cor -2 CH=2Chr +2 C=2Cor 2CH=2Chr -2 CHR=2Chr +2 CH=2Chr 2CHR=2Chr -2 CHRO=2Chr -2CHRO=2Chr -2 CO=2Cor +2 CHR=2Chr +2CHRON=2Chr +2 CHRON=2Chr +2CLEM=2Clem +2 CLEM=2Clem +2CLÉM=2Clem +2 CLÉM=2Clem 2CO=2Cor -2 COR=2Cor +2 CO=2Cor 2COR=2Cor -2 J=2John +2 COR=2Cor 2J=2John -2 JE=2John +2 J=2John 2JE=2John -2 JEA=2John +2 JE=2John 2JEA=2John -2 JN=2John +2 JEA=2John 2JN=2John -2 P=2Pet +2 JN=2John +2M=2Macc +2 M=2Macc +2MA=2Macc +2 MA=2Macc +2MAC=2Macc +2 MAC=2Macc +2MÉT=2Meq +2 MÉT=2Meq +2 M ÉT=2Meq 2P=2Pet -2 PI=2Pet +2 P=2Pet 2PI=2Pet -2 PIE=2Pet +2 PI=2Pet 2PIE=2Pet -2 R=2Kgs +2 PIE=2Pet 2R=2Kgs -2 RO=2Kgs +2 R=2Kgs 2RO=2Kgs -2 ROI=2Kgs +2 RO=2Kgs 2ROI=2Kgs -2 S=2Sam +2 ROI=2Kgs 2S=2Sam -2 SA=2Sam +2 S=2Sam 2SA=2Sam -2 SAM=2Sam +2 SA=2Sam 2SAM=2Sam -2 T=2Thess -2T=2Thess -2 TH=2Thess +2 SAM=2Sam +2T=2Tim +2 T=2Tim 2TH=2Thess -2 THE=2Thess +2 TH=2Thess 2THE=2Thess -2 TI=2Tim +2 THE=2Thess +2THESS=2Thess +2 THESS=2Thess 2TI=2Tim -2 TIM=2Tim +2 TI=2Tim 2TIM=2Tim -2 TIMOTHEE=2Tim +2 TIM=2Tim 2TIMOTHEE=2Tim -2 TM=2Tim +2 TIMOTHEE=2Tim 2TM=2Tim -3 J=3John +2 TM=2Tim +3C=3Cor +3 C=3Cor +3CO=3Cor +3 CO=3Cor +3COR=3Cor +3 COR=3Cor +3E=1Esd +3 E=1Esd +3ES=1Esd +3 ES=1Esd +3ESD=1Esd +3 ESD=1Esd 3J=3John -3 JE=3John +3 J=3John 3JE=3John -3 JEA=3John +3 JE=3John 3JEA=3John -3 JN=3John +3 JEA=3John 3JN=3John -A=Acts +3 JN=3John +3M=3Macc +3 M=3Macc +3MA=3Macc +3 MA=3Macc +3MAC=3Macc +3 MAC=3Macc +3MÉT=3Meq +3 MÉT=3Meq +3 M ÉT=3Meq +4BAR=4Bar +4 BAR=4Bar +4E=2Esd +4 E=2Esd +4ES=2Esd +4 ES=2Esd +4ESD=2Esd +4 ESD=2Esd +4M=4Macc +4 M=4Macc +4MA=4Macc +4 MA=4Macc +4MAC=4Macc +4 MAC=4Macc +5E=5Ezra +5 E=5Ezra +5ES=5Ezra +5 ES=5Ezra +5ESD=5Ezra +5 ESD=5Ezra +6E=6Ezra +6 E=6Ezra +6ES=6Ezra +6 ES=6Ezra +6ESD=6Ezra +6 ESD=6Ezra AB=Obad ABD=Obad -ABDI=Obad AC=Acts ACT=Acts -ACTE=Acts +ACTES=Acts +ACTS=Acts +ADDDAN=AddDan +ADD DAN=AddDan +ADDDN=AddDan +ADD DN=AddDan +ADDEST=AddEsth +ADD EST=AddEsth AG=Hag AGG=Hag AGGE=Hag @@ -267,9 +699,19 @@ AGGEE=Hag AM=Amos AMO=Amos AP=Rev +APE=4Ezra +AP ES=4Ezra +APESD=4Ezra +AP ESD=4Ezra APO=Rev APOC=Rev -B=Heb +APOCALYPSE=Rev +BA=Bar +BAR=Bar +BE=Bel +BEL=Bel +BELTH=BelTh +BL=Bel CA=Song CAN=Song CANT=Song @@ -277,27 +719,45 @@ CDC=Song CO=Col COL=Col COLO=Col +COP=EpCorPaul CT=Song +D=Deut DA=Dan DAN=Dan +DANGREC=DanGr +DAN GREC=DanGr DANI=Dan +DANTH=DanTh DE=Deut DEU=Deut DEUT=Deut DEUTERONOME=Deut +DID=Did +DIDAC=Did +DIDACHE=Did +DIDACHÉ=Did DN=Dan +DNG=DanGr +DN G=DanGr +DNGREC=DanGr +DN GREC=DanGr +DORMJEAN=DormJohn DT=Deut E=Exod -É=Eph EC=Eccl -ECC=Eccl -ECCL=Eccl -ECCLESIASTE=Eccl ÉC=Eccl +ECC=Eccl ÉCC=Eccl +ECCL=Eccl ÉCCL=Eccl -ECL=Eccl -ÉCL=Eccl +ECCLESIASTE=Eccl +ECCLÉSIASTE=Eccl +ECCLESIASTIQUE=Sir +ECCLÉSIASTIQUE=Sir +EN=1En +ÉN=1En +ENOCH=1En +ÉNOCH=1En EP=Eph ÉP=Eph EPH=Eph @@ -305,9 +765,9 @@ EPH=Eph EPHE=Eph ÉPHE=Eph EPHÉ=Eph -ÉPHÉ=Eph EPHESIENS=Eph -ÉPHÉSIENS=Eph +ÉPHESIENS=Eph +EPHÉSIENS=Eph ES=Isa ÉS=Isa ESA=Isa @@ -317,17 +777,23 @@ ESAÏ=Isa ÉSAÏ=Isa ESAIE=Isa ÉSAIE=Isa +ESAÏE=Isa ÉSAÏE=Isa ESD=Ezra -ESDR=Ezra ÉSD=Ezra +ESDR=Ezra EST=Esth -ESTH=Esth ÉST=Esth +ESTG=EsthGr +EST G=EsthGr +ESTGREC=EsthGr +EST GREC=EsthGr +ESTH=Esth EX=Exod EXO=Exod EXOD=Exod EZ=Ezek +ÉZ=Ezek EZE=Ezek ÉZE=Ezek EZÉ=Ezek @@ -337,46 +803,170 @@ EZEC=Ezek EZÉC=Ezek ÉZÉC=Ezek EZECHIEL=Ezek -F=Eph G=Gen GA=Gal GAL=Gal -GALA=Gal +GALAT=Gal GE=Gen +GÉ=Gen GEN=Gen +GÉN=Gen GENE=Gen GENÈ=Gen GENESE=Gen -GÉ=Gen -GÉN=Gen GN=Gen -H=Hab HA=Hab HAB=Hab HABA=Hab -HABACUC=Hab +HABAKUK=Hab HABAQUQ=Hab HE=Heb HÉ=Heb HEB=Heb HÉB=Heb +HEBR=Heb +HÉBR=Heb HEBREUX=Heb -I=Isa +HEN=1En +HÉN=1En +HENOC=1En +HENOCH=1En +HERM=Herm +IC=1Cor +I C=1Cor +ICH=1Chr +I CH=1Chr +ICHR=1Chr +I CHR=1Chr +ICHRONIQUES=1Chr +I CHRONIQUES=1Chr +ICO=1Cor +I CO=1Cor +ICOR=1Cor +I COR=1Cor +I CORINTHIENS=1Cor +IIC=2Cor +II C=2Cor +IICH=2Chr +II CH=2Chr +IICHR=2Chr +II CHR=2Chr +IICHRONIQUES=2Chr +II CHRONIQUES=2Chr +IICO=2Cor +II CO=2Cor +IICOR=2Cor +II COR=2Cor +II CORINTHIENS=2Cor +IIIJ=3John +III J=3John +IIIJE=3John +III JE=3John +IIIJEA=3John +III JEA=3John +IIIJN=3John +III JN=3John +IIJ=2John +II J=2John +IIJE=2John +II JE=2John +IIJEA=2John +II JEA=2John +IIJN=2John +II JN=2John +IIP=2Pet +II P=2Pet +IIPI=2Pet +II PI=2Pet +IIPIE=2Pet +II PIE=2Pet +IIR=2Kgs +II R=2Kgs +IIRO=2Kgs +II RO=2Kgs +IIROIS=2Kgs +II ROIS=2Kgs +II S=2Sam +II SA=2Sam +IISAM=2Sam +II SAM=2Sam +II SAMUEL=2Sam +IIT=2Tim +II T=2Tim +IITH=2Thess +II TH=2Thess +IITHE=2Thess +II THE=2Thess +IITHESS=2Thess +II THESS=2Thess +II THESSALONICIENS=2Thess +IITI=2Tim +II TI=2Tim +IITIM=2Tim +II TIM=2Tim +IITIMOTHEE=2Tim +II TIMOTHEE=2Tim +II TIMOTHÉE=2Tim +IITM=2Tim +II TM=2Tim +IJ=1John +I J=1John +IJE=1John +I JE=1John +IJEA=1John +I JEA=1John +IJN=1John +I JN=1John +IP=1Pet +I P=1Pet +IPI=1Pet +I PI=1Pet +IPIE=1Pet +I PIE=1Pet +IR=1Kgs +I R=1Kgs +IRO=1Kgs +I RO=1Kgs +IROIS=1Kgs +I ROIS=1Kgs IS=Isa +I S=1Sam ISA=Isa +I SA=1Sam ISAI=Isa ISAÏ=Isa ISAIE=Isa -J=Josh +ISAM=1Sam +I SAM=1Sam +I SAMUEL=1Sam +IT=1Tim +I T=1Tim +ITH=1Thess +I TH=1Thess +ITHE=1Thess +I THE=1Thess +ITHESS=1Thess +I THESS=1Thess +I THESSALONICIENS=1Thess +ITI=1Tim +I TI=1Tim +ITIM=1Tim +I TIM=1Tim +ITIMOTHEE=1Tim +I TIMOTHEE=1Tim +I TIMOTHÉE=1Tim +ITM=1Tim +I TM=1Tim JA=Jas JAC=Jas JACQ=Jas JB=Job JC=Jas JD=Jude -JÉ=Jer +JDT=Jdt JE=John -JEA=John +JÉ=Jer +JEAN=John JER=Jer JÉR=Jer JERE=Jer @@ -385,8 +975,10 @@ JERÉ=Jer JÉRÉ=Jer JEREMIE=Jer JG=Judg +JGV=JudgB JL=Joel JN=John +JO=Joel JOB=Job JOE=Joel JOË=Joel @@ -394,18 +986,27 @@ JOEL=Joel JON=Jonah JONA=Jonah JOS=Josh +JOSA=JoshA +JOSASEN=JosAsen JOSUE=Josh JR=Jer JS=Josh -JU=Judg +JU=Jude +JUB=Jub +JUBILES=Jub JUD=Jude +JUDE=Jude +JUDI=Jdt JUG=Judg JUGE=Judg -K=Hab L=Lev LA=Lam LAM=Lam LAME=Lam +LAMENT=Lam +LAO=EpLao +LAOD=EpLao +LAODICEENS=EpLao LC=Luke LDJ=Lam LE=Lev @@ -416,14 +1017,17 @@ LEVI=Lev LÉVI=Lev LEVITIQUE=Lev LM=Lam +LTJR=EpJer +LT JR=EpJer LU=Luke LUC=Luke LV=Lev -M=Matt MA=Mal MAL=Mal MALA=Mal +MAN=PrMan MAR=Mark +MARC=Mark MAT=Matt MATT=Matt MC=Mark @@ -437,7 +1041,7 @@ MT=Matt N=Num NA=Nah NAH=Nah -NAHU=Hab +NAHOUM=Nah NB=Num NE=Neh NÉ=Neh @@ -451,7 +1055,9 @@ NEHEMIE=Neh NO=Num NOM=Num NOMB=Num -O=Hos +OD=Odes +ODE=Odes +ODES=Odes OS=Hos OSE=Hos OSÉ=Hos @@ -463,19 +1069,46 @@ PHIL=Phil PHILEMON=Phlm PHLM=Phlm PHM=Phlm +PHP=Phil PR=Prov +PRA=PrAzar +PR A=PrAzar +PRAZAR=PrAzar PRE=Eccl PRÉ=Eccl PRED=Eccl PRÉD=Eccl PREDICATEUR=Eccl +PRJ=PrJer +PR J=PrJer +PRJER=PrJer +PR JER=PrJer +PRJÉR=PrJer +PR JÉR=PrJer +PRMAN=PrMan +PR MAN=PrMan PRO=Prov PROV=Prov +PRSAL=PrSol +PR SAL=PrSol +PRSIR=SirP +PR SIR=SirP +PRV=Prov PS=Ps +PS151=AddPs +PS 151=AddPs PSA=Ps PSAU=Ps +PSSAL=PssSol +PS SAL=PssSol +QH=Eccl QO=Eccl -R=Rom +QOH=Eccl +QÔH=Eccl +QOHELET=Eccl +QÔHELET=Eccl +QOHÉLET=Eccl +QÔHÉLET=Eccl RE=Rev RÉ=Rev REV=Rev @@ -490,17 +1123,54 @@ ROM=Rom RT=Ruth RU=Ruth RUT=Ruth -S=Zeph +RV=Rev +SAG=Wis +SG=Wis +SI=Sir +SIR=Sir +SIRA=Sir SO=Zeph SOP=Zeph SOPH=Zeph -T=Titus +SP=Zeph +SU=Sus +SUSTH=SusTh +SUZ=Sus +SZ=Sus +T12=T12Patr +T12PATR=T12Patr +TASER=T12Patr.Tash +TB=Tob +TBEN=T12Patr.Tbenj +TDAN=T12Patr.Tdan +TGAD=T12Patr.Tgad TI=Titus +TISS=T12Patr.Tiss TIT=Titus +TITE=Titus +TJOS=T12Patr.Tjos +TJUDA=T12Patr.Tjud +TLEVI=T12Patr.Tlevi +TLÉVI=T12Patr.Tlevi +TNEPH=T12Patr.Tnaph +TOB=Tob +TOBS=TobS +TRUB=T12Patr.Treu +TSIM=T12Patr.Tsim TT=Titus -U=Judg -V=Lev -Z=Zech +TZAB=T12Patr.Tzeb +VE=5Ezra +V E=5Ezra +VES=5Ezra +V ES=5Ezra +VESD=5Ezra +V ESD=5Ezra +VIE=6Ezra +VI E=6Ezra +VIES=6Ezra +VI ES=6Ezra +VIESD=6Ezra +VI ESD=6Ezra ZA=Zech ZAC=Zech ZACH=Zech diff --git a/locales.d/fr.conf b/locales.d/fr.conf index ba9942d..c777447 100644 --- a/locales.d/fr.conf +++ b/locales.d/fr.conf @@ -1,75 +1,350 @@ +# File creation: 2017-01-20 +# French translation for Sword +# Provided by yvand <yvand.sword@gmail.com>, Cyrille <lafricain79@gmail.com>, domcox <dominique@corbex.org> + [Meta] Name=fr Description=French Encoding=ISO8859-1 [Text] +# Old Testament* (39) +# Genesis Genesis=Gense +# Exodus Exodus=Exode +# Leviticus Leviticus=Lvitique +# Numbers Numbers=Nombres +# Deuteronomy Deuteronomy=Deutronome +# Joshua Joshua=Josu +# Judges Judges=Juges +# Ruth Ruth=Ruth +# I Samuel I Samuel=1 Samuel +# II Samuel II Samuel=2 Samuel +# I Kings I Kings=1 Rois +# II Kings II Kings=2 Rois +# I Chronicles I Chronicles=1 Chroniques +# II Chronicles II Chronicles=2 Chroniques +# Ezra Ezra=Esdras +# Nehemiah Nehemiah=Nhmie +# Esther Esther=Esther +# Job Job=Job +# Psalms Psalms=Psaumes +# Proverbs Proverbs=Proverbes -Ecclesiastes=cclsiaste +# Ecclesiastes +Ecclesiastes=Ecclsiaste ou Qohlet +# Song of Solomon Song of Solomon=Cantique des cantiques -Isaiah=Esae +# Isaiah +Isaiah=sae +# Jeremiah Jeremiah=Jrmie +# Lamentations Lamentations=Lamentations de Jrmie +# Ezekiel Ezekiel=zchiel +# Daniel Daniel=Daniel +# Hosea Hosea=Ose +# Joel Joel=Jol +# Amos Amos=Amos +# Obadiah Obadiah=Abdias +# Jonah Jonah=Jonas +# Micah Micah=Miche +# Nahum Nahum=Nahum -Habakkuk=Habakuk +# Habakkuk +Habakkuk=Habacuc +# Zephaniah Zephaniah=Sophonie +# Haggai Haggai=Agge +# Zechariah Zechariah=Zacharie +# Malachi Malachi=Malachie + +# New Testament* (27) +# Matthew Matthew=Matthieu +# Mark Mark=Marc +# Luke Luke=Luc +# John John=Jean -Acts=Actes +# Acts +Acts=Actes des Aptres +# Romans Romans=Romains +# I Corinthians I Corinthians=1 Corinthiens +# II Corinthians II Corinthians=2 Corinthiens +# Galatians Galatians=Galates +# Ephesians Ephesians=phsiens +# Philippians Philippians=Philippiens +# Colossians Colossians=Colossiens +# I Thessalonians I Thessalonians=1 Thessaloniciens +# II Thessalonians II Thessalonians=2 Thessaloniciens +# I Timothy I Timothy=1 Timothe +# II Timothy II Timothy=2 Timothe +# Titus Titus=Tite +# Philemon Philemon=Philmon +# Hebrews Hebrews=Hbreux +# James James=Jacques +# I Peter I Peter=1 Pierre +# II Peter II Peter=2 Pierre +# I John I John=1 Jean +# II John II John=2 Jean +# III John III John=3 Jean +# Jude Jude=Jude -Revelation of John=Apocalypse +# Revelation of John +Revelation of John=Apocalypse de Jean + +# Apocrypha/Deuterocanon* (22) +# Tobit +Tobit=Tobie +# Judith +Judith=Judith +# Esther (Greek) +Esther (Greek)=Esther grec +# Additions to Esther +Additions to Esther=Additions Esther +# Wisdom +Wisdom=Sagesse +# Sirach (Prologue) +Sirach (Prologue)=Prologue du Siracide +# Sirach +Sirach=Siracide +# Baruch +Baruch=Baruch +# Epistle of Jeremiah +Epistle of Jeremiah=Lettre de Jrmie +# Daniel (Greek) +Daniel (Greek)=Daniel grec +# Additions to Daniel +Additions to Daniel=Additions Daniel +# Prayer of Azariah +Prayer of Azariah=Prire d'Azarias +# Susanna +Susanna=Suzanne +# Bel and the Dragon +Bel and the Dragon=Bel et le dragon +# I Maccabees +I Maccabees=1 Maccabes +# II Maccabees +II Maccabees=2 Maccabes +# III Maccabees +III Maccabees=3 Maccabes +# IV Maccabees +IV Maccabees=4 Maccabes +# Prayer of Manasses +Prayer of Manasses=Prire de Manass +# I Esdras +I Esdras=1 Esdras +# II Esdras +II Esdras=2 Esdras +# Additional Psalm +Additional Psalm=Psaume 151 + +# Rahlfs' LXX* (2) +# Odes +Odes=Odes de Salomon +# Psalms of Solomon +Psalms of Solomon=Psaumes de Salomon + +# Rahlfs' variant books* (6) +# Joshua Codex Alexandrinus +Joshua Codex Alexandrinus=Josu (Alexandrinus) +# Judges Codex Vaticanus +Judges Codex Vaticanus=Juges (Vaticanus) +# Tobit Codex Sinaiticus +Tobit Codex Sinaiticus=Tobie (Sinaiticus) +# Susanna Theodotion +Susanna Theodotion=Suzanne (Thodotion) +# Daniel Theodotion +Daniel Theodotion=Daniel (Thodotion) +# Bel and the Dragon Theodotion +Bel and the Dragon Theodotion=Bel et le dragon (Thodotion) + +# Vulgate & other later Latin mss* (6) +# Laodiceans +Laodiceans=Laodicens +# V Ezra +V Ezra=V Esdras +# IV Ezra +IV Ezra=Apocalypse d'Esdras +# VI Ezra +VI Ezra=VI Esdras +# Prayer of Solomon +Prayer of Solomon=Prire de Salomon +# Prayer of Jeremiah +Prayer of Jeremiah=Prire de Jrmie + +# Ethiopian Orthodox Canon/Ge'ez Translation Additions (7) +# I Enoch +I Enoch=Hnoch +# Jubilees +Jubilees=Jubils +# IV Baruch +IV Baruch=4 Baruch +# I Meqabyan +I Meqabyan=1 Maccabes thiopiens +# II Meqabyan +II Meqabyan=2 Maccabes thiopiens +# III Meqabyan +III Meqabyan=3 Maccabes thiopiens +# Reproof +#Reproof= +# Additions to Jeremiah +#Additions to Jeremiah= +# Pseudo-Josephus +#Pseudo-Josephus= + +# Armenian Orthodox Canon Additions (7/19) +# Epistle of the Corinthians to Paul +Epistle of the Corinthians to Paul=Lettre des Corinthiens l'Aptre Paul +# III Corinthians +III Corinthians=3 Corinthiens +# Words of Sirach +#Words of Sirach= +# Prayer of Euthalius +#Prayer of Euthalius= +# Dormition of John +Dormition of John=Dormition de Marie du Pseudo-Jean +# Joseph and Asenath +Joseph and Asenath=Joseph et Asneth +# Testaments of the Twelve Patriarchs (composed of:) +Testaments of the Twelve Patriarchs (composed of:)=Testaments des 12 Patriarches +# Testament of Asher +Testament of Asher=Testament d'Aser +# Testament of Benjamin +Testament of Benjamin=Testament de Benjamin +# Testament of Dan +Testament of Dan=Testament de Dan +# Testament of Gad +Testament of Gad=Testament de Gad +# Testament of Issachar +Testament of Issachar=Testament d'Issacar +# Testament of Joseph +Testament of Joseph=Testament de Joseph +# Testament of Judah +Testament of Judah=Testament de Juda +# Testament of Levi +Testament of Levi=Testament de Lvi +# Testament of Naphtali +Testament of Naphtali=Testament de Nephtali +# Testament of Reuben +Testament of Reuben=Testament de Ruben +# Testament of Simeon +Testament of Simeon=Testament de Simon +# Testament of Zebulun +Testament of Zebulun=Testament de Zabulon + +# Peshitta/Syriac Orthodox Canon (4) +# II Baruch +#II Baruch= +# Letter of Baruch +#Letter of Baruch= +# Additional Syriac Psalms +Additional Syriac Psalms=Psaumes surnumraires +# Josephus' Jewish War VI +#Josephus' Jewish War VI= + +# Apostolic Fathers (19/22) +# I Clement +I Clement=1 Clment +# II Clement +II Clement=2 Clment +# Ignatius to the Ephesians +Ignatius to the Ephesians=Ignace aux phsiens +# Ignatius to the Magnesians +Ignatius to the Magnesians=Ignace aux Magnsiens +# Ignatius to the Trallians +Ignatius to the Trallians=Ignace aux Tralliens +# Ignatius to the Romans +Ignatius to the Romans=Ignace aux Romains +# Ignatius to the Philadelphians +Ignatius to the Philadelphians=Ignace aux Philadelphiens +# Ignatius to the Smyrnaeans +Ignatius to the Smyrnaeans=Ignace aux Smyrniens +# Ignatius to Polycarp +Ignatius to Polycarp=Ignace d'Antioche Polycarpe +# Polycarp to the Philippians +Polycarp to the Philippians=Polycarpe aux Philippiens +# Martyrdom of Polycarp +Martyrdom of Polycarp=Martyr de Polycarpe +# Didache +Didache=Didach +# Barnabas +Barnabas=ptre de Barnab +# Shepherd of Hermas (comprised of:) +Shepherd of Hermas (comprised of:)=Pasteur d'Hermas +# Shepherd of Hermas, Mandates +#Shepherd of Hermas, Mandates= +# Shepherd of Hermas, Similitudes +#Shepherd of Hermas, Similitudes= +# Shepherd of Hermas, Visions +#Shepherd of Hermas, Visions= +# Diognetus +#Diognetus= +# Apostles' Creed +#Apostles' Creed= +# Fragments of Papias +Fragments of Papias=Fragments de Papias +# Reliques of the Elders +#Reliques of the Elders= +# Fragment of Quadratus +#Fragment of Quadratus= + +# Other (2) +# Diatessaron +Diatessaron=Diatessaron +# Metrical Psalms +#Metrical Psalms= [Book Abbrevs] GENSE=Gen @@ -92,10 +367,9 @@ ESTHER=Esth JOB=Job PSAUMES=Ps PROVERBES=Prov -ECCLSIASTE=Eccl -CCLSIASTE=Eccl +ECCLSIASTE OU QOHLET=Eccl CANTIQUE DES CANTIQUES=Song -ESAE=Isa +SAE=Isa JRMIE=Jer LAMENTATIONS DE JRMIE=Lam ZCHIEL=Ezek @@ -107,22 +381,20 @@ ABDIAS=Obad JONAS=Jonah MICHE=Mic NAHUM=Nah -HABAKUK=Hab +HABACUC=Hab SOPHONIE=Zeph AGGE=Hag ZACHARIE=Zech -ZACCHARIE=Zech MALACHIE=Mal MATTHIEU=Matt MARC=Mark LUC=Luke JEAN=John -ACTES=Acts +ACTES DES APTRES=Acts ROMAINS=Rom 1 CORINTHIENS=1Cor 2 CORINTHIENS=2Cor GALATES=Gal -EPHSIENS=Eph PHSIENS=Eph PHILIPPIENS=Phil COLOSSIENS=Col @@ -140,127 +412,285 @@ JACQUES=Jas 2 JEAN=2John 3 JEAN=3John JUDE=Jude -APOCALYPSE=Rev +APOCALYPSE DE JEAN=Rev +TOBIE=Tob +JUDITH=Jdt +ESTHER GREC=EsthGr +ADDITIONS ESTHER=AddEsth +SAGESSE=Wis +PROLOGUE DU SIRACIDE=SirP +SIRACIDE=Sir +BARUCH=Bar +LETTRE DE JRMIE=EpJer +DANIEL GREC=DanGr +ADDITIONS DANIEL=AddDan +PRIRE D'AZARIAS=PrAzar +SUZANNE=Sus +BEL ET LE DRAGON=Bel +1 MACCABES=1Macc +2 MACCABES=2Macc +3 MACCABES=3Macc +4 MACCABES=4Macc +PRIRE DE MANASS=PrMan +1 ESDRAS=1Esd +2 ESDRAS=2Esd +PSAUME 151=AddPs +ODES DE SALOMON=Odes +PSAUMES DE SALOMON=PssSol +JOSU (ALEXANDRINUS)=JoshA +JUGES (VATICANUS)=JudgB +TOBIE (SINAITICUS)=TobS +SUZANNE (THODOTION)=SusTh +DANIEL (THODOTION)=DanTh +BEL ET LE DRAGON (THODOTION)=BelTh +LAODICENS=EpLao +V ESDRAS=5Ezra +APOCALYPSE D'ESDRAS=4Ezra +VI ESDRAS=6Ezra +PRIRE DE SALOMON=PrSol +PRIRE DE JRMIE=PrJer +HNOCH=1En +JUBILS=Jub +4 BARUCH=4Bar +1 MACCABES THIOPIENS=1Meq +2 MACCABES THIOPIENS=2Meq +3 MACCABES THIOPIENS=3Meq +LETTRE DES CORINTHIENS L'APTRE PAUL=EpCorPaul +3 CORINTHIENS=3Cor +DORMITION DE MARIE DU PSEUDO-JEAN=DormJohn +JOSEPH ET ASNETH=JosAsen +TESTAMENTS DES 12 PATRIARCHES=T12Patr +TESTAMENT D'ASER=T12Patr.Tash +TESTAMENT DE BENJAMIN=T12Patr.Tbenj +TESTAMENT DE DAN=T12Patr.Tdan +TESTAMENT DE GAD=T12Patr.Tgad +TESTAMENT D'ISSACAR=T12Patr.Tiss +TESTAMENT DE JOSEPH=T12Patr.Tjos +TESTAMENT DE JUDA=T12Patr.Tjud +TESTAMENT DE LVI=T12Patr.Tlevi +TESTAMENT DE NEPHTALI=T12Patr.Tnaph +TESTAMENT DE RUBEN=T12Patr.Treu +TESTAMENT DE SIMON=T12Patr.Tsim +TESTAMENT DE ZABULON=T12Patr.Tzeb +PSAUMES SURNUMRAIRES=5ApocSyrPss +1 CLMENT=1Clem +2 CLMENT=2Clem +IGNACE AUX PHSIENS=IgnEph +IGNACE AUX MAGNSIENS=IgnMagn +IGNACE AUX TRALLIENS=IgnTrall +IGNACE AUX ROMAINS=IgnRom +IGNACE AUX PHILADELPHIENS=IgnPhld +IGNACE AUX SMYRNIENS=IgnSmyrn +IGNACE D'ANTIOCHE POLYCARPE=IgnPol +POLYCARPE AUX PHILIPPIENS=PolPhil +MARTYR DE POLYCARPE=MartPol +DIDACH=Did +PTRE DE BARNAB=Barn +PASTEUR D'HERMAS=Herm +FRAGMENTS DE PAPIAS=PapFrag +DIATESSARON=TatDiat -1 C=1Cor 1C=1Cor -1 CH=1Chr +1 C=1Cor 1CH=1Chr -1 CHR=1Chr +1 CH=1Chr 1CHR=1Chr -1 CHRO=1Chr -1CHRO=1Chr -1 CO=1Cor +1 CHR=1Chr +1CHRON=1Chr +1 CHRON=1Chr +1CLEM=1Clem +1 CLEM=1Clem +1CLM=1Clem +1 CLM=1Clem 1CO=1Cor -1 COR=1Cor +1 CO=1Cor 1COR=1Cor -1 J=1John +1 COR=1Cor 1J=1John -1 JE=1John +1 J=1John 1JE=1John -1 JEA=1John +1 JE=1John 1JEA=1John -1 JN=1John +1 JEA=1John 1JN=1John -1 P=1Pet +1 JN=1John +1M=1Macc +1 M=1Macc +1MA=1Macc +1 MA=1Macc +1MAC=1Macc +1 MAC=1Macc +1MT=1Meq +1 MT=1Meq +1 M T=1Meq 1P=1Pet -1 PI=1Pet +1 P=1Pet 1PI=1Pet -1 PIE=1Pet +1 PI=1Pet 1PIE=1Pet -1 R=1Kgs +1 PIE=1Pet 1R=1Kgs -1 RO=1Kgs +1 R=1Kgs 1RO=1Kgs -1 ROI=1Kgs +1 RO=1Kgs 1ROI=1Kgs -1 S=1Sam +1 ROI=1Kgs 1S=1Sam -1 SA=1Sam +1 S=1Sam 1SA=1Sam -1 SAM=1Sam +1 SA=1Sam 1SAM=1Sam -1 T=1Thess -1T=1Thess -1 TH=1Thess +1 SAM=1Sam +1T=1Tim +1 T=1Tim 1TH=1Thess -1 THE=1Thess +1 TH=1Thess 1THE=1Thess -1 TI=1Tim +1 THE=1Thess +1THESS=1Thess +1 THESS=1Thess 1TI=1Tim -1 TIM=1Tim +1 TI=1Tim 1TIM=1Tim -1 TIMOTHEE=1Tim +1 TIM=1Tim 1TIMOTHEE=1Tim -1 TM=1Tim +1 TIMOTHEE=1Tim 1TM=1Tim -2 C=2Cor +1 TM=1Tim 2C=2Cor -2 CH=2Chr +2 C=2Cor 2CH=2Chr -2 CHR=2Chr +2 CH=2Chr 2CHR=2Chr -2 CHRO=2Chr -2CHRO=2Chr -2 CO=2Cor +2 CHR=2Chr +2CHRON=2Chr +2 CHRON=2Chr +2CLEM=2Clem +2 CLEM=2Clem +2CLM=2Clem +2 CLM=2Clem 2CO=2Cor -2 COR=2Cor +2 CO=2Cor 2COR=2Cor -2 J=2John +2 COR=2Cor 2J=2John -2 JE=2John +2 J=2John 2JE=2John -2 JEA=2John +2 JE=2John 2JEA=2John -2 JN=2John +2 JEA=2John 2JN=2John -2 P=2Pet +2 JN=2John +2M=2Macc +2 M=2Macc +2MA=2Macc +2 MA=2Macc +2MAC=2Macc +2 MAC=2Macc +2MT=2Meq +2 MT=2Meq +2 M T=2Meq 2P=2Pet -2 PI=2Pet +2 P=2Pet 2PI=2Pet -2 PIE=2Pet +2 PI=2Pet 2PIE=2Pet -2 R=2Kgs +2 PIE=2Pet 2R=2Kgs -2 RO=2Kgs +2 R=2Kgs 2RO=2Kgs -2 ROI=2Kgs +2 RO=2Kgs 2ROI=2Kgs -2 S=2Sam +2 ROI=2Kgs 2S=2Sam -2 SA=2Sam +2 S=2Sam 2SA=2Sam -2 SAM=2Sam +2 SA=2Sam 2SAM=2Sam -2 T=2Thess -2T=2Thess -2 TH=2Thess +2 SAM=2Sam +2T=2Tim +2 T=2Tim 2TH=2Thess -2 THE=2Thess +2 TH=2Thess 2THE=2Thess -2 TI=2Tim +2 THE=2Thess +2THESS=2Thess +2 THESS=2Thess 2TI=2Tim -2 TIM=2Tim +2 TI=2Tim 2TIM=2Tim -2 TIMOTHEE=2Tim +2 TIM=2Tim 2TIMOTHEE=2Tim -2 TM=2Tim +2 TIMOTHEE=2Tim 2TM=2Tim -3 J=3John +2 TM=2Tim +3C=3Cor +3 C=3Cor +3CO=3Cor +3 CO=3Cor +3COR=3Cor +3 COR=3Cor +3E=1Esd +3 E=1Esd +3ES=1Esd +3 ES=1Esd +3ESD=1Esd +3 ESD=1Esd 3J=3John -3 JE=3John +3 J=3John 3JE=3John -3 JEA=3John +3 JE=3John 3JEA=3John -3 JN=3John +3 JEA=3John 3JN=3John -A=Acts +3 JN=3John +3M=3Macc +3 M=3Macc +3MA=3Macc +3 MA=3Macc +3MAC=3Macc +3 MAC=3Macc +3MT=3Meq +3 MT=3Meq +3 M T=3Meq +4BAR=4Bar +4 BAR=4Bar +4E=2Esd +4 E=2Esd +4ES=2Esd +4 ES=2Esd +4ESD=2Esd +4 ESD=2Esd +4M=4Macc +4 M=4Macc +4MA=4Macc +4 MA=4Macc +4MAC=4Macc +4 MAC=4Macc +5E=5Ezra +5 E=5Ezra +5ES=5Ezra +5 ES=5Ezra +5ESD=5Ezra +5 ESD=5Ezra +6E=6Ezra +6 E=6Ezra +6ES=6Ezra +6 ES=6Ezra +6ESD=6Ezra +6 ESD=6Ezra AB=Obad ABD=Obad -ABDI=Obad AC=Acts ACT=Acts -ACTE=Acts +ACTES=Acts +ACTS=Acts +ADDDAN=AddDan +ADD DAN=AddDan +ADDDN=AddDan +ADD DN=AddDan +ADDEST=AddEsth +ADD EST=AddEsth AG=Hag AGG=Hag AGGE=Hag @@ -269,9 +699,19 @@ AGGEE=Hag AM=Amos AMO=Amos AP=Rev +APE=4Ezra +AP ES=4Ezra +APESD=4Ezra +AP ESD=4Ezra APO=Rev APOC=Rev -B=Heb +APOCALYPSE=Rev +BA=Bar +BAR=Bar +BE=Bel +BEL=Bel +BELTH=BelTh +BL=Bel CA=Song CAN=Song CANT=Song @@ -279,27 +719,45 @@ CDC=Song CO=Col COL=Col COLO=Col +COP=EpCorPaul CT=Song +D=Deut DA=Dan DAN=Dan +DANGREC=DanGr +DAN GREC=DanGr DANI=Dan +DANTH=DanTh DE=Deut DEU=Deut DEUT=Deut DEUTERONOME=Deut +DID=Did +DIDAC=Did +DIDACHE=Did +DIDACH=Did DN=Dan +DNG=DanGr +DN G=DanGr +DNGREC=DanGr +DN GREC=DanGr +DORMJEAN=DormJohn DT=Deut E=Exod -=Eph EC=Eccl -ECC=Eccl -ECCL=Eccl -ECCLESIASTE=Eccl C=Eccl +ECC=Eccl CC=Eccl +ECCL=Eccl CCL=Eccl -ECL=Eccl -CL=Eccl +ECCLESIASTE=Eccl +ECCLSIASTE=Eccl +ECCLESIASTIQUE=Sir +ECCLSIASTIQUE=Sir +EN=1En +N=1En +ENOCH=1En +NOCH=1En EP=Eph P=Eph EPH=Eph @@ -307,8 +765,9 @@ EPH=Eph EPHE=Eph PHE=Eph EPH=Eph -PH=Eph EPHESIENS=Eph +PHESIENS=Eph +EPHSIENS=Eph ES=Isa S=Isa ESA=Isa @@ -318,16 +777,23 @@ ESA=Isa SA=Isa ESAIE=Isa SAIE=Isa +ESAE=Isa +SAE=Isa ESD=Ezra -ESDR=Ezra SD=Ezra +ESDR=Ezra EST=Esth -ESTH=Esth ST=Esth +ESTG=EsthGr +EST G=EsthGr +ESTGREC=EsthGr +EST GREC=EsthGr +ESTH=Esth EX=Exod EXO=Exod EXOD=Exod EZ=Ezek +Z=Ezek EZE=Ezek ZE=Ezek EZ=Ezek @@ -337,46 +803,170 @@ EZEC=Ezek EZC=Ezek ZC=Ezek EZECHIEL=Ezek -F=Eph G=Gen GA=Gal GAL=Gal -GALA=Gal +GALAT=Gal GE=Gen +G=Gen GEN=Gen +GN=Gen GENE=Gen GEN=Gen GENESE=Gen -G=Gen -GN=Gen GN=Gen -H=Hab HA=Hab HAB=Hab HABA=Hab -HABACUC=Hab +HABAKUK=Hab HABAQUQ=Hab HE=Heb H=Heb HEB=Heb HB=Heb +HEBR=Heb +HBR=Heb HEBREUX=Heb -I=Isa +HEN=1En +HN=1En +HENOC=1En +HENOCH=1En +HERM=Herm +IC=1Cor +I C=1Cor +ICH=1Chr +I CH=1Chr +ICHR=1Chr +I CHR=1Chr +ICHRONIQUES=1Chr +I CHRONIQUES=1Chr +ICO=1Cor +I CO=1Cor +ICOR=1Cor +I COR=1Cor +I CORINTHIENS=1Cor +IIC=2Cor +II C=2Cor +IICH=2Chr +II CH=2Chr +IICHR=2Chr +II CHR=2Chr +IICHRONIQUES=2Chr +II CHRONIQUES=2Chr +IICO=2Cor +II CO=2Cor +IICOR=2Cor +II COR=2Cor +II CORINTHIENS=2Cor +IIIJ=3John +III J=3John +IIIJE=3John +III JE=3John +IIIJEA=3John +III JEA=3John +IIIJN=3John +III JN=3John +IIJ=2John +II J=2John +IIJE=2John +II JE=2John +IIJEA=2John +II JEA=2John +IIJN=2John +II JN=2John +IIP=2Pet +II P=2Pet +IIPI=2Pet +II PI=2Pet +IIPIE=2Pet +II PIE=2Pet +IIR=2Kgs +II R=2Kgs +IIRO=2Kgs +II RO=2Kgs +IIROIS=2Kgs +II ROIS=2Kgs +II S=2Sam +II SA=2Sam +IISAM=2Sam +II SAM=2Sam +II SAMUEL=2Sam +IIT=2Tim +II T=2Tim +IITH=2Thess +II TH=2Thess +IITHE=2Thess +II THE=2Thess +IITHESS=2Thess +II THESS=2Thess +II THESSALONICIENS=2Thess +IITI=2Tim +II TI=2Tim +IITIM=2Tim +II TIM=2Tim +IITIMOTHEE=2Tim +II TIMOTHEE=2Tim +II TIMOTHE=2Tim +IITM=2Tim +II TM=2Tim +IJ=1John +I J=1John +IJE=1John +I JE=1John +IJEA=1John +I JEA=1John +IJN=1John +I JN=1John +IP=1Pet +I P=1Pet +IPI=1Pet +I PI=1Pet +IPIE=1Pet +I PIE=1Pet +IR=1Kgs +I R=1Kgs +IRO=1Kgs +I RO=1Kgs +IROIS=1Kgs +I ROIS=1Kgs IS=Isa +I S=1Sam ISA=Isa +I SA=1Sam ISAI=Isa ISA=Isa ISAIE=Isa -J=Josh +ISAM=1Sam +I SAM=1Sam +I SAMUEL=1Sam +IT=1Tim +I T=1Tim +ITH=1Thess +I TH=1Thess +ITHE=1Thess +I THE=1Thess +ITHESS=1Thess +I THESS=1Thess +I THESSALONICIENS=1Thess +ITI=1Tim +I TI=1Tim +ITIM=1Tim +I TIM=1Tim +ITIMOTHEE=1Tim +I TIMOTHEE=1Tim +I TIMOTHE=1Tim +ITM=1Tim +I TM=1Tim JA=Jas JAC=Jas JACQ=Jas JB=Job JC=Jas JD=Jude -J=Jer +JDT=Jdt JE=John -JEA=John +J=Jer +JEAN=John JER=Jer JR=Jer JERE=Jer @@ -385,8 +975,10 @@ JER=Jer JR=Jer JEREMIE=Jer JG=Judg +JGV=JudgB JL=Joel JN=John +JO=Joel JOB=Job JOE=Joel JO=Joel @@ -394,18 +986,27 @@ JOEL=Joel JON=Jonah JONA=Jonah JOS=Josh +JOSA=JoshA +JOSASEN=JosAsen JOSUE=Josh JR=Jer JS=Josh -JU=Judg +JU=Jude +JUB=Jub +JUBILES=Jub JUD=Jude +JUDE=Jude +JUDI=Jdt JUG=Judg JUGE=Judg -K=Hab L=Lev LA=Lam LAM=Lam LAME=Lam +LAMENT=Lam +LAO=EpLao +LAOD=EpLao +LAODICEENS=EpLao LC=Luke LDJ=Lam LE=Lev @@ -416,14 +1017,17 @@ LEVI=Lev LVI=Lev LEVITIQUE=Lev LM=Lam +LTJR=EpJer +LT JR=EpJer LU=Luke LUC=Luke LV=Lev -M=Matt MA=Mal MAL=Mal MALA=Mal +MAN=PrMan MAR=Mark +MARC=Mark MAT=Matt MATT=Matt MC=Mark @@ -437,7 +1041,7 @@ MT=Matt N=Num NA=Nah NAH=Nah -NAHU=Hab +NAHOUM=Nah NB=Num NE=Neh N=Neh @@ -451,7 +1055,9 @@ NEHEMIE=Neh NO=Num NOM=Num NOMB=Num -O=Hos +OD=Odes +ODE=Odes +ODES=Odes OS=Hos OSE=Hos OS=Hos @@ -463,19 +1069,46 @@ PHIL=Phil PHILEMON=Phlm PHLM=Phlm PHM=Phlm +PHP=Phil PR=Prov +PRA=PrAzar +PR A=PrAzar +PRAZAR=PrAzar PRE=Eccl PR=Eccl PRED=Eccl PRD=Eccl PREDICATEUR=Eccl +PRJ=PrJer +PR J=PrJer +PRJER=PrJer +PR JER=PrJer +PRJR=PrJer +PR JR=PrJer +PRMAN=PrMan +PR MAN=PrMan PRO=Prov PROV=Prov +PRSAL=PrSol +PR SAL=PrSol +PRSIR=SirP +PR SIR=SirP +PRV=Prov PS=Ps +PS151=AddPs +PS 151=AddPs PSA=Ps PSAU=Ps +PSSAL=PssSol +PS SAL=PssSol +QH=Eccl QO=Eccl -R=Rom +QOH=Eccl +QH=Eccl +QOHELET=Eccl +QHELET=Eccl +QOHLET=Eccl +QHLET=Eccl RE=Rev R=Rev REV=Rev @@ -490,17 +1123,54 @@ ROM=Rom RT=Ruth RU=Ruth RUT=Ruth -S=Zeph +RV=Rev +SAG=Wis +SG=Wis +SI=Sir +SIR=Sir +SIRA=Sir SO=Zeph SOP=Zeph SOPH=Zeph -T=Titus +SP=Zeph +SU=Sus +SUSTH=SusTh +SUZ=Sus +SZ=Sus +T12=T12Patr +T12PATR=T12Patr +TASER=T12Patr.Tash +TB=Tob +TBEN=T12Patr.Tbenj +TDAN=T12Patr.Tdan +TGAD=T12Patr.Tgad TI=Titus +TISS=T12Patr.Tiss TIT=Titus +TITE=Titus +TJOS=T12Patr.Tjos +TJUDA=T12Patr.Tjud +TLEVI=T12Patr.Tlevi +TLVI=T12Patr.Tlevi +TNEPH=T12Patr.Tnaph +TOB=Tob +TOBS=TobS +TRUB=T12Patr.Treu +TSIM=T12Patr.Tsim TT=Titus -U=Judg -V=Lev -Z=Zech +TZAB=T12Patr.Tzeb +VE=5Ezra +V E=5Ezra +VES=5Ezra +V ES=5Ezra +VESD=5Ezra +V ESD=5Ezra +VIE=6Ezra +VI E=6Ezra +VIES=6Ezra +VI ES=6Ezra +VIESD=6Ezra +VI ESD=6Ezra ZA=Zech ZAC=Zech ZACH=Zech diff --git a/locales.d/fr_abbrev-utf8.conf b/locales.d/fr_abbrev-utf8.conf index 3189b72..d93a54e 100644 --- a/locales.d/fr_abbrev-utf8.conf +++ b/locales.d/fr_abbrev-utf8.conf @@ -1,9 +1,6 @@ -# -# French Bible bookname abbreviations -- derived from the "Louis Segond 1910" -# Corrections & Contributions welcome -# -# Dominique Corbex domcox@users.sf.net -# +# File creation: 2017-01-20 +# French translation for Sword +# Provided by yvand <yvand.sword@gmail.com>, Cyrille <lafricain79@gmail.com>, domcox <dominique@corbex.org> [Meta] Name=fr_abbrev @@ -11,138 +8,471 @@ Description=French abbreviations (Unicode) Encoding=UTF-8 [Text] -Genesis=Ge +# Old Testament* (39) +# Genesis +Genesis=Gen +# Exodus Exodus=Ex -Leviticus=Lé -Numbers=No -Deuteronomy=De +# Leviticus +Leviticus=Lév +# Numbers +Numbers=Nb +# Deuteronomy +Deuteronomy=Deut +# Joshua Joshua=Jos -Judges=Jg -Ruth=Ru -I Samuel=1 S -II Samuel=2 S -I Kings=1 R -II Kings=2 R -I Chronicles=1 Ch -II Chronicles=2 Ch -Ezra=Esd -Nehemiah=Né -Esther=Est +# Judges +Judges=Jug +# Ruth +Ruth=Ruth +# I Samuel +I Samuel=1 Sam +# II Samuel +II Samuel=2 Sam +# I Kings +I Kings=1 Rois +# II Kings +II Kings=2 Rois +# I Chronicles +I Chronicles=1 Chr +# II Chronicles +II Chronicles=2 Chr +# Ezra +Ezra=Esdr +# Nehemiah +Nehemiah=Néh +# Esther +Esther=Esth +# Job Job=Job +# Psalms Psalms=Ps -Proverbs=Pr -Ecclesiastes=Ec -Song of Solomon=Ca -Isaiah=Es -Jeremiah=Jé -Lamentations=La -Ezekiel=Ez -Daniel=Da +# Proverbs +Proverbs=Prov +# Ecclesiastes +Ecclesiastes=Eccl +# Song of Solomon +Song of Solomon=Cant +# Isaiah +Isaiah=És +# Jeremiah +Jeremiah=Jér +# Lamentations +Lamentations=Lam +# Ezekiel +Ezekiel=Éz +# Daniel +Daniel=Dan +# Hosea Hosea=Os -Joel=Joë +# Joel +Joel=Joël +# Amos Amos=Am -Obadiah=Ab +# Obadiah +Obadiah=Abd +# Jonah Jonah=Jon -Micah=Mi -Nahum=Na -Habakkuk=Ha -Zephaniah=So -Haggai=Ag -Zechariah=Za +# Micah +Micah=Mich +# Nahum +Nahum=Nah +# Habakkuk +Habakkuk=Hab +# Zephaniah +Zephaniah=Soph +# Haggai +Haggai=Agg +# Zechariah +Zechariah=Zach +# Malachi Malachi=Mal + +# New Testament* (27) +# Matthew Matthew=Mt -Mark=Mc -Luke=Lu -John=Jn -Acts=Ac -Romans=Ro -I Corinthians=1 Co -II Corinthians=2 Co -Galatians=Ga -Ephesians=Ep -Philippians=Ph +# Mark +Mark=Marc +# Luke +Luke=Luc +# John +John=Jean +# Acts +Acts=Act +# Romans +Romans=Rom +# I Corinthians +I Corinthians=1 Cor +# II Corinthians +II Corinthians=2 Cor +# Galatians +Galatians=Gal +# Ephesians +Ephesians=Éph +# Philippians +Philippians=Php +# Colossians Colossians=Col +# I Thessalonians I Thessalonians=1 Th +# II Thessalonians II Thessalonians=2 Th -I Timothy=1 Ti -II Timothy=2 Ti -Titus=Tit +# I Timothy +I Timothy=1 Tim +# II Timothy +II Timothy=2 Tim +# Titus +Titus=Tite +# Philemon Philemon=Phm -Hebrews=Hé -James=Ja -I Peter=1 Pi -II Peter=2 Pi +# Hebrews +Hebrews=Hébr +# James +James=Jacq +# I Peter +I Peter=1 P +# II Peter +II Peter=2 P +# I John I John=1 Jn +# II John II John=2 Jn +# III John III John=3 Jn -Jude=Jud -Revelation of John=Ap +# Jude +Jude=Jude +# Revelation of John +Revelation of John=Apoc -[Book Abbrevs] +# Apocrypha/Deuterocanon* (22) +# Tobit +Tobit=Tob +# Judith +Judith=Jdt +# Esther (Greek) +Esther (Greek)=Estgrec +# Additions to Esther +Additions to Esther=AddEst +# Wisdom +Wisdom=Sag +# Sirach (Prologue) +Sirach (Prologue)=PrSir +# Sirach +Sirach=Sir +# Baruch +Baruch=Bar +# Epistle of Jeremiah +Epistle of Jeremiah=LtJr +# Daniel (Greek) +Daniel (Greek)=Dangrec +# Additions to Daniel +Additions to Daniel=AddDan +# Prayer of Azariah +Prayer of Azariah=PrAzar +# Susanna +Susanna=Suz +# Bel and the Dragon +Bel and the Dragon=Bel +# I Maccabees +I Maccabees=1 M +# II Maccabees +II Maccabees=2 M +# III Maccabees +III Maccabees=3 M +# IV Maccabees +IV Maccabees=4 M +# Prayer of Manasses +Prayer of Manasses=Man +# I Esdras +I Esdras=3 Esd +# II Esdras +II Esdras=4 Esd +# Additional Psalm +Additional Psalm=Ps 151 + +# Rahlfs' LXX* (2) +# Odes +Odes=Odes +# Psalms of Solomon +Psalms of Solomon=Ps Sal + +# Rahlfs' variant books* (6) +# Joshua Codex Alexandrinus +Joshua Codex Alexandrinus=JosA +# Judges Codex Vaticanus +Judges Codex Vaticanus=JgV +# Tobit Codex Sinaiticus +Tobit Codex Sinaiticus=TobS +# Susanna Theodotion +Susanna Theodotion=SusTh +# Daniel Theodotion +Daniel Theodotion=DanTh +# Bel and the Dragon Theodotion +Bel and the Dragon Theodotion=BelTh + +# Vulgate & other later Latin mss* (6) +# Laodiceans +Laodiceans=Laod +# V Ezra +V Ezra=5 Esd +# IV Ezra +IV Ezra=Ap Esd +# VI Ezra +VI Ezra=6 Esd +# Prayer of Solomon +Prayer of Solomon=PrSal +# Prayer of Jeremiah +Prayer of Jeremiah=PrJér + +# Ethiopian Orthodox Canon/Ge'ez Translation Additions (7) +# I Enoch +I Enoch=Hén +# Jubilees +Jubilees=Jub +# IV Baruch +IV Baruch=4 Bar +# I Meqabyan +I Meqabyan=1 M Ét +# II Meqabyan +II Meqabyan=2 M Ét +# III Meqabyan +III Meqabyan=3 M Ét +# Reproof +#Reproof= +# Additions to Jeremiah +#Additions to Jeremiah= +# Pseudo-Josephus +#Pseudo-Josephus= -GN=Gen +# Armenian Orthodox Canon Additions (7/19) +# Epistle of the Corinthians to Paul +Epistle of the Corinthians to Paul=CoP +# III Corinthians +III Corinthians=3 Cor +# Words of Sirach +#Words of Sirach= +# Prayer of Euthalius +#Prayer of Euthalius= +# Dormition of John +Dormition of John=DormJean +# Joseph and Asenath +Joseph and Asenath=JosAsen +# Testaments of the Twelve Patriarchs (composed of:) +Testaments of the Twelve Patriarchs (composed of:)=T12Patr +# Testament of Asher +Testament of Asher=tAser +# Testament of Benjamin +Testament of Benjamin=tBen +# Testament of Dan +Testament of Dan=tDan +# Testament of Gad +Testament of Gad=tGad +# Testament of Issachar +Testament of Issachar=tIss +# Testament of Joseph +Testament of Joseph=tJos +# Testament of Judah +Testament of Judah=tJuda +# Testament of Levi +Testament of Levi=tLévi +# Testament of Naphtali +Testament of Naphtali=tNeph +# Testament of Reuben +Testament of Reuben=tRub +# Testament of Simeon +Testament of Simeon=tSim +# Testament of Zebulun +Testament of Zebulun=tZab + +# Peshitta/Syriac Orthodox Canon (4) +# II Baruch +#II Baruch= +# Letter of Baruch +#Letter of Baruch= +# Additional Syriac Psalms +#Additional Syriac Psalms= +# Josephus' Jewish War VI +#Josephus' Jewish War VI= + +# Apostolic Fathers (19/22) +# I Clement +I Clement=1 Clém +# II Clement +II Clement=2 Clém +# Ignatius to the Ephesians +#Ignatius to the Ephesians= +# Ignatius to the Magnesians +#Ignatius to the Magnesians= +# Ignatius to the Trallians +#Ignatius to the Trallians= +# Ignatius to the Romans +#Ignatius to the Romans= +# Ignatius to the Philadelphians +#Ignatius to the Philadelphians= +# Ignatius to the Smyrnaeans +#Ignatius to the Smyrnaeans= +# Ignatius to Polycarp +#Ignatius to Polycarp= +# Polycarp to the Philippians +#Polycarp to the Philippians= +# Martyrdom of Polycarp +#Martyrdom of Polycarp= +# Didache +Didache=Did +# Barnabas +#Barnabas= +# Shepherd of Hermas (comprised of:) +Shepherd of Hermas (comprised of:)=Herm +# Shepherd of Hermas, Mandates +#Shepherd of Hermas, Mandates= +# Shepherd of Hermas, Similitudes +#Shepherd of Hermas, Similitudes= +# Shepherd of Hermas, Visions +#Shepherd of Hermas, Visions= +# Diognetus +#Diognetus= +# Apostles' Creed +#Apostles' Creed= +# Fragments of Papias +#Fragments of Papias= +# Reliques of the Elders +#Reliques of the Elders= +# Fragment of Quadratus +#Fragment of Quadratus= + +# Other (2) +# Diatessaron +#Diatessaron= +# Metrical Psalms +#Metrical Psalms= + +[Book Abbrevs] +GEN=Gen EX=Exod -LV=Lev +LÉV=Lev NB=Num -DT=Deut +DEUT=Deut JOS=Josh -JG=Judg -RT=Ruth -1S=1Sam -2S=2Sam -1R=1Kgs -2R=2Kgs -1CH=1Chr -2CH=2Chr -ESD=Ezra -NE=Neh -EST=Esth -JB=Job +JUG=Judg +RUTH=Ruth +1 SAM=1Sam +2 SAM=2Sam +1 ROIS=1Kgs +2 ROIS=2Kgs +1 CHR=1Chr +2 CHR=2Chr +ESDR=Ezra +NÉH=Neh +ESTH=Esth +JOB=Job PS=Ps -PR=Prov -ECC=Eccl -CT=Song +PROV=Prov +ECCL=Eccl +CANT=Song ÉS=Isa -JR=Jer -LM=Lam -EZ=Ezek -DN=Dan +JÉR=Jer +LAM=Lam +ÉZ=Ezek +DAN=Dan OS=Hos -JL=Joel +JOËL=Joel AM=Amos -AB=Obad +ABD=Obad JON=Jonah -MI=Mic -NA=Nah -HA=Hab -SO=Zeph -AG=Hag -ZA=Zech -ML=Mal +MICH=Mic +NAH=Nah +HAB=Hab +SOPH=Zeph +AGG=Hag +ZACH=Zech +MAL=Mal MT=Matt -MC=Mark -LC=Luke -JN=John -AC=Acts -RM=Rom -1CO=1Cor -2CO=2Cor -GA=Gal +MARC=Mark +LUC=Luke +JEAN=John +ACT=Acts +ROM=Rom +1 COR=1Cor +2 COR=2Cor +GAL=Gal ÉPH=Eph -PH=Phil +PHP=Phil COL=Col -1TH=1Thess -2TH=2Thess -1TM=1Tim -2TM=2Tim -TT=Titus +1 TH=1Thess +2 TH=2Thess +1 TIM=1Tim +2 TIM=2Tim +TITE=Titus PHM=Phlm -HE=Heb -JC=Jas -1P=1Pet -2P=2Pet -1JN=1John -2JN=2John -3JN=3John -JD=Jude -AP=Rev +HÉBR=Heb +JACQ=Jas +1 P=1Pet +2 P=2Pet +1 JN=1John +2 JN=2John +3 JN=3John +JUDE=Jude +APOC=Rev +TOB=Tob +JDT=Jdt +ESTGREC=EsthGr +ADDEST=AddEsth +SAG=Wis +PRSIR=SirP +SIR=Sir +BAR=Bar +LTJR=EpJer +DANGREC=DanGr +ADDDAN=AddDan +PRAZAR=PrAzar +SUZ=Sus +BEL=Bel +1 M=1Macc +2 M=2Macc +3 M=3Macc +4 M=4Macc +MAN=PrMan +3 ESD=1Esd +4 ESD=2Esd +PS 151=AddPs +ODES=Odes +PS SAL=PssSol +JOSA=JoshA +JGV=JudgB +TOBS=TobS +SUSTH=SusTh +DANTH=DanTh +BELTH=BelTh +LAOD=EpLao +5 ESD=5Ezra +AP ESD=4Ezra +6 ESD=6Ezra +PRSAL=PrSol +PRJÉR=PrJer +HÉN=1En +JUB=Jub +4 BAR=4Bar +1 M ÉT=1Meq +2 M ÉT=2Meq +3 M ÉT=3Meq +COP=EpCorPaul +3 COR=3Cor +DORMJEAN=DormJohn +JOSASEN=JosAsen +T12PATR=T12Patr +TASER=T12Patr.Tash +TBEN=T12Patr.Tbenj +TDAN=T12Patr.Tdan +TGAD=T12Patr.Tgad +TISS=T12Patr.Tiss +TJOS=T12Patr.Tjos +TJUDA=T12Patr.Tjud +TLÉVI=T12Patr.Tlevi +TNEPH=T12Patr.Tnaph +TRUB=T12Patr.Treu +TSIM=T12Patr.Tsim +TZAB=T12Patr.Tzeb +1 CLÉM=1Clem +2 CLÉM=2Clem +DID=Did +HERM=Herm diff --git a/locales.d/fr_abbrev.conf b/locales.d/fr_abbrev.conf index 5671e44..5c3c3ca 100644 --- a/locales.d/fr_abbrev.conf +++ b/locales.d/fr_abbrev.conf @@ -1,9 +1,6 @@ -# -# French Bible bookname abbreviations -- derived from the "Louis Segond 1910" -# Corrections & Contributions welcome -# -# Dominique Corbex domcox@users.sf.net -# +# File creation: 2017-01-20 +# French translation for Sword +# Provided by yvand <yvand.sword@gmail.com>, Cyrille <lafricain79@gmail.com>, domcox <dominique@corbex.org> [Meta] Name=fr_abbrev @@ -11,152 +8,471 @@ Description=French abbreviations Encoding=ISO8859-1 [Text] -Genesis=Ge +# Old Testament* (39) +# Genesis +Genesis=Gen +# Exodus Exodus=Ex -Leviticus=L -Numbers=No -Deuteronomy=De +# Leviticus +Leviticus=Lv +# Numbers +Numbers=Nb +# Deuteronomy +Deuteronomy=Deut +# Joshua Joshua=Jos -Judges=Jg -Ruth=Ru -I Samuel=1 S -II Samuel=2 S -I Kings=1 R -II Kings=2 R -I Chronicles=1 Ch -II Chronicles=2 Ch -Ezra=Esd -Nehemiah=N -Esther=Est +# Judges +Judges=Jug +# Ruth +Ruth=Ruth +# I Samuel +I Samuel=1 Sam +# II Samuel +II Samuel=2 Sam +# I Kings +I Kings=1 Rois +# II Kings +II Kings=2 Rois +# I Chronicles +I Chronicles=1 Chr +# II Chronicles +II Chronicles=2 Chr +# Ezra +Ezra=Esdr +# Nehemiah +Nehemiah=Nh +# Esther +Esther=Esth +# Job Job=Job +# Psalms Psalms=Ps -Proverbs=Pr -Ecclesiastes=Ec -Song of Solomon=Ca -Isaiah=Es -Jeremiah=J -Lamentations=La -Ezekiel=Ez -Daniel=Da +# Proverbs +Proverbs=Prov +# Ecclesiastes +Ecclesiastes=Eccl +# Song of Solomon +Song of Solomon=Cant +# Isaiah +Isaiah=s +# Jeremiah +Jeremiah=Jr +# Lamentations +Lamentations=Lam +# Ezekiel +Ezekiel=z +# Daniel +Daniel=Dan +# Hosea Hosea=Os -Joel=Jo +# Joel +Joel=Jol +# Amos Amos=Am -Obadiah=Ab +# Obadiah +Obadiah=Abd +# Jonah Jonah=Jon -Micah=Mi -Nahum=Na -Habakkuk=Ha -Zephaniah=So -Haggai=Ag -Zechariah=Za +# Micah +Micah=Mich +# Nahum +Nahum=Nah +# Habakkuk +Habakkuk=Hab +# Zephaniah +Zephaniah=Soph +# Haggai +Haggai=Agg +# Zechariah +Zechariah=Zach +# Malachi Malachi=Mal + +# New Testament* (27) +# Matthew Matthew=Mt -Mark=Mc -Luke=Lu -John=Jn -Acts=Ac -Romans=Ro -I Corinthians=1 Co -II Corinthians=2 Co -Galatians=Ga -Ephesians=Ep -Philippians=Ph +# Mark +Mark=Marc +# Luke +Luke=Luc +# John +John=Jean +# Acts +Acts=Act +# Romans +Romans=Rom +# I Corinthians +I Corinthians=1 Cor +# II Corinthians +II Corinthians=2 Cor +# Galatians +Galatians=Gal +# Ephesians +Ephesians=ph +# Philippians +Philippians=Php +# Colossians Colossians=Col +# I Thessalonians I Thessalonians=1 Th +# II Thessalonians II Thessalonians=2 Th -I Timothy=1 Ti -II Timothy=2 Ti -Titus=Tit +# I Timothy +I Timothy=1 Tim +# II Timothy +II Timothy=2 Tim +# Titus +Titus=Tite +# Philemon Philemon=Phm -Hebrews=H -James=Ja -I Peter=1 Pi -II Peter=2 Pi +# Hebrews +Hebrews=Hbr +# James +James=Jacq +# I Peter +I Peter=1 P +# II Peter +II Peter=2 P +# I John I John=1 Jn +# II John II John=2 Jn +# III John III John=3 Jn -Jude=Jud -Revelation of John=Ap +# Jude +Jude=Jude +# Revelation of John +Revelation of John=Apoc -[Book Abbrevs] +# Apocrypha/Deuterocanon* (22) +# Tobit +Tobit=Tob +# Judith +Judith=Jdt +# Esther (Greek) +Esther (Greek)=Estgrec +# Additions to Esther +Additions to Esther=AddEst +# Wisdom +Wisdom=Sag +# Sirach (Prologue) +Sirach (Prologue)=PrSir +# Sirach +Sirach=Sir +# Baruch +Baruch=Bar +# Epistle of Jeremiah +Epistle of Jeremiah=LtJr +# Daniel (Greek) +Daniel (Greek)=Dangrec +# Additions to Daniel +Additions to Daniel=AddDan +# Prayer of Azariah +Prayer of Azariah=PrAzar +# Susanna +Susanna=Suz +# Bel and the Dragon +Bel and the Dragon=Bel +# I Maccabees +I Maccabees=1 M +# II Maccabees +II Maccabees=2 M +# III Maccabees +III Maccabees=3 M +# IV Maccabees +IV Maccabees=4 M +# Prayer of Manasses +Prayer of Manasses=Man +# I Esdras +I Esdras=3 Esd +# II Esdras +II Esdras=4 Esd +# Additional Psalm +Additional Psalm=Ps 151 + +# Rahlfs' LXX* (2) +# Odes +Odes=Odes +# Psalms of Solomon +Psalms of Solomon=Ps Sal + +# Rahlfs' variant books* (6) +# Joshua Codex Alexandrinus +Joshua Codex Alexandrinus=JosA +# Judges Codex Vaticanus +Judges Codex Vaticanus=JgV +# Tobit Codex Sinaiticus +Tobit Codex Sinaiticus=TobS +# Susanna Theodotion +Susanna Theodotion=SusTh +# Daniel Theodotion +Daniel Theodotion=DanTh +# Bel and the Dragon Theodotion +Bel and the Dragon Theodotion=BelTh + +# Vulgate & other later Latin mss* (6) +# Laodiceans +Laodiceans=Laod +# V Ezra +V Ezra=5 Esd +# IV Ezra +IV Ezra=Ap Esd +# VI Ezra +VI Ezra=6 Esd +# Prayer of Solomon +Prayer of Solomon=PrSal +# Prayer of Jeremiah +Prayer of Jeremiah=PrJr + +# Ethiopian Orthodox Canon/Ge'ez Translation Additions (7) +# I Enoch +I Enoch=Hn +# Jubilees +Jubilees=Jub +# IV Baruch +IV Baruch=4 Bar +# I Meqabyan +I Meqabyan=1 M t +# II Meqabyan +II Meqabyan=2 M t +# III Meqabyan +III Meqabyan=3 M t +# Reproof +#Reproof= +# Additions to Jeremiah +#Additions to Jeremiah= +# Pseudo-Josephus +#Pseudo-Josephus= + +# Armenian Orthodox Canon Additions (7/19) +# Epistle of the Corinthians to Paul +Epistle of the Corinthians to Paul=CoP +# III Corinthians +III Corinthians=3 Cor +# Words of Sirach +#Words of Sirach= +# Prayer of Euthalius +#Prayer of Euthalius= +# Dormition of John +Dormition of John=DormJean +# Joseph and Asenath +Joseph and Asenath=JosAsen +# Testaments of the Twelve Patriarchs (composed of:) +Testaments of the Twelve Patriarchs (composed of:)=T12Patr +# Testament of Asher +Testament of Asher=tAser +# Testament of Benjamin +Testament of Benjamin=tBen +# Testament of Dan +Testament of Dan=tDan +# Testament of Gad +Testament of Gad=tGad +# Testament of Issachar +Testament of Issachar=tIss +# Testament of Joseph +Testament of Joseph=tJos +# Testament of Judah +Testament of Judah=tJuda +# Testament of Levi +Testament of Levi=tLvi +# Testament of Naphtali +Testament of Naphtali=tNeph +# Testament of Reuben +Testament of Reuben=tRub +# Testament of Simeon +Testament of Simeon=tSim +# Testament of Zebulun +Testament of Zebulun=tZab -GN=Gen +# Peshitta/Syriac Orthodox Canon (4) +# II Baruch +#II Baruch= +# Letter of Baruch +#Letter of Baruch= +# Additional Syriac Psalms +#Additional Syriac Psalms= +# Josephus' Jewish War VI +#Josephus' Jewish War VI= + +# Apostolic Fathers (19/22) +# I Clement +I Clement=1 Clm +# II Clement +II Clement=2 Clm +# Ignatius to the Ephesians +#Ignatius to the Ephesians= +# Ignatius to the Magnesians +#Ignatius to the Magnesians= +# Ignatius to the Trallians +#Ignatius to the Trallians= +# Ignatius to the Romans +#Ignatius to the Romans= +# Ignatius to the Philadelphians +#Ignatius to the Philadelphians= +# Ignatius to the Smyrnaeans +#Ignatius to the Smyrnaeans= +# Ignatius to Polycarp +#Ignatius to Polycarp= +# Polycarp to the Philippians +#Polycarp to the Philippians= +# Martyrdom of Polycarp +#Martyrdom of Polycarp= +# Didache +Didache=Did +# Barnabas +#Barnabas= +# Shepherd of Hermas (comprised of:) +Shepherd of Hermas (comprised of:)=Herm +# Shepherd of Hermas, Mandates +#Shepherd of Hermas, Mandates= +# Shepherd of Hermas, Similitudes +#Shepherd of Hermas, Similitudes= +# Shepherd of Hermas, Visions +#Shepherd of Hermas, Visions= +# Diognetus +#Diognetus= +# Apostles' Creed +#Apostles' Creed= +# Fragments of Papias +#Fragments of Papias= +# Reliques of the Elders +#Reliques of the Elders= +# Fragment of Quadratus +#Fragment of Quadratus= + +# Other (2) +# Diatessaron +#Diatessaron= +# Metrical Psalms +#Metrical Psalms= + +[Book Abbrevs] +GEN=Gen EX=Exod -LV=Lev +LV=Lev NB=Num -DT=Deut +DEUT=Deut JOS=Josh -JG=Judg -RT=Ruth -1S=1Sam -2S=2Sam -1R=1Kgs -2R=2Kgs -1CH=1Chr -2CH=2Chr -ESD=Ezra -NE=Neh -EST=Esth -JB=Job +JUG=Judg +RUTH=Ruth +1 SAM=1Sam +2 SAM=2Sam +1 ROIS=1Kgs +2 ROIS=2Kgs +1 CHR=1Chr +2 CHR=2Chr +ESDR=Ezra +NH=Neh +ESTH=Esth +JOB=Job PS=Ps -PR=Prov -ECC=Eccl -CCLSIASTE=Eccl -CT=Song +PROV=Prov +ECCL=Eccl +CANT=Song S=Isa -JR=Jer -LM=Lam -EZ=Ezek -DN=Dan +JR=Jer +LAM=Lam +Z=Ezek +DAN=Dan OS=Hos -JL=Joel +JOL=Joel AM=Amos -AB=Obad +ABD=Obad JON=Jonah -MI=Mic -NA=Nah -HA=Hab -SO=Zeph -AG=Hag -ZA=Zech -ML=Mal +MICH=Mic +NAH=Nah +HAB=Hab +SOPH=Zeph +AGG=Hag +ZACH=Zech +MAL=Mal MT=Matt -MC=Mark -LC=Luke -JN=John -AC=Acts -RM=Rom -1CO=1Cor -2CO=2Cor -GA=Gal +MARC=Mark +LUC=Luke +JEAN=John +ACT=Acts +ROM=Rom +1 COR=1Cor +2 COR=2Cor +GAL=Gal PH=Eph -PH=Phil +PHP=Phil COL=Col -1TH=1Thess -2TH=2Thess -1TM=1Tim -2TM=2Tim -TT=Titus +1 TH=1Thess +2 TH=2Thess +1 TIM=1Tim +2 TIM=2Tim +TITE=Titus PHM=Phlm -HE=Heb -JC=Jas -1P=1Pet -2P=2Pet -1JN=1John -2JN=2John -3JN=3John -JD=Jude -AP=Rev - -L=Lev -NO=Num -1 R=1Kgs -2 R=2Kgs -N=Neh -ES=Isa -J=Jer -JO=Joel -H=Heb -1 PI=1Pet -2 PI=2Pet - +HBR=Heb +JACQ=Jas +1 P=1Pet +2 P=2Pet +1 JN=1John +2 JN=2John +3 JN=3John +JUDE=Jude +APOC=Rev +TOB=Tob +JDT=Jdt +ESTGREC=EsthGr +ADDEST=AddEsth +SAG=Wis +PRSIR=SirP +SIR=Sir +BAR=Bar +LTJR=EpJer +DANGREC=DanGr +ADDDAN=AddDan +PRAZAR=PrAzar +SUZ=Sus +BEL=Bel +1 M=1Macc +2 M=2Macc +3 M=3Macc +4 M=4Macc +MAN=PrMan +3 ESD=1Esd +4 ESD=2Esd +PS 151=AddPs +ODES=Odes +PS SAL=PssSol +JOSA=JoshA +JGV=JudgB +TOBS=TobS +SUSTH=SusTh +DANTH=DanTh +BELTH=BelTh +LAOD=EpLao +5 ESD=5Ezra +AP ESD=4Ezra +6 ESD=6Ezra +PRSAL=PrSol +PRJR=PrJer +HN=1En +JUB=Jub +4 BAR=4Bar +1 M T=1Meq +2 M T=2Meq +3 M T=3Meq +COP=EpCorPaul +3 COR=3Cor +DORMJEAN=DormJohn +JOSASEN=JosAsen +T12PATR=T12Patr +TASER=T12Patr.Tash +TBEN=T12Patr.Tbenj +TDAN=T12Patr.Tdan +TGAD=T12Patr.Tgad +TISS=T12Patr.Tiss +TJOS=T12Patr.Tjos +TJUDA=T12Patr.Tjud +TLVI=T12Patr.Tlevi +TNEPH=T12Patr.Tnaph +TRUB=T12Patr.Treu +TSIM=T12Patr.Tsim +TZAB=T12Patr.Tzeb +1 CLM=1Clem +2 CLM=2Clem +DID=Did +HERM=Herm diff --git a/locales.d/kpg-utf8.conf b/locales.d/kpg-utf8.conf new file mode 100644 index 0000000..4debd14 --- /dev/null +++ b/locales.d/kpg-utf8.conf @@ -0,0 +1,158 @@ +[Meta] +Name=kpg +Description=Kapingamarangi +Encoding=UTF-8 + +[Text] +Genesis=Genesis +Exodus=Exodus +Leviticus=Leviticus +Numbers=Numbers +Deuteronomy=Deuteronomy +Joshua=Joshua +Judges=Gabunga +Ruth=Ruth +I Samuel=1 Samuel +II Samuel=2 Samuel +I Kings=1 King +II Kings=2 King +I Chronicles=1 Kronikel +II Chronicles=2 Kronikel +Ezra=Ezra +Nehemiah=Nehemiah +Esther=Esther +Job=Job +Psalms=Pisalem +Proverbs=Agoago Podo +Ecclesiastes=Ecclesiastes +Song of Solomon=Daahili Aloho +Isaiah=Isaiah +Jeremiah=Jeremiah +Lamentations=Taahili Manawa gee +Ezekiel=Ezekiel +Daniel=Daniel +Hosea=Hosea +Joel=Joel +Amos=Amos +Obadiah=Obadiah +Jonah=Jonah +Micah=Micah +Nahum=Nahum +Habakkuk=Habakkuk +Zephaniah=Zephaniah +Haggai=Haggai +Zechariah=Zechariah +Malachi=Malachi +Matthew=Matthew +Mark=Mark +Luke=Luke +John=John +Acts=Nnegau +Romans=Romans +I Corinthians=1 Corinthians +II Corinthians=2 Corinthians +Galatians=Galatians +Ephesians=Ephesians +Philippians=Philippians +Colossians=Colossians +I Thessalonians=1 Thessalonians +II Thessalonians=2 Thessalonians +I Timothy=1 Timothy +II Timothy=2 Timothy +Titus=Titus +Philemon=Philemon +Hebrews=Hebrews +James=James +I Peter=1 Peter +II Peter=2 Peter +I John=1 John +II John=2 John +III John=3 John +Jude=Jude +Revelation to John=Hagagida + +[Book Abbrevs] +GEN=Gen +EXO=Exod +LEV=Lev +NUMBERS=Num +DEU=Deut +JOSHUA=Josh +GABUNGA=Judg +RUTH=Ruth +1 SAMUEL=1Sam +1SAMUEL=1Sam +2 SAMUEL=2Sam +2SAMUEL=2Sam +1 KINGS=1Kgs +1KINGS=1Kgs +2 KINGS=2Kgs +2KINGS=2Kgs +1 CHRONICLES=1Chr +1CHRONICLES=1Chr +2-KRONIKEL=2Chr +EZRA=Ezra +NEH=Neh +EST=Esth +JOB=Job +PISALEM=Ps +PROVERBS=Prov +ECCLESIASTES=Eccl +SONG OF SONGS=Song +SONGOFSONGS=Song +ISAIAH=Isa +JEREMIAH=Jer +LAM=Lam +EZE=Ezek +DAN=Dan +HOS=Hos +JOEL=Joel +AMOS=Amos +OBADIAH=Obad +JONAH=Jonah +MICAH=Mic +NAHUM=Nah +HABAKKUK=Hab +ZEPHANIAH=Zeph +HAGGAI=Hag +ZECHARIAH=Zech +MALACHI=Mal +MAT=Matt +MARK=Mark +LUKE=Luke +JOHN=John +ACTS=Acts +ROM=Rom +1 CORINTHIANS=1Cor +1CORINTHIANS=1Cor +2 CORINTHIANS=2Cor +2CORINTHIANS=2Cor +GALATIANS=Gal +EPHESIANS=Eph +PHILIPPIANS=Phil +COLOSSIANS=Col +1 THESSALONIANS=1Thess +1THESSALONIANS=1Thess +2 THESSALONIANS=2Thess +2THESSALONIANS=2Thess +1 TIMOTHY=1Tim +1TIMOTHY=1Tim +2 TIMOTHY=2Tim +2TIMOTHY=2Tim +TITUS=Titus +PHILEMON=Phlm +HEB=Heb +JAMES=Jas +1 PETER=1Pet +1PETER=1Pet +2 PETER=2Pet +2PETER=2Pet +1 JOHN=1John +1JOHN=1John +2 JOHN=2John +2JOHN=2John +3 JOHN=3John +3JOHN=3John +JUDE=Jude +REV=Rev + diff --git a/locales.d/lt-utf8.conf b/locales.d/lt-utf8.conf index 8d36e0e..801fb75 100644 --- a/locales.d/lt-utf8.conf +++ b/locales.d/lt-utf8.conf @@ -74,6 +74,52 @@ III John=III Jono Jude=Judo Revelation of John=Apreiškimas Jonui +# Apocrypha/Deuterocanon* (22) +# Tobit +Tobit=Tobito +# Judith +Judith=Juditos +# Esther (Greek) +#Esther (Greek)=Esther grec +# Additions to Esther +#Additions to Esther=Additions à Esther +# Wisdom +Wisdom=Išminties +# Sirach (Prologue) +#Sirach (Prologue)=Prologue du Siracide +# Sirach +Sirach=Siracido +# Baruch +Baruch=Barucho +# Epistle of Jeremiah +#Epistle of Jeremiah=Lettre de Jérémie +# Daniel (Greek) +#Daniel (Greek)=Daniel grec +# Additions to Daniel +#Additions to Daniel=Additions à Daniel +# Prayer of Azariah +#Prayer of Azariah=Prière d’Azarias +# Susanna +#Susanna=Suzanne +# Bel and the Dragon +#Bel and the Dragon=Bel et le dragon +# I Maccabees +I Maccabees=I Makabiejų +# II Maccabees +II Maccabees=II Makabiejų +# III Maccabees +#III Maccabees=III-oji Makabiejų +# IV Maccabees +#IV Maccabees=IV-oji Makabiejų +# Prayer of Manasses +#Prayer of Manasses=Prière de Manassé +# I Esdras +#I Esdras=I Ezdro +# II Esdras +#II Esdras=II Ezdro +# Additional Psalm +#Additional Psalm=Psaume 151 + [Book Abbrevs] PR=Gen @@ -395,3 +441,28 @@ APREIŠK=Rev APREIŠKIM=Rev APREIŠKIMAS=Rev APREIŠKIMAS JONUI=Rev + +Tobito=Tob +Juditos=Jdt +#Esther (Greek)=Esther grec +#Additions to Esther=Additions à Esther +Iš=Wis +Išminties=Wis +#Sirach (Prologue)=Prologue du Siracide +Siracido=Sir +Barucho=Bar +#Epistle of Jeremiah=Lettre de Jérémie +#Daniel (Greek)=Daniel grec +#Additions to Daniel=Additions à Daniel +#Prayer of Azariah=Prière d’Azarias +#Susanna=Suzanne +#Bel and the Dragon=Bel et le dragon +I Makabiejų=1Macc +II Makabiejų=2Macc +#III-oji Makabiejų=3Macc +#IV-oji Makabiejų=4Macc +#Prayer of Manasses=Prière de Manassé +#I Ezdro=1Ezra +#II Ezdro=2Ezra +#Additional Psalm=Psaume 15 + diff --git a/locales.d/lv-utf8.conf b/locales.d/lv-utf8.conf new file mode 100644 index 0000000..223dcf1 --- /dev/null +++ b/locales.d/lv-utf8.conf @@ -0,0 +1,315 @@ +# Letvian book locale file in UTF-8 encoding made by Br Vidas and Br Janis +# 2016-09-14 + +[Meta] +Name=lv +Description=Letvian +Encoding=UTF-8 + +[Text] +Genesis=Radīšanas grāmata +Exodus=Izceļošanas grāmata +Leviticus=Levītu grāmata +Numbers=Skaitļu grāmata +Deuteronomy=Atkārtotā likuma grāmata +Joshua=Jozus grāmata +Judges=Tiesnešu grāmata +Ruth=Rutas grāmata +I Samuel=Samuēla pirmā grāmata +II Samuel=Samuēla otrā grāmata +I Kings=Ķēniņu pirmā grāmata +II Kings=Ķēniņu otrā grāmata +I Chronicles=Hroniku pirmā grāmata +II Chronicles=Hroniku otrā grāmata +Ezra=Ezras grāmata +Nehemiah=Nehemija grāmata +Tobit=Tobija grāmata +Judith=Judītes grāmata +Esther=Esteres grāmata +I Maccabees=Makabiešu pirmā grāmata +II Maccabees=Makabiešu ptrā grāmata +Job=Ījaba grāmata +Psalms=Psalmi +Proverbs=Sakāmvārdu grāmata +Ecclesiastes=Mācību teicēja grāmata +Song of Solomon=Dziesmu dziesma +Wisdom=Gudrības grāmata +Sirach=Sīraha dēla grāmata +Isaiah=Isaja grāmata +Jeremiah=Jeremija grāmata +Baruch=Baruha grāmata +Lamentations=Raudu dziesmas +Ezekiel=Ezehiēla grāmata +Daniel=Daniēla grāmata +Hosea=Oseja grāmata +Joel=Joēla grāmata +Amos=Amosa grāmata +Obadiah=Abdija grāmata +Jonah=Jonasa grāmata +Micah=Mihas grāmata +Nahum=Nahuma grāmata +Habakkuk=Habakuka grāmata +Zephaniah=Sofonija grāmata +Haggai=Ageja grāmata +Zechariah=Zaharija grāmata +Malachi=Malahija grāmata +Matthew=Mateja evanģēlijs +Mark=Marka evanģēlijs +Luke=Lūkasa evanģēlijs +John=Jāņa evanģēlijs +Acts= Apustuļu darbi +Romans=Vēstule romiešiem +I Corinthians=Pirmā vēstule Korintiešiem +II Corinthians=Otrā vēstule Korintiešiem +Galatians=Vēstule galatiešiem +Ephesians=Vēstuleefeziešiem +Philippians=Vēstule filipiešiem +Colossians=Vēstule kolosiešiem +I Thessalonians=Pirmā vēstule tesalonīkiešiem +II Thessalonians=Otrā vēstule tesalonīkiešiem +I Timothy=Pirmā vēstule Timotejam +II Timothy=Otrā vēstule Timotejam +Titus=Vēstule Titam +Philemon=Vēstule Filemonam +Hebrews=Vēstule ebrejiem +James=Jēkaba vēstule +I Peter=Pētera pirmā vēstule +II Peter=Pētera otrā vēstule +I John=Jāņa pirmā vēstule +II John=Jāņa otrā vēstule +III John=Jāņa trešā vēstule +Jude=Jūdas vēstule +Revelation of John=Atklāsmes grāmata + +[Book Abbrevs] + +Radīšanas grāmata=Gen +Izceļošanas grāmata=Exod +Levītu grāmata=Lev +Skaitļu grāmata=Num +Atkārtotā likuma grāmata=Deut +Jozus grāmata=Josh +Tiesnešu grāmata=Judg +Rutas grāmata=Ruth +Samuēla pirmā grāmata=1Sam +Samuēla otrā grāmata=2Sam +Ķēniņu pirmā grāmata=1Ķgs +Ķēniņu otrā grāmata=2Ķgs +Hroniku pirmā grāmata=1Chr +Hroniku otrā grāmata=2Chr +Ezras grāmata=Ezra +Nehemija grāmata=Neh +Tobija grāmata=Tob +Judītes grāmata=Jdt +Esteres grāmata=Esth +Makabiešu pirmā grāmata=1Macc +Makabiešu ptrā grāmata=2Macc +Ījaba grāmata=Job +Psalmi=Ps +Sakāmvārdu grāmata=Prov +Mācību teicēja grāmata=Eccl +Dziesmu dziesma=Song +Gudrības grāmata=Wis +Sīraha dēla grāmata=Sir +Isaja grāmata=Isa +Jeremija grāmata=Jer +Baruha grāmata=Bar +Raudu dziesmas=Lam +Ezehiēla grāmata=Ezek +Daniēla grāmata=Dan +Oseja grāmata=Hos +Joēla grāmata=Joel +Amosa grāmata=Amos +Abdija grāmata=Obad +Jonasa grāmata=Jonah +Mihas grāmata=Mic +Nahuma grāmata=Nah +Habakuka grāmata=Hab +Sofonija grāmata=Zeph +Ageja grāmata=Hag +Zaharija grāmata=Zech +Malahija grāmata=Mal +Mateja evanģēlijs=Matt +Marka evanģēlijs=Mark +Lūkasa evanģēlijs=Luke +Jāņa evanģēlijs=John +Apustuļu darbi=Acts +Vēstule romiešiem=Rom +Pirmā vēstule Korintiešiem=1Cor +Otrā vēstule Korintiešiem=2Cor +Vēstule galatiešiem=Gal +Vēstule efeziešiem=Eph +Vēstule filipiešiem=Phil +Vēstule kolosiešiem=Col +Pirmā vēstule tesalonīkiešiem=1Thess +Otrā vēstule tesalonīkiešiem=2Thess +Pirmā vēstule Timotejam=1Tim +Otrā vēstule Timotejam=2Tim +Vēstule Titam=Titus +Vēstule Filemonam=Phlm +Vēstule ebrejiem=Heb +Jēkaba vēstule=Jas +Pētera pirmā vēstule=1Pet +Pētera otrā vēstule=2Pet +Jāņa pirmā vēstule=1Johņ +Jāņa otrā vēstule=2Johņ +Jāņa trešā vēstule=3Johņ +Jūdas vēstule=Jude +Atklāsmes grāmata=Rev + +[Book Abbrevs] + +Rad=Gen +Radīšanas=Gen +Izc=Exod +Izceļošanas=Exod +Lev=Lev +Levītu=Lev +SK=Num +Skaitļu=Num +At=Deut +Atkārtotā=Deut +Atkārtotā likuma=Deut +Joz=Josh +Jozus=Josh +Ties=Judg +Tiesnešu=Judg +RUT=Ruth +RUTAS=Ruth +1SAM=1Sam +1Samuēla=1Sam +1 SAM=1Sam +1 Samuēla=1Sam +I SAM=1Sam +I Samuēla=1Sam +2 SAM=2Sam +2 Samuēla=2Sam +II SAM=2Sam +II Samuēla=2Sam +1Ķēn=1Kgs +1 Ķēn=1Kgs +1Ķēniņu=1Kgs +1 KARALIŲ=1Kgs +I Ķēn=1Kgs +I Ķēniņu=1Kgs +2Ķēn=2Kgs +2 Ķēn=2Kgs +2Ķēniņu=2Kgs +2 Ķēniņu=2Kgs +II Ķēn=2Kgs +II Ķēniņu=2Kgs +1Hr=1Chr +1Hroniku=1Chr +1 Hr=1Chr +1Hroniku=1Chr +I Hr=1Chr +I Hroniku=1Chr +2Hr=2Chr +2Hroniku=2Chr +2 Hr=2Chr +2Hroniku=2Chr +II Hr=2Chr +II Hroniku=2Chr +I Mak=1Macc +I Makabiešu=1Macc +II Mak=2MaccF +II Makabiešu=2Macc +EZR=Ezra +EZRAS=Ezra +NEH=Neh +Nehemija=Neh +TOB=Tob +TOBIJA=Tob +JUDT=Jdt +EST=Esth +ESTERES=Esth +JUDITH=Jdt +ESTHER=Esth +1 Mak=1Macc +2 Mak=2Macc +JOB=Job +JOBO=Job +PS=Ps +SAK=Prov +Māc=Eccl +DZ=Song +Gudr=Wis +Sīr=Sir +IS=Isa +JER=Jer +JEREM=Jer +Jeremija=Jer +Bar=Bar +Baruha=Bar +Rdz=Lam +EZ=Ezek +DAN=Dan +Daniēla=Dan +Os=Hos +Oseja=Hos +JL=Joel +Joēla=Joel +AM=Amos +ABD=Obad +Jon=Jonah +MIH=Mic +NAH=Nah +HAB=Hab +SOF=Zeph +AG=Hag +ZAH=Zech +MAL=Mal +MT=Matt +MK=Mark +LK=Luke +JN=John +JON=John +APD=Acts +Apustuļu=Acts +RM=Rom +1KOR=1Cor +1 KOR=1Cor +I KOR=1Cor +2KOR=2Cor +2 KOR=2Cor +II KOR=2Cor +GAL=Gal +EF=Eph +Flp=Phil +KOL=Col +1TES=1Thess +1 TES=1Thess +I TES=1Thess +2TES=2Thess +2 TES=2Thess +II TES=2Thess +1TIM=1Tim +1 TIM=1Tim +I TIM=1Tim +2TIM=2Tim +2 TIM=2Tim +II TIM=2Tim +TIT=Titus +FLM=Phlm +EBR=Heb +JK=Jas +1Pēt=1Pet +1 Pēt=1Pet +I Pēt=1Pet +2Pēt2Pet +2 Pēt=2Pet +II Pēt=2Pet +1Jņ=1John +1 Jņ=1John +I Jņ=1John +2Jņ=2John +2 Jņ=2John +II Jņ=2John +3Jņ=3John +3 Jņ=3John +III Jņ=3John +JD=Jude +Jūd=Jude +Jūdas=Jude +Atkl=Rev +Atklāsmes=Rev diff --git a/locales.d/pt-utf8.conf b/locales.d/pt-utf8.conf index 81661f9..3b23bc5 100644 --- a/locales.d/pt-utf8.conf +++ b/locales.d/pt-utf8.conf @@ -1,4 +1,4 @@ -[Meta] +[Meta] Name=pt Description=Portuguese (Unicode) Encoding=UTF-8 @@ -20,25 +20,32 @@ I Chronicles=1 Crónicas II Chronicles=2 Crónicas Ezra=Esdras Nehemiah=Neemias +Tobit=Tobite +Judith=Judite Esther=Ester -Job=Jó +I Maccabees=1 Macabeus +II Maccabees=2 Macabeus +Job=Job Psalms=Salmos Proverbs=Provérbios Ecclesiastes=Eclesiastes -Song of Solomon=Cantares de Salomão +Song of Solomon=Cântico dos Cânticos +Wisdom=Sabedoria +Sirach=Ben Sira Isaiah=Isaías Jeremiah=Jeremias Lamentations=Lamentações +Baruch=Baruc Ezekiel=Ezequiel Daniel=Daniel -Hosea=Oséias +Hosea=Oseias Joel=Joel Amos=Amós -Obadiah=Obadias +Obadiah=Abdias Jonah=Jonas -Micah=Miquéias +Micah=Miqueias Nahum=Naum -Habakkuk=Habacuque +Habakkuk=Habacuc Zephaniah=Sofonias Haggai=Ageu Zechariah=Zacarias @@ -47,7 +54,7 @@ Matthew=Mateus Mark=Marcos Luke=Lucas John=João -Acts=Actos +Acts=Actos dos Apóstolos Romans=Romanos I Corinthians=1 Coríntios II Corinthians=2 Coríntios @@ -60,7 +67,7 @@ II Thessalonians=2 Tessalonicenses I Timothy=1 Timóteo II Timothy=2 Timóteo Titus=Tito -Philemon=Filemon +Philemon=Filémon Hebrews=Hebreus James=Tiago I Peter=1 Pedro @@ -74,7 +81,7 @@ Revelation of John=Apocalipse [Book Abbrevs] GÉNESIS=Gen -GEN=Gen +GN=Gen ÊXODO=Exod EX=Exod LEVÍTICO=Lev @@ -94,54 +101,68 @@ RT=Ruth 2 SAMUEL=2Sam 2SM=2Sam 1 REIS=1Kgs -1RE=1Kgs +1RS=1Kgs 2 REIS=2Kgs -2RE=2Kgs +2RS=2Kgs 1 CRÓNICAS=1Chr 1CR=1Chr 2 CRÓNICAS=2Chr 2CR=2Chr ESDRAS=Ezra -ED=Ezra +ESD=Ezra NEEMIAS=Neh NE=Neh +TOBITE=Tob +TB=Tob +JUDITE=Jth +JDT=Jth ESTER=Esth -ET=Esth -JÓ=Job +EST=Esth +1 MACABEUS=1Macc +1MAC=1Macc +2 MACABEUS=2Macc +2MAC=2Macc +JB=Job SALMOS=Ps SL=Ps PROVÉRBIOS=Prov -PV=Prov +PR=Prov ECLESIASTES=Eccl -EC=Eccl -CANTARES DE SALOMÃO=Song +ECL=Eccl +CÂNTICO DOS CÂNTICOS=Song CT=Song +SABEDORIA=Ws +SB=Ws +BEN SIRA=Sir +SIR=Sir ISAÍAS=Isa IS=Isa JEREMIAS=Jer JR=Jer LAMENTAÇÕES=Lam LM=Lam +BARUC=Bar +BR=Bar EZEQUIEL=Ezek EZ=Ezek DANIEL=Dan DN=Dan -OSÉIAS=Hos +OSEIAS=Hos OS=Hos JOEL=Joel JL=Joel AMÓS=Amos AM=Amos -OBADIAS=Obad -OB=Obad +ABDIAS=Obad +OBD=Obad JONAS=Jonah JN=Jonah -MIQUÉIAS=Mic +MIQUEIAS=Mic MQ=Mic NAUM=Nah NA=Nah -HABACUQUE=Hab -HC=Hab +HABACUC=Hab +HAB=Hab SOFONIAS=Zeph SF=Zeph AGEU=Hag @@ -158,14 +179,14 @@ LUCAS=Luke LC=Luke JOÃO=John JO=John -ACTOS=Acts -AT=Acts +ACTOS DOS APÓSTOLOS=Acts +ACT=Acts ROMANOS=Rom RM=Rom 1 CORÍNTIOS=1Cor -1CO=1Cor +1COR=1Cor 2 CORÍNTIOS=2Cor -2CO=2Cor +2COR=2Cor GÁLATAS=Gal GL=Gal EFÉSIOS=Eph @@ -175,19 +196,19 @@ FL=Phil COLOSSENSES=Col CL=Col 1 TESSALONICENSES=1Thess -1TE=1Thess +1TS=1Thess 2 TESSALONICENSES=2Thess -2TE=2Thess +2TS=2Thess 1 TIMÓTEO=1Tim 1TM=1Tim 2 TIMÓTEO=2Tim 2TM=2Tim TITO=Titus TT=Titus -FILEMON=Phlm -FM=Phlm +FILÉMON=Phlm +FLM=Phlm HEBREUS=Heb -HB=Heb +HEB=Heb TIAGO=Jas TG=Jas 1 PEDRO=1Pet diff --git a/locales.d/ro-utf8.conf b/locales.d/ro-utf8.conf index 87cd586..1580503 100644 --- a/locales.d/ro-utf8.conf +++ b/locales.d/ro-utf8.conf @@ -3,6 +3,9 @@ # # Artemis State arty@home.ro # multumiri lui Martin Gruner mg.pub@gmx.net +# +# 2015-02-16 Updated by Peter von Kaehne & David Haslam +# Uses names and abbreviations for Revised Cornilescu 2014 [Meta] Name=ro @@ -10,31 +13,35 @@ Description=Romanian (Unicode) Encoding=UTF-8 [Text] -Genesis=Genesa -Exodus=Exod -Leviticus=Levitic +# Spellings now conform to those found in the 2014 Edition +# Book names mostly as found in the \toc2 entries in the USFM files +# Localised book names are now without Roman numerals. + +Genesis=Geneza +Exodus=Exodul +Leviticus=Leviticul Numbers=Numeri Deuteronomy=Deuteronom Joshua=Iosua -Judges=Judecatori +Judges=Judecătorii Ruth=Rut -I Samuel=I Samuel -II Samuel=II Samuel -I Kings=I Regi -II Kings=II Regi -I Chronicles=I Cronici -II Chronicles=II Cronici +I Samuel=1 Samuel +II Samuel=2 Samuel +I Kings=1 Împăraţilor +II Kings=2 Împăraţilor +I Chronicles=1 Cronicilor +II Chronicles=2 Cronicilor Ezra=Ezra Nehemiah=Neemia Esther=Estera Job=Iov -Psalms=Psalmi -Proverbs=Proverbe +Psalms=Psalmii +Proverbs=Proverbele Ecclesiastes=Eclesiastul -Song of Solomon=Cantarea Cantarilor +Song of Solomon=Cântarea Cântărilor Isaiah=Isaia Jeremiah=Ieremia -Lamentations=Plangerile +Lamentations=Plângerile Ezekiel=Ezechiel Daniel=Daniel Hosea=Osea @@ -45,103 +52,233 @@ Jonah=Iona Micah=Mica Nahum=Naum Habakkuk=Habacuc -Zephaniah=Tefania +Zephaniah=Ţefania Haggai=Hagai Zechariah=Zaharia -Malachi=Maleachi +Malachi=Maleahi Matthew=Matei Mark=Marcu Luke=Luca John=Ioan Acts=Faptele Apostolilor Romans=Romani -I Corinthians=I Corinteni -II Corinthians=II Corinteni +I Corinthians=1 Corinteni +II Corinthians=2 Corinteni Galatians=Galateni Ephesians=Efeseni Philippians=Filipeni Colossians=Coloseni -I Thessalonians=I Tesaloniceni -II Thessalonians=II Tesaloniceni -I Timothy=I Timotei -II Timothy=II Timotei +I Thessalonians=1 Tesaloniceni +II Thessalonians=2 Tesaloniceni +I Timothy=1 Timotei +II Timothy=2 Timotei Titus=Tit Philemon=Filimon Hebrews=Evrei James=Iacov -I Peter=I Petru -II Peter=II Petru -I John=I Ioan -II John=II Ioan -III John=III Ioan +I Peter=1 Petru +II Peter=2 Petru +I John=1 Ioan +II John=2 Ioan +III John=3 Ioan Jude=Iuda Revelation of John=Apocalipsa [Book Abbrevs] +# Abbreviations with full-stops added by David Haslam +# Copied from the \toc3 entries in the USFM files and augmented by some +# whole booknames with an unnecessary full-stop as encountered in a few cross-references. +# Those with Roman numerals are retained for other translations. +# Older spellings also retained to cover earlier translations. +# Unaccented versions retained just in case any references were mistyped. GENESA=Gen -EXOD=Exod -LEVITIC=Lev +GENEZA=Gen + +EXODUL=Exod + +LEVITICUL=Lev + NUMERI=Num + DEUTERONOM=Deut + IOSUA=Josh -JUDECATORI=Judg + +JUD=Judg +# The next entry prevents override by the English bookname Jude. +# In theory, this should not be necessary, as JUDE=LEFT(JUDECĂTORII,4) +JUDE=Judg +JUDECĂTORII=Judg +JUDECATORII=Judg + RUT=Ruth + I SAMUEL=1Sam +1 SAMUEL=1Sam +1SAMUEL=1Sam + II SAMUEL=2Sam +2 SAMUEL=2Sam +2SAMUEL=2Sam + I REGI=1Kgs +1 REGI=1Kgs +1REGI=1Kgs +1 ÎMPĂRAŢILOR=1Kgs +1ÎMPĂRAŢILOR=1Kgs +# Add unaccented versions if required + II REGI=2Kgs -I CRONICI=1Chr -II CRONICI=2Chr +2 REGI=2Kgs +2REGI=2Kgs +2 ÎMPĂRAŢILOR=2Kgs +2ÎMPĂRAŢILOR=2Kgs +# Add unaccented versions if required + +I CRONICILOR=1Chr +1 CRONICILOR=1Chr +1CRONICILOR=1Chr + +II CRONICILOR=2Chr +2 CRONICILOR=2Chr +2CRONICILOR=2Chr + +# Unnecessary full-stop can occur EZRA=Ezra + NEEMIA=Neh + ESTERA=Esth + IOV=Job -PSALMI=Ps -PROVERBE=Prov + +PSALMII=Ps + +PROVERBELE=Prov + ECLESIASTUL=Eccl + CANTAREA CANTARILOR=Song +CÂNTAREA CÂNTARILOR=Song + ISAIA=Isa + IEREMIA=Jer + PLANGERILE=Lam +PLÂNGERILE=Lam + EZECHIEL=Ezek + DANIEL=Dan + OSEA=Hos + IOEL=Joel + AMOS=Amos + OBADIA=Obad + IONA=Jonah MICA=Mic + NAUM=Nah + HABACUC=Hab + TEFANIA=Zeph +ŢEFANIA=Zeph + HAGAI=Hag + ZAHARIA=Zech + +MALEAHI=Mal MALEACHI=Mal + MATEI=Matt + MARCU=Mark + LUCA=Luke + IOAN=John + FAPTELE APOSTOLILOR=Acts + ROMANI=Rom + I CORINTENI=1Cor +1 CORINTENI=1Cor +1CORINTENI=1Cor + II CORINTENI=2Cor +2 CORINTENI=2Cor +2CORINTENI=2Cor + GALATENI=Gal + EFESENI=Eph + +# Beware confusion with the abbreviations for Philemon +FIL=Phil FILIPENI=Phil + COLOSENI=Col + I TESALONICENI=1Thess +1 TESALONICENI=1Thess +1TESALONICENI=1Thess + II TESALONICENI=2Thess +2 TESALONICENI=2Thess +2TESALONICENI=2Thess + I TIMOTEI=1Tim +1 TIMOTEI=1Tim +1TIMOTEI=1Tim + II TIMOTEI=2Tim +2 TIMOTEI=2Tim +2TIMOTEI=2Tim + TIT=Titus + +# This is a single chapter book +# Beware confusion with the abbreviations for Philippians +FILIM=Phlm FILIMON=Phlm + EVREI=Heb + IACOV=Jas + I PETRU=1Pet +1 PETRU=1Pet +1PETRU=1Pet + II PETRU=2Pet +2 PETRU=2Pet +2PETRU=2Pet + +# Unnecessary full-stop can occur I IOAN=1John +1 IOAN=1John +1IOAN=1John + +# This is a single chapter book II IOAN=2John +2 IOAN=2John +2IOAN=2John + +# This is a single chapter book III IOAN=3John +3 IOAN=3John +3IOAN=3John + +# This is a single chapter book IUDA=Jude + APOCALIPSA=Rev diff --git a/locales.d/tr-utf8.conf b/locales.d/tr-utf8.conf new file mode 100644 index 0000000..011c3f5 --- /dev/null +++ b/locales.d/tr-utf8.conf @@ -0,0 +1,163 @@ +[Meta] +Name=tr +Description=Turkish (Unicode) +Encoding=UTF-8 + +[Text] +Genesis=Yaratılış +Exodus=Mısır’dan Çıkış +Leviticus=Levililer +Numbers=Çölde Sayım +Deuteronomy=Yasanın Tekrarı +Joshua=Yeşu +Judges=Hakimler +Ruth=Rut +I Samuel=1.Samuel +II Samuel=2.Samuel +I Kings=1.Krallar +II Kings=2.Krallar +I Chronicles=1.Tarihler +II Chronicles=2.Tarihler +Ezra=Ezra +Nehemiah=Nehemya +Esther=Ester +Job=Eyüp +Psalms=Mezmurlar +Proverbs=Süleyman’ın Özdeyişleri +Ecclesiastes=Vaiz +Song of Solomon=Ezgiler Ezgisi +Isaiah=Yeşaya +Jeremiah=Yeremya +Lamentations=Ağıtlar +Ezekiel=Hezekiel +Daniel=Daniel +Hosea=Hoşea +Joel=Yoel +Amos=Amos +Obadiah=Ovadya +Jonah=Yunus +Micah=Mika +Nahum=Nahum +Habakkuk=Habakkuk +Zephaniah=Sefanya +Haggai=Hagay +Zechariah=Zekeriya +Malachi=Malaki +Matthew=Matta +Mark=Markos +Luke=Luka +John=Yuhanna +Acts=Havarilerin Faaliyetleri +Romans=Romalılar +I Corinthians=1.Korintliler +II Corinthians=2.Korintliler +Galatians=Galatyalılar +Ephesians=Efesliler +Philippians=Filipililer +Colossians=Koloseliler +I Thessalonians=1.Selanikliler +II Thessalonians=2.Selanikliler +I Timothy=1.Timoteos +II Timothy=2.Timoteos +Titus=Titus +Philemon=Filemon +Hebrews=İbraniler +James=Yakub +I Peter=1.Petrus +II Peter=2.Petrus +I John=1.Yuhanna +II John=2.Yuhanna +III John=3.Yuhanna +Jude=Yahuda +Revelation of John=Vahiy + +[Book Abbrevs] +Yaratılış=Gen +Mısır’dan Çıkış=Exod +Levililer=Lev +Çölde Sayım=Num +Yasanın Tekrarı=Deut +Yeşu=Josh +Hakimler=Judg +Rut=Ruth +1.Samuel=1Sam +2.Samuel=2Sam +1.Krallar=1Kgs +2.Krallar=2Kgs +1.Tarihler=1Chr +2.Tarihler=2Chr +Ezra=Ezra +Nehemya=Neh +Ester=Esth +Eyüp=Job +Mezmurlar=Ps +Süleyman’ın Özdeyişleri=Prov +Vaiz=Eccl +Ezgiler Ezgisi=Song +Yeşaya=Isa +Yeremya=Jer +Ağıtlar=Lam +Hezekiel=Ezek +Daniel=Dan +Hoşea=Hos +Yoel=Joel +Amos=Amos +Ovadya=Obad +Yunus=Jonah +Mika=Mic +Nahum=Nah +Habakkuk=Hab +Sefanya=Zeph +Hagay=Hag +Zekeriya=Zech +Malaki=Mal +Matta=Matt +Markos=Mark +Luka=Luke +Yuhanna=John +Havarilerin Faaliyetleri=Acts +Romalilar=Rom +1.Korintliler=1Cor +2.Korintliler=2Cor +Galatyalılar=Gal +Efesliler=Eph +Filipililer=Phil +Koloseliler=Col +1.Selanikliler=1Thess +2.Selanikliler=2Thess +1.Timoteos=1Tim +2.Timoteos=2Tim +Titus=Titus +Filemon=Phlm +İbraniler=Heb +Yakub=Jas +1.Petrus=1Pet +2.Petrus=2Pet +1.Yuhanna=1John +2.Yuhanna=2John +3.Yuhanna=3John +Yahuda=Jude +Vahiy=Rev + +Mısırdan Çıkış=Exod +Süleyman'ın Özdeyişleri=Prov +Filimon=Phlm +Yakup=Jas +1Samuel=1Sam +2Samuel=2Sam +1Krallar=1Kgs +2Krallar=2Kgs +1Tarihler=1Chr +2Tarihler=2Chr +1Korintliler=1Cor +2Korintliler=2Cor +1Selanikliler=1Thess +2Selanikliler=2Thess +1Timoteos=1Tim +2Timoteos=2Tim +1Petrus=1Pet +2Petrus=2Pet +1Yuhanna=1John +2Yuhanna=2John +3Yuhanna=3John +Romalılar=Rom diff --git a/locales.d/zh_CN-utf8.conf b/locales.d/zh_CN-utf8.conf index 7ab8d86..ec86416 100644 --- a/locales.d/zh_CN-utf8.conf +++ b/locales.d/zh_CN-utf8.conf @@ -74,68 +74,134 @@ Revelation of John=启示录 [Book Abbrevs] 创世记=Gen +创=Gen 出埃及记=Exod +出=Exod 利未记=Lev +利=Lev 民数记=Num +民=Num 申命记=Deut +申=Deut 约书亚记=Josh +书=Josh 士师记=Judg +士=Judg 路得记=Ruth +得=Ruth 撒母耳记上=1Sam +撒上=1Sam 撒母耳记下=2Sam +撒下=2Sam 列王记上=1Kgs +王上=1Kgs 列王记下=2Kgs +王下=2Kgs 历代志上=1Chr +代上=1Chr 历代志下=2Chr +代下=2Chr 以斯拉记=Ezra +拉=Ezra 尼希米记=Neh +尼=Neh 以斯帖记=Esth +斯=Esth 约伯记=Job +伯=Job 诗篇=Ps +诗=Ps 箴言=Prov +箴=Prov 传道书=Eccl +传=Eccl 雅歌=Song -以賽亚书=Isa +歌=Song +以赛亚书=Isa +赛=Isa 耶利米书=Jer +耶=Jer 耶利米哀歌=Lam -以西結书=Ezek +哀=Lam +以西结书=Ezek +结=Ezek 但以理书=Dan +但=Dan 何西阿书=Hos +何=Hos 约珥书=Joel +珥=Joel 阿摩司书=Amos +摩=Amos 俄巴底亚书=Obad +俄=Obad 约拿书=Jonah +拿=Jonah 弥迦书=Mic -那鴻书=Nah +弥=Mic +那鸿书=Nah +鸿=Nah 哈巴谷书=Hab +哈=Hab 西番雅书=Zeph -哈該书=Hag +番=Zeph +哈该书=Hag +该=Hag 撒迦利亚书=Zech +亚=Zech 玛拉基书=Mal +玛=Mal 马太福音=Matt +太=Matt 马可福音=Mark +可=Mark 路加福音=Luke +路=Luke 约翰福音=John +约=John 使徒行传=Acts +徒=Acts 罗马书=Rom +罗=Rom 哥林多前书=1Cor +林前=1Cor 哥林多后书=2Cor +林后=2Cor 加拉太书=Gal +加=Gal 以弗所书=Eph +弗=Eph 腓立比书=Phil +腓=Phil 歌罗西书=Col +西=Col 帖撒罗尼迦前书=1Thess +帖前=1Thess 帖撒罗尼迦后书=2Thess +帖后=2Thess 提摩太前书=1Tim +提前=1Tim 提摩太后书=2Tim +提后=2Tim 提多书=Titus +多=Titus 腓利门书=Phlm -希伯來书=Heb +门=Phlm +希伯来书=Heb +来=Heb 雅各书=Jas +雅=Jas 彼得前书=1Pet +彼前=1Pet 彼得后书=2Pet +彼后=2Pet 约翰一书=1John +约壹=1John 约翰二书=2John +约贰=2John 约翰三书=3John +约叁=3John 犹大书=Jude +犹=Jude 启示录=Rev +启=Rev diff --git a/m4/libtool.m4 b/m4/libtool.m4 index f12cfdf..56666f0 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1312,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1326,10 +1326,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1348,10 +1345,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2012-06-26.16; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ give_advice () ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." + echo "the 'automa4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff --git a/scripts/eligible b/scripts/eligible new file mode 100755 index 0000000..09e66d9 --- /dev/null +++ b/scripts/eligible @@ -0,0 +1,2 @@ +#!/bin/sh +svn mergeinfo --show-revs=eligible ^/trunk | tr "\\n" "," | xargs -i svn log -c {} ^/trunk diff --git a/scripts/merge b/scripts/merge new file mode 100755 index 0000000..a572788 --- /dev/null +++ b/scripts/merge @@ -0,0 +1,9 @@ +#!/bin/sh +COMMIT_REV=$1 + +[ -z "$COMMIT_REV" ] && { + echo $"usage: $0 <eligible revision number to merge>" >&2 + exit 1 +} + +svn merge -c $1 ^/trunk diff --git a/scripts/mkswordtar b/scripts/mkswordtar index 3163dfc..36448ad 100755 --- a/scripts/mkswordtar +++ b/scripts/mkswordtar @@ -3,6 +3,11 @@ echo echo "*** Autogening main sword engine build system" echo + +# quick test to see if we're at the base and cd to scripts folder +cd scripts 2> /dev/null + +# rest of script assumes we're in the scripts folder (cd ..;./autogen.sh) REV=`cd ..;basename \`pwd ..\`|cut -d\- -f2` diff --git a/src/keys/treekeyidx.cpp b/src/keys/treekeyidx.cpp index 5164277..5f245de 100644 --- a/src/keys/treekeyidx.cpp +++ b/src/keys/treekeyidx.cpp @@ -2,7 +2,7 @@ * * treekeyidx.cpp - * - * $Id: treekeyidx.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: treekeyidx.cpp 3524 2017-11-07 03:08:49Z scribe $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -33,6 +33,7 @@ SWORD_NAMESPACE_START + static const char *classes[] = {"TreeKeyIdx", "TreeKey", "SWKey", "SWObject", 0}; SWClass TreeKeyIdx::classdef(classes); @@ -61,8 +62,10 @@ TreeKeyIdx::TreeKeyIdx(const char *idxPath, int fileMode) : currentNode() { buf.setFormatted("%s.dat", path); datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true); - if (datfd <= 0) { - SWLog::getSystemLog()->logError("%d", errno); + if (!datfd || datfd->getFd() < 0) { + // couldn't find datafile but this might be fine if we're + // merely instantiating a remote InstallMgr SWMgr + SWLog::getSystemLog()->logDebug("Couldn't open file: %s. errno: %d", buf.c_str(), errno); error = errno; } else { @@ -106,7 +109,7 @@ void TreeKeyIdx::setUserData(const char *userData, int size) { delete currentNode.userData; if (!size) - size = strlen(userData) + 1; + size = (int)strlen(userData) + 1; currentNode.userData = new char [ size ]; memcpy(currentNode.userData, userData, size); @@ -204,7 +207,7 @@ void TreeKeyIdx::append() { while (lastSib.next > -1) { getTreeNodeFromIdxOffset(lastSib.next, &lastSib); } - __u32 idxOffset = idxfd->seek(0, SEEK_END); + __u32 idxOffset = (__u32)idxfd->seek(0, SEEK_END); lastSib.next = idxOffset; saveTreeNodeOffsets(&lastSib); __u32 parent = currentNode.parent; @@ -221,7 +224,7 @@ void TreeKeyIdx::appendChild() { append(); } else { - __u32 idxOffset = idxfd->seek(0, SEEK_END); + __u32 idxOffset = (__u32)idxfd->seek(0, SEEK_END); currentNode.firstChild = idxOffset; saveTreeNodeOffsets(¤tNode); __u32 parent = currentNode.offset; @@ -259,14 +262,15 @@ void TreeKeyIdx::remove() { getTreeNodeFromIdxOffset(currentNode.parent, &iterator); getTreeNodeFromIdxOffset(iterator.firstChild, &iterator); if (iterator.offset != target) { - while ((iterator.next != target) && (iterator.next > -1)) + while ((iterator.next != target) && (iterator.next > -1)) { getTreeNodeFromIdxOffset(iterator.next, &iterator); - if (iterator.next > -1) { - TreeNode prev; - getTreeNodeFromIdxOffset(iterator.offset, &prev); - prev.next = node.next; - saveTreeNodeOffsets(&prev); - getTreeNodeFromIdxOffset(prev.offset, ¤tNode); + } + if (iterator.next > -1) { + TreeNode prev; + getTreeNodeFromIdxOffset(iterator.offset, &prev); + prev.next = node.next; + saveTreeNodeOffsets(&prev); + getTreeNodeFromIdxOffset(prev.offset, ¤tNode); } } } @@ -304,7 +308,6 @@ signed char TreeKeyIdx::create(const char *ipath) { fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE); fd2->getFd(); FileMgr::getSystemFileMgr()->close(fd2); - TreeKeyIdx newTree(path); TreeKeyIdx::TreeNode root; stdstr(&(root.name), ""); @@ -331,7 +334,7 @@ void TreeKeyIdx::getTreeNodeFromDatOffset(long ioffset, TreeNode *node) const { __s32 tmp; __u16 tmp2; - if (datfd > 0) { + if (datfd && datfd->getFd() >= 0) { datfd->seek(ioffset, SEEK_SET); @@ -384,22 +387,20 @@ char TreeKeyIdx::getTreeNodeFromIdxOffset(long ioffset, TreeNode *node) const { error = 77; // out of bounds but still position to 0; } - node->offset = ioffset; - if (idxfd > 0) { - if (idxfd->getFd() > 0) { - idxfd->seek(ioffset, SEEK_SET); + node->offset = (__s32)ioffset; + if (idxfd && idxfd->getFd() >= 0) { + idxfd->seek(ioffset, SEEK_SET); + if (idxfd->read(&offset, 4) == 4) { + offset = swordtoarch32(offset); + error = (error == 77) ? KEYERR_OUTOFBOUNDS : 0; + getTreeNodeFromDatOffset(offset, node); + } + else { + idxfd->seek(-4, SEEK_END); if (idxfd->read(&offset, 4) == 4) { offset = swordtoarch32(offset); - error = (error == 77) ? KEYERR_OUTOFBOUNDS : 0; getTreeNodeFromDatOffset(offset, node); } - else { - idxfd->seek(-4, SEEK_END); - if (idxfd->read(&offset, 4) == 4) { - offset = swordtoarch32(offset); - getTreeNodeFromDatOffset(offset, node); - } - } } } return error; @@ -422,11 +423,11 @@ void TreeKeyIdx::saveTreeNodeOffsets(TreeNode *node) { long datOffset = 0; __s32 tmp; - if (idxfd > 0) { + if (idxfd && idxfd->getFd() >= 0) { idxfd->seek(node->offset, SEEK_SET); if (idxfd->read(&tmp, 4) != 4) { datOffset = datfd->seek(0, SEEK_END); - tmp = archtosword32(datOffset); + tmp = (__s32)archtosword32(datOffset); idxfd->write(&tmp, 4); } else { @@ -434,13 +435,13 @@ void TreeKeyIdx::saveTreeNodeOffsets(TreeNode *node) { datfd->seek(datOffset, SEEK_SET); } - tmp = archtosword32(node->parent); + tmp = (__s32)archtosword32(node->parent); datfd->write(&tmp, 4); - tmp = archtosword32(node->next); + tmp = (__s32)archtosword32(node->next); datfd->write(&tmp, 4); - tmp = archtosword32(node->firstChild); + tmp = (__s32)archtosword32(node->firstChild); datfd->write(&tmp, 4); } } @@ -488,11 +489,11 @@ void TreeKeyIdx::copyFrom(const TreeKeyIdx &ikey) { void TreeKeyIdx::saveTreeNode(TreeNode *node) { long datOffset = 0; __s32 tmp; - if (idxfd > 0) { + if (idxfd && idxfd->getFd() >= 0) { idxfd->seek(node->offset, SEEK_SET); datOffset = datfd->seek(0, SEEK_END); - tmp = archtosword32(datOffset); + tmp = (__s32)archtosword32(datOffset); idxfd->write(&tmp, 4); saveTreeNodeOffsets(node); @@ -567,7 +568,7 @@ void TreeKeyIdx::setPosition(SW_POSITION p) { int TreeKeyIdx::_compare (const TreeKeyIdx & ikey) { - return (getOffset() - ikey.getOffset()); + return (int)(getOffset() - ikey.getOffset()); } @@ -587,7 +588,7 @@ void TreeKeyIdx::decrement(int steps) { void TreeKeyIdx::increment(int steps) { error = getTreeNodeFromIdxOffset(currentNode.offset + (4*steps), ¤tNode); if (error) { -// SWLog::getSystemLog()->logError("error: %d", error); + SWLog::getSystemLog(); // strange fix for android // ->logError("error: %d", error); } positionChanged(); @@ -611,7 +612,6 @@ void TreeKeyIdx::increment(int steps) { } - const char *TreeKeyIdx::getText() const { TreeNode parent; static SWBuf fullPath; @@ -655,6 +655,7 @@ void TreeKeyIdx::TreeNode::clear() { } + TreeKeyIdx::TreeNode::~TreeNode() { if (name) delete [] name; diff --git a/src/keys/versekey.cpp b/src/keys/versekey.cpp index 25af540..84aa6ff 100644 --- a/src/keys/versekey.cpp +++ b/src/keys/versekey.cpp @@ -3,7 +3,7 @@ * versekey.cpp - code for class 'VerseKey'- a standard Biblical * verse key * - * $Id: versekey.cpp 3281 2014-12-03 06:07:22Z greg.hellings $ + * $Id: versekey.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -128,18 +128,55 @@ void VerseKey::setFromOther(const VerseKey &ikey) { chapter = ikey.getChapter(); verse = ikey.getVerse(); suffix = ikey.getSuffix(); - } - // TODO: versification mapping - // Here is where we will do v11n system conversions in the future - // when we have a conversion mechanism - // Ben Morgan has started thinking about this - // Konstantin Maslyuk <kalemas@mail.ru> has submitted a patch) - // Asked Konstantin to try his patch out with his favorite - // SWORD frontend and report back how it goes. Need to follow up - else { - // For now, this is the best we can do - setText(ikey.getText()); - } + } + else { + // map verse between systems + const char* map_book = ikey.getOSISBookName(); + int map_chapter = ikey.getChapter(); + int map_verse = ikey.getVerse(); + int map_range = map_verse; + + ikey.refSys->translateVerse(refSys, &map_book, &map_chapter, &map_verse, &map_range); + //printf("verse: %s.%i.%i-%i\n",map_book,map_chapter,map_verse,map_range); + + book = refSys->getBookNumberByOSISName(map_book); + + // check existence + if (book == -1) { + book = 1; + error = KEYERR_OUTOFBOUNDS; + } + else if (refSys->getBook(book-1)->getChapterMax() < map_chapter) { + map_chapter = refSys->getBook(book-1)->getChapterMax(); + map_verse = refSys->getBook(book-1)->getVerseMax(map_chapter); + error = KEYERR_OUTOFBOUNDS; + } + else if (map_chapter > 0 && refSys->getBook(book-1)->getVerseMax(map_chapter) < map_verse) { + map_verse = refSys->getBook(book-1)->getVerseMax(map_chapter); + error = KEYERR_OUTOFBOUNDS; + } + + // set values + if (book > BMAX[0]) + book -= BMAX[0], testament = 2; + else + testament = 1; + + //if (map_verse == 0) Headings(1); + + chapter = map_chapter; + verse = map_verse; + suffix = ikey.getSuffix(); + + if (map_verse < map_range) { + if (map_range > refSys->getBook(((testament>1)?BMAX[0]:0)+book-1)->getVerseMax(chapter)) + ++map_range; + verse = map_range; + setUpperBound(this); + verse = map_verse; + setLowerBound(this); + } + } } @@ -381,14 +418,14 @@ int VerseKey::getBookFromAbbrev(const char *iabbr) const if (!i) { if (hasUTF8Support) { //we have support for UTF-8 handling; we expect UTF-8 encoded locales - stringMgr->upperUTF8(abbr, strlen(abbr)*2); + stringMgr->upperUTF8(abbr, (unsigned int)(strlen(abbr)*2)); } else { stringMgr->upperLatin1(abbr); } } - abLen = strlen(abbr); + abLen = (int)strlen(abbr); if (abLen) { min = 0; @@ -446,7 +483,7 @@ void VerseKey::validateCurrentLocale() const { StringMgr* stringMgr = StringMgr::getSystemStringMgr(); const bool hasUTF8Support = StringMgr::hasUTF8Support(); if (hasUTF8Support) { //we have support for UTF-8 handling; we expect UTF-8 encoded locales - stringMgr->upperUTF8(abbr, strlen(abbr)*2); + stringMgr->upperUTF8(abbr, (unsigned int)(strlen(abbr)*2)); } else { stringMgr->upperLatin1(abbr); @@ -560,6 +597,7 @@ ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool e comma = 0; break; } + goto terminate_range; // otherwise drop down to next case case ' ': inTerm = true; @@ -593,6 +631,7 @@ ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool e } case ',': // on number new verse case ';': // on number new chapter +terminate_range: number[tonumber] = 0; tonumber = 0; if (*number) { @@ -605,7 +644,7 @@ ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool e tobook = 0; bookno = -1; if (*book) { - loop = strlen(book) - 1; + loop = (int)strlen(book) - 1; for (; loop+1; loop--) { if (book[loop] == ' ') book[loop] = 0; else break; } @@ -628,7 +667,7 @@ ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool e break; } - for (loop = strlen(book) - 1; loop+1; loop--) { + for (loop = (int)strlen(book) - 1; loop+1; loop--) { if (book[loop] == ' ') { // "PS C" is ok, but "II C" is not ok if (isroman(&book[loop+1]) && !isroman(book,loop)) { @@ -643,14 +682,14 @@ ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool e } // check for special inscriptio and subscriptio which are saved as book intro and chap 1 intro (for INTF) - for (loop = strlen(book) - 1; loop+1; loop--) { + for (loop = (int)strlen(book) - 1; loop+1; loop--) { if (book[loop] == ' ') { - if (!strnicmp(&book[loop+1], "inscriptio", strlen(&book[loop+1]))) { + if (!strnicmp(&book[loop+1], "inscriptio", (int)strlen(&book[loop+1]))) { book[loop] = 0; verse = 0; chap = 0; } - else if (!strnicmp(&book[loop+1], "subscriptio", strlen(&book[loop+1]))) { + else if (!strnicmp(&book[loop+1], "subscriptio", (int)strlen(&book[loop+1]))) { book[loop] = 0; verse = 0; chap = 1; @@ -876,7 +915,7 @@ ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool e book[tobook] = 0; tobook = 0; if (*book) { - loop = strlen(book) - 1; + loop = (int)strlen(book) - 1; // strip trailing spaces for (; loop+1; loop--) { if (book[loop] == ' ') book[loop] = 0; else break; } @@ -905,7 +944,7 @@ ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool e } // check for roman numeral chapter - for (loop = strlen(book) - 1; loop+1; loop--) { + for (loop = (int)strlen(book) - 1; loop+1; loop--) { if (book[loop] == ' ') { // "PS C" is ok, but "II C" is not ok if (isroman(&book[loop+1]) && !isroman(book,loop)) { @@ -919,19 +958,19 @@ ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool e } } // check for special inscriptio and subscriptio which are saved as book intro and chap 1 intro (for INTF) - for (loop = strlen(book) - 1; loop+1; loop--) { + for (loop = (int)strlen(book) - 1; loop+1; loop--) { if (book[loop] == ' ') { - if (!strnicmp(&book[loop+1], "inscriptio", strlen(&book[loop+1]))) { + if (!strnicmp(&book[loop+1], "inscriptio", (int)strlen(&book[loop+1]))) { book[loop] = 0; verse = 0; chap = 0; suffix = 0; } - else if (!strnicmp(&book[loop+1], "subscriptio", strlen(&book[loop+1]))) { + else if (!strnicmp(&book[loop+1], "subscriptio", (int)strlen(&book[loop+1]))) { book[loop] = 0; verse = 0; chap = 1; - suffix = 0; + suffix = 0; } break; } @@ -1391,6 +1430,11 @@ void VerseKey::normalize(bool autocheck) } if (chapter < (intros?0:1)) { --book; + if (book < (intros?0:1)) { + if (--testament > 0) { + book += (BMAX[testament-1] + (intros?1:0)); + } + } chapter += (getChapterMax() + (intros?1:0)); continue; } @@ -1404,6 +1448,11 @@ void VerseKey::normalize(bool autocheck) if (verse < (intros?0:1)) { if (--chapter < (intros?0:1)) { --book; + if (book < (intros?0:1)) { + if (--testament > 0) { + book += (BMAX[testament-1] + (intros?1:0)); + } + } chapter += (getChapterMax() + (intros?1:0)); } verse += (getVerseMax() + (intros?1:0)); @@ -1756,7 +1805,7 @@ int VerseKey::_compare(const VerseKey &ivkey) keyval1 += (int)getSuffix(); keyval2 += (int)ivkey.getSuffix(); keyval1 = (keyval1 != keyval2) ? ((keyval1 > keyval2) ? 1 : -1) : 0; // -1 | 0 | 1 - return keyval1; + return (int)keyval1; } @@ -1831,14 +1880,14 @@ const char *VerseKey::convertToOSIS(const char *inRef, const SWKey *lastKnownKey memset(frag, 0, 800); memset(preJunk, 0, 800); memset(postJunk, 0, 800); - while ((*startFrag) && (strchr(" {};,()[].", *startFrag))) { + while ((*startFrag) && (strchr(" {}:;,()[].", *startFrag))) { outRef += *startFrag; startFrag++; } - memmove(frag, startFrag, ((const char *)element->userData - startFrag) + 1); + memmove(frag, startFrag, (size_t)((const char *)element->userData - startFrag) + 1); frag[((const char *)element->userData - startFrag) + 1] = 0; int j; - for (j = strlen(frag)-1; j && (strchr(" {};,()[].", frag[j])); j--); + for (j = strlen(frag)-1; j && (strchr(" {}:;,()[].", frag[j])); j--); if (frag[j+1]) strcpy(postJunk, frag+j+1); frag[j+1]=0; diff --git a/src/keys/versetreekey.cpp b/src/keys/versetreekey.cpp index 571314f..09dd6b6 100644 --- a/src/keys/versetreekey.cpp +++ b/src/keys/versetreekey.cpp @@ -3,7 +3,7 @@ * versetreekey.cpp - code for class 'VerseTreeKey'- versekey using treekey * for data retrieval * - * $Id: versetreekey.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: versetreekey.cpp 3455 2017-04-24 08:50:31Z scribe $ * * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -24,6 +24,7 @@ #include <versetreekey.h> #include <ctype.h> +#include <swlog.h> SWORD_NAMESPACE_START @@ -92,6 +93,7 @@ int VerseTreeKey::getBookFromAbbrev(const char *iabbr) const { int bookno = VerseKey::getBookFromAbbrev(iabbr); if (bookno < 0) { + SWLog::getSystemLog(); // TODO fix for odd android bug /* vector<struct sbook>::iterator it = find(books, iabbr); if (it == books.end()) { diff --git a/src/mgr/Makefile.am b/src/mgr/Makefile.am index 6acec3a..38f9cc4 100644 --- a/src/mgr/Makefile.am +++ b/src/mgr/Makefile.am @@ -15,6 +15,9 @@ FTP_SOURCES += $(mgrdir)/curlhttpt.cpp else FTP_SOURCES = $(mgrdir)/ftplibftpt.cpp endif +if WITHGAPI +FTP_SOURCES += $(mgrdir)/rtranspgdrive.cpp +endif libsword_la_SOURCES += $(FTP_SOURCES) libsword_la_SOURCES += $(mgrdir)/swconfig.cpp diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp index 63eacb1..b287405 100644 --- a/src/mgr/curlftpt.cpp +++ b/src/mgr/curlftpt.cpp @@ -2,7 +2,7 @@ * * curlftpt.cpp - CURLFTPTransport * - * $Id: curlftpt.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: curlftpt.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -63,12 +63,12 @@ namespace { return -1; /* failure, can't open file to write */ } if (out->destBuf) { - int s = out->destBuf->size(); + int s = (int)out->destBuf->size(); out->destBuf->size(s+(size*nmemb)); memcpy(out->destBuf->getRawData()+s, buffer, size*nmemb); - return nmemb; + return (int)nmemb; } - return fwrite(buffer, size, nmemb, out->stream); + return (int)fwrite(buffer, size, nmemb, out->stream); } diff --git a/src/mgr/curlhttpt.cpp b/src/mgr/curlhttpt.cpp index 5db0ee7..b9219a0 100644 --- a/src/mgr/curlhttpt.cpp +++ b/src/mgr/curlhttpt.cpp @@ -2,7 +2,7 @@ * * curlhttpt.cpp - CURLHTTPTransport * - * $Id: curlhttpt.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: curlhttpt.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -55,12 +55,12 @@ namespace { return -1; /* failure, can't open file to write */ } if (out->destBuf) { - int s = out->destBuf->size(); + int s = (int)out->destBuf->size(); out->destBuf->size(s+(size*nmemb)); memcpy(out->destBuf->getRawData()+s, buffer, size*nmemb); - return nmemb; + return (int)nmemb; } - return fwrite(buffer, size, nmemb, out->stream); + return (int)fwrite(buffer, size, nmemb, out->stream); } @@ -141,7 +141,9 @@ char CURLHTTPTransport::getURL(const char *destPath, const char *sourceURL, SWBu curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT, 45); /* Disable checking host certificate */ - curl_easy_setopt(session, CURLOPT_SSL_VERIFYPEER, false); + if (isUnverifiedPeerAllowed()) { + curl_easy_setopt(session, CURLOPT_SSL_VERIFYPEER, false); + } /* FTP connection settings */ @@ -215,7 +217,7 @@ vector<struct DirEntry> CURLHTTPTransport::getDirList(const char *dirURL) { pBufRes = (char *)strchr(pBuf, '\"');//Find the end of the possible file name if (!pBufRes) break; - possibleNameLength = pBufRes - pBuf; + possibleNameLength = (int)(pBufRes - pBuf); possibleName.setFormatted("%.*s", possibleNameLength, pBuf); if (isalnum(possibleName[0])) { SWLog::getSystemLog()->logDebug("getDirListHTTP: Found a file: %s", possibleName.c_str()); diff --git a/src/mgr/encfiltmgr.cpp b/src/mgr/encfiltmgr.cpp index 24938bc..25ff415 100644 --- a/src/mgr/encfiltmgr.cpp +++ b/src/mgr/encfiltmgr.cpp @@ -4,7 +4,7 @@ * SWFilterMgr, used to transcode all module text to a * requested encoding * - * $Id: encfiltmgr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: encfiltmgr.cpp 3083 2014-03-06 08:13:10Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -27,11 +27,17 @@ #include <scsuutf8.h> #include <latin1utf8.h> +#include <utf16utf8.h> #include <unicodertf.h> #include <utf8latin1.h> #include <utf8utf16.h> #include <utf8html.h> + +#ifdef _ICU_ +#include <utf8scsu.h> +#endif + #include <swmodule.h> #include <swmgr.h> @@ -51,6 +57,7 @@ EncodingFilterMgr::EncodingFilterMgr(char enc) scsuutf8 = new SCSUUTF8(); latin1utf8 = new Latin1UTF8(); + utf16utf8 = new UTF16UTF8(); encoding = enc; @@ -59,6 +66,9 @@ EncodingFilterMgr::EncodingFilterMgr(char enc) case ENC_UTF16: targetenc = new UTF8UTF16(); break; case ENC_RTF: targetenc = new UnicodeRTF(); break; case ENC_HTML: targetenc = new UTF8HTML(); break; +#ifdef _ICU_ + case ENC_SCSU: targetenc = new UTF8SCSU(); break; +#endif default: // i.e. case ENC_UTF8 targetenc = NULL; } @@ -71,6 +81,7 @@ EncodingFilterMgr::EncodingFilterMgr(char enc) EncodingFilterMgr::~EncodingFilterMgr() { delete scsuutf8; delete latin1utf8; + delete utf16utf8; delete targetenc; } @@ -81,11 +92,14 @@ void EncodingFilterMgr::AddRawFilters(SWModule *module, ConfigEntMap §ion) { SWBuf encoding = ((entry = section.find("Encoding")) != section.end()) ? (*entry).second : (SWBuf)""; if (!encoding.length() || !stricmp(encoding.c_str(), "Latin-1")) { - module->addRawFilter(latin1utf8); + module->addRawFilter(latin1utf8); } else if (!stricmp(encoding.c_str(), "SCSU")) { module->addRawFilter(scsuutf8); } + else if (!stricmp(encoding.c_str(), "UTF-16")) { + module->addRawFilter(utf16utf8); + } } @@ -112,6 +126,9 @@ char EncodingFilterMgr::Encoding(char enc) { case ENC_UTF16: targetenc = new UTF8UTF16(); break; case ENC_RTF: targetenc = new UnicodeRTF(); break; case ENC_HTML: targetenc = new UTF8HTML(); break; +#ifdef _ICU_ + case ENC_SCSU: targetenc = new UTF8SCSU(); break; +#endif default: // i.e. case ENC_UTF8 targetenc = NULL; } diff --git a/src/mgr/filemgr.cpp b/src/mgr/filemgr.cpp index d801aaa..be4efcc 100644 --- a/src/mgr/filemgr.cpp +++ b/src/mgr/filemgr.cpp @@ -3,7 +3,7 @@ * filemgr.cpp - implementation of class FileMgr used for pooling file * handles * - * $Id: filemgr.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: filemgr.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -24,6 +24,7 @@ #include <filemgr.h> #include <utilstr.h> +#include <stdlib.h> #include <dirent.h> #include <fcntl.h> #include <sys/stat.h> @@ -131,15 +132,6 @@ FileDesc::~FileDesc() { } -int FileDesc::getFd() { - if (fd == -77) - fd = parent->sysOpen(this); -// if ((fd < -1) && (fd != -77)) // kludge to hand ce -// return 777; - return fd; -} - - long FileDesc::seek(long offset, int whence) { return lseek(getFd(), offset, whence); } @@ -282,8 +274,8 @@ signed char FileMgr::trunc(FileDesc *file) { file->seek(0, SEEK_SET); while (size > 0) { - bytes = file->read(nibble, 32767); - bytes = (bytes < size)?bytes:size; + bytes = (int)file->read(nibble, 32767); + bytes = (bytes < size)?bytes:(int)size; if (write(fd, nibble, bytes) != bytes) { break; } size -= bytes; } @@ -296,7 +288,7 @@ signed char FileMgr::trunc(FileDesc *file) { // copy tmp file back (dumb, but must preserve file permissions) lseek(fd, 0, SEEK_SET); do { - bytes = read(fd, nibble, 32767); + bytes = (int)read(fd, nibble, 32767); file->write(nibble, bytes); } while (bytes == 32767); } @@ -316,7 +308,7 @@ signed char FileMgr::trunc(FileDesc *file) { signed char FileMgr::existsFile(const char *ipath, const char *ifileName) { - int len = strlen(ipath) + ((ifileName)?strlen(ifileName):0) + 3; + int len = (int)strlen(ipath) + ((ifileName)?strlen(ifileName):0) + 3; char *ch; char *path = new char [ len ]; strcpy(path, ipath); @@ -337,7 +329,7 @@ signed char FileMgr::existsFile(const char *ipath, const char *ifileName) signed char FileMgr::existsDir(const char *ipath, const char *idirName) { char *ch; - int len = strlen(ipath) + ((idirName)?strlen(idirName):0) + 1; + int len = (int)strlen(ipath) + ((idirName)?strlen(idirName):0) + 1; if (idirName) len += strlen(idirName); char *path = new char [ len ]; @@ -361,7 +353,7 @@ int FileMgr::createParent(const char *pName) { int retCode = 0; strcpy(buf, pName); - int end = strlen(buf) - 1; + int end = (int)strlen(buf) - 1; while (end) { if ((buf[end] == '/') || (buf[end] == '\\')) break; @@ -418,7 +410,7 @@ int FileMgr::copyFile(const char *sourceFile, const char *targetFile) { return -1; do { - len = read(sfd, buf, 4096); + len = (int)read(sfd, buf, 4096); if (write(dfd, buf, len) != len) break; } while(len == 4096); @@ -447,7 +439,7 @@ char FileMgr::getLine(FileDesc *fDesc, SWBuf &line) { while (more) { more = false; long index = fDesc->seek(0, SEEK_CUR); - len = fDesc->read(chunk, 254); + len = (int)fDesc->read(chunk, 254); // assert we have a readable file (not a directory) if (len < 1) @@ -509,23 +501,24 @@ char FileMgr::isDirectory(const char *path) { int FileMgr::copyDir(const char *srcDir, const char *destDir) { DIR *dir; struct dirent *ent; + int retVal = 0; if ((dir = opendir(srcDir))) { rewinddir(dir); - while ((ent = readdir(dir))) { + while ((ent = readdir(dir)) && !retVal) { if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) { SWBuf srcPath = (SWBuf)srcDir + (SWBuf)"/" + ent->d_name; SWBuf destPath = (SWBuf)destDir + (SWBuf)"/" + ent->d_name; if (!isDirectory(srcPath.c_str())) { - copyFile(srcPath.c_str(), destPath.c_str()); + retVal = copyFile(srcPath.c_str(), destPath.c_str()); } else { - copyDir(srcPath.c_str(), destPath.c_str()); + retVal = copyDir(srcPath.c_str(), destPath.c_str()); } } } closedir(dir); } - return 0; + return retVal; } @@ -582,4 +575,22 @@ long FileMgr::resourceConsumption() { } +SWBuf FileMgr::getHomeDir() { + + // figure out 'home' directory for app data + SWBuf homeDir = getenv("HOME"); + if (!homeDir.length()) { + // silly windows + homeDir = getenv("APPDATA"); + } + if (homeDir.length()) { + if ((homeDir[homeDir.length()-1] != '\\') && (homeDir[homeDir.length()-1] != '/')) { + homeDir += "/"; + } + } + + return homeDir; +} + + SWORD_NAMESPACE_END diff --git a/src/mgr/ftplibftpt.cpp b/src/mgr/ftplibftpt.cpp index f1d1655..fae5964 100644 --- a/src/mgr/ftplibftpt.cpp +++ b/src/mgr/ftplibftpt.cpp @@ -2,7 +2,7 @@ * * ftplibftpt.cpp - FTPLibFTPTransport * - * $Id: ftplibftpt.cpp 2983 2013-09-15 16:22:32Z scribe $ + * $Id: ftplibftpt.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -42,10 +42,10 @@ namespace { static int my_swbufwriter(netbuf *nControl, void *buffer, size_t size, void *swbuf) { SWBuf &output = *(SWBuf *)swbuf; - int s = output.size(); + int s = (int)output.size(); output.size(s+size); memcpy(output.getRawData()+s, buffer, size); - return size; + return (int)size; } #if defined(__GNUC__) @@ -56,9 +56,9 @@ namespace { static int my_fprogress(netbuf *nControl, int xfered, void *arg) { if (arg) { MyProgressData *pd = (MyProgressData *)arg; - SWLog::getSystemLog()->logDebug("FTPLibFTPTransport report progress: totalSize: %ld; xfered: %d\n", pd->totalSize, xfered); +//SWLog::getSystemLog()->logDebug("FTPLibFTPTransport report progress: totalSize: %ld; xfered: %d\n", pd->totalSize, xfered); if (pd->sr) { - pd->sr->statusUpdate(pd->totalSize, xfered); + pd->sr->update(pd->totalSize, xfered); } if (*(pd->term)) return 0; } diff --git a/src/mgr/installmgr.cpp b/src/mgr/installmgr.cpp index 1e83db5..fe1a674 100644 --- a/src/mgr/installmgr.cpp +++ b/src/mgr/installmgr.cpp @@ -2,7 +2,7 @@ * * installmgr.cpp - InstallMgr functions * - * $Id: installmgr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: installmgr.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -59,7 +59,7 @@ SWORD_NAMESPACE_START namespace { static void removeTrailingSlash(SWBuf &buf) { - int len = buf.size(); + int len = (int)buf.size(); if ((buf[len-1] == '/') || (buf[len-1] == '\\')) buf.size(len-1); @@ -101,6 +101,8 @@ RemoteTransport *InstallMgr::createHTTPTransport(const char *host, StatusReporte InstallMgr::InstallMgr(const char *privatePath, StatusReporter *sr, SWBuf u, SWBuf p) { userDisclaimerConfirmed = false; + passive=true; + unverifiedPeerAllowed=true; statusReporter = sr; this->u = u; this->p = p; @@ -109,7 +111,7 @@ InstallMgr::InstallMgr(const char *privatePath, StatusReporter *sr, SWBuf u, SWB installConf = 0; stdstr(&(this->privatePath), privatePath); if (this->privatePath) { - int len = strlen(this->privatePath); + int len = (int)strlen(this->privatePath); if ((this->privatePath[len-1] == '/') || (this->privatePath[len-1] == '\\')) this->privatePath[len-1] = 0; @@ -145,12 +147,13 @@ void InstallMgr::readInstallConf() { clearSources(); setFTPPassive(stricmp((*installConf)["General"]["PassiveFTP"].c_str(), "false") != 0); + setUnverifiedPeerAllowed(stricmp((*installConf)["General"]["UnverifiedPeerAllowed"].c_str(), "false") != 0); - SectionMap::iterator confSection = installConf->Sections.find("Sources"); + SectionMap::iterator confSection = installConf->getSections().find("Sources"); ConfigEntMap::iterator sourceBegin; ConfigEntMap::iterator sourceEnd; - if (confSection != installConf->Sections.end()) { + if (confSection != installConf->getSections().end()) { sourceBegin = confSection->second.lower_bound("FTPSource"); sourceEnd = confSection->second.upper_bound("FTPSource"); @@ -204,8 +207,8 @@ void InstallMgr::readInstallConf() { } defaultMods.clear(); - confSection = installConf->Sections.find("General"); - if (confSection != installConf->Sections.end()) { + confSection = installConf->getSections().find("General"); + if (confSection != installConf->getSections().end()) { sourceBegin = confSection->second.lower_bound("DefaultMod"); sourceEnd = confSection->second.upper_bound("DefaultMod"); @@ -219,16 +222,17 @@ void InstallMgr::readInstallConf() { void InstallMgr::saveInstallConf() { - installConf->Sections["Sources"].clear(); + installConf->getSection("Sources").clear(); for (InstallSourceMap::iterator it = sources.begin(); it != sources.end(); ++it) { if (it->second) { - installConf->Sections["Sources"].insert(ConfigEntMap::value_type(it->second->type + "Source", it->second->getConfEnt().c_str())); + installConf->getSection("Sources").insert(ConfigEntMap::value_type(it->second->type + "Source", it->second->getConfEnt().c_str())); } } (*installConf)["General"]["PassiveFTP"] = (isFTPPassive()) ? "true" : "false"; + (*installConf)["General"]["UnverifiedPeerAllowed"] = (isUnverifiedPeerAllowed()) ? "true" : "false"; - installConf->Save(); + installConf->save(); } @@ -243,9 +247,9 @@ int InstallMgr::removeModule(SWMgr *manager, const char *moduleName) { // save our own copy, cuz when we remove the module from the SWMgr // it's likely we'll free the memory passed to us in moduleName SWBuf modName = moduleName; - module = manager->config->Sections.find(modName); + module = manager->config->getSections().find(modName); - if (module != manager->config->Sections.end()) { + if (module != manager->config->getSections().end()) { // to be sure all files are closed // this does not remove the .conf information from SWMgr manager->deleteModule(modName); @@ -285,7 +289,7 @@ int InstallMgr::removeModule(SWMgr *manager, const char *moduleName) { modFile += "/"; modFile += ent->d_name; SWConfig *config = new SWConfig(modFile.c_str()); - if (config->Sections.find(modName) != config->Sections.end()) { + if (config->getSections().find(modName) != config->getSections().end()) { delete config; FileMgr::removeFile(modFile.c_str()); } @@ -332,6 +336,8 @@ SWLog::getSystemLog()->logDebug("remoteCopy: %s, %s, %s, %c, %s", (is?is->source trans->setPasswd(p); } + trans->setUnverifiedPeerAllowed(unverifiedPeerAllowed); + SWBuf urlPrefix; if (is->type == "HTTP") { urlPrefix = (SWBuf) "http://"; @@ -361,6 +367,7 @@ SWLog::getSystemLog()->logDebug("remoteCopy: %s, %s, %s, %c, %s", (is?is->source SWBuf dir = (SWBuf)is->directory.c_str(); removeTrailingSlash(dir); dir += (SWBuf)"/" + src; //dont forget the final slash +SWLog::getSystemLog()->logDebug("remoteCopy: dirTransfer: %s", dir.c_str()); retVal = trans->copyDirectory(urlPrefix, dir, dest, suffix); @@ -393,6 +400,7 @@ SWLog::getSystemLog()->logDebug("remoteCopy: %s, %s, %s, %c, %s", (is?is->source int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const char *modName, InstallSource *is) { + int retVal = 0; SectionMap::iterator module, section; ConfigEntMap::iterator fileBegin; ConfigEntMap::iterator fileEnd; @@ -419,9 +427,9 @@ int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const ch SWMgr mgr(sourceDir.c_str()); - module = mgr.config->Sections.find(modName); + module = mgr.config->getSections().find(modName); - if (module != mgr.config->Sections.end()) { + if (module != mgr.config->getSections().end()) { entry = module->second.find("CipherKey"); if (entry != module->second.end()) @@ -449,14 +457,14 @@ int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const ch if (!aborted) { // DO THE INSTALL - while (fileBegin != fileEnd) { + while (fileBegin != fileEnd && !retVal) { SWBuf sourcePath = sourceDir; sourcePath += fileBegin->second.c_str(); SWBuf dest = destMgr->prefixPath; removeTrailingSlash(dest); dest += '/'; dest += fileBegin->second.c_str(); - FileMgr::copyFile(sourcePath.c_str(), dest.c_str()); + retVal = FileMgr::copyFile(sourcePath.c_str(), dest.c_str()); fileBegin++; } @@ -504,7 +512,7 @@ int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const ch } if (!aborted) { SWBuf destPath = (SWBuf)destMgr->prefixPath + relativePath; - FileMgr::copyDir(absolutePath.c_str(), destPath.c_str()); + retVal = FileMgr::copyDir(absolutePath.c_str(), destPath.c_str()); } if (is) { // delete tmp netCopied files // mgr->deleteModule(modName); @@ -516,17 +524,17 @@ int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const ch SWBuf confDir = sourceDir + "mods.d/"; if ((dir = opendir(confDir.c_str()))) { // find and copy .conf file rewinddir(dir); - while ((ent = readdir(dir))) { + while ((ent = readdir(dir)) && !retVal) { if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) { modFile = confDir; modFile += ent->d_name; SWConfig *config = new SWConfig(modFile.c_str()); - if (config->Sections.find(modName) != config->Sections.end()) { + if (config->getSections().find(modName) != config->getSections().end()) { SWBuf targetFile = destMgr->configPath; //"./mods.d/"; removeTrailingSlash(targetFile); targetFile += "/"; targetFile += ent->d_name; - FileMgr::copyFile(modFile.c_str(), targetFile.c_str()); + retVal = FileMgr::copyFile(modFile.c_str(), targetFile.c_str()); if (cipher) { if (getCipherCode(modName, config)) { SWMgr newDest(destMgr->prefixPath); @@ -534,8 +542,8 @@ int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const ch aborted = true; } else { - config->Save(); - FileMgr::copyFile(modFile.c_str(), targetFile.c_str()); + config->save(); + retVal = FileMgr::copyFile(modFile.c_str(), targetFile.c_str()); } } } @@ -545,7 +553,7 @@ int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const ch closedir(dir); } } - return (aborted) ? -1 : 0; + return (aborted) ? -9 : retVal; } return 1; } @@ -660,8 +668,8 @@ int InstallMgr::refreshRemoteSourceConfiguration() { int errorCode = remoteCopy(&is, masterRepoList, masterRepoListPath.c_str(), false); if (!errorCode) { //sucessfully downloaded the repo list SWConfig masterList(masterRepoListPath); - SectionMap::iterator sections = masterList.Sections.find("Repos"); - if (sections != masterList.Sections.end()) { + SectionMap::iterator sections = masterList.getSections().find("Repos"); + if (sections != masterList.getSections().end()) { for (ConfigEntMap::iterator actions = sections->second.begin(); actions != sections->second.end(); actions++) { // Search through our current sources and see if we have a matching UID InstallSourceMap::iterator it; diff --git a/src/mgr/localemgr.cpp b/src/mgr/localemgr.cpp index 90d4716..ec19d11 100644 --- a/src/mgr/localemgr.cpp +++ b/src/mgr/localemgr.cpp @@ -3,7 +3,7 @@ * localemgr.cpp - implementation of class LocaleMgr used to interact with * registered locales for a SWORD installation * - * $Id: localemgr.cpp 3005 2014-01-09 04:06:11Z greg.hellings $ + * $Id: localemgr.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -85,7 +85,7 @@ LocaleMgr::LocaleMgr(const char *iConfigPath) { SWLog::getSystemLog()->logDebug("LOOKING UP LOCALE DIRECTORY..."); SWMgr::findConfig(&configType, &prefixPath, &configPath, &augPaths, &sysConf); if (sysConf) { - if ((entry = sysConf->Sections["Install"].find("LocalePath")) != sysConf->Sections["Install"].end()) { + if ((entry = sysConf->getSection("Install").find("LocalePath")) != sysConf->getSection("Install").end()) { configType = 9; // our own stdstr(&prefixPath, (char *)entry->second.c_str()); SWLog::getSystemLog()->logDebug("LocalePath provided in sysConfig."); @@ -101,7 +101,7 @@ LocaleMgr::LocaleMgr(const char *iConfigPath) { switch (configType) { case 2: int i; - for (i = strlen(configPath)-1; ((i) && (configPath[i] != '/') && (configPath[i] != '\\')); i--); + for (i = (int)strlen(configPath)-1; ((i) && (configPath[i] != '/') && (configPath[i] != '\\')); i--); configPath[i] = 0; path = configPath; path += "/"; diff --git a/src/mgr/markupfiltmgr.cpp b/src/mgr/markupfiltmgr.cpp index fb12583..94b1407 100644 --- a/src/mgr/markupfiltmgr.cpp +++ b/src/mgr/markupfiltmgr.cpp @@ -4,7 +4,7 @@ * used to transcode all module text to a requested * markup * - * $Id: markupfiltmgr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: markupfiltmgr.cpp 3075 2014-03-05 02:27:33Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -38,6 +38,7 @@ #include <gbfosis.h> #include <thmlosis.h> #include <osisrtf.h> +#include <osislatex.h> #include <teirtf.h> #include <osisosis.h> #include <osishtmlhref.h> @@ -49,7 +50,10 @@ #include <gbfxhtml.h> #include <osisxhtml.h> #include <teixhtml.h> - +#include <gbflatex.h> +#include <thmllatex.h> +#include <teilatex.h> + #include <markupfiltmgr.h> #include <swmgr.h> @@ -279,6 +283,14 @@ void MarkupFilterMgr::CreateFilters(char markup) { 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(); diff --git a/src/mgr/remotetrans.cpp b/src/mgr/remotetrans.cpp index 03ad3e4..2d14d8f 100644 --- a/src/mgr/remotetrans.cpp +++ b/src/mgr/remotetrans.cpp @@ -1,8 +1,8 @@ -/***************************************************************************** +/***************************************************************************** * * remotetrans.cpp - * - * $Id: remotetrans.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: remotetrans.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -65,6 +65,8 @@ RemoteTransport::RemoteTransport(const char *host, StatusReporter *statusReporte u = "ftp"; p = "installmgr@user.com"; term = false; + passive = true; + unverifiedPeerAllowed = true; } @@ -74,13 +76,22 @@ RemoteTransport::~RemoteTransport() { // override this method in your real transport class char RemoteTransport::getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf) { - char retVal = 0; + SWLog::getSystemLog()->logWarning("RemoteTransport::getURL called but unsupported"); + char retVal = -1; + return retVal; +} + +// override this method in your real transport class +char RemoteTransport::putURL(const char *destURL, const char *sourcePath, SWBuf *sourceBuf) { + SWLog::getSystemLog()->logWarning("RemoteTransport::putURL called but unsupported"); + char retVal = -1; return retVal; } vector<struct DirEntry> RemoteTransport::getDirList(const char *dirURL) { + SWLog::getSystemLog()->logDebug("RemoteTransport::getDirList(%s)", dirURL); vector<struct DirEntry> dirList; SWBuf dirBuf; @@ -100,12 +111,12 @@ vector<struct DirEntry> RemoteTransport::getDirList(const char *dirURL) { else if ((*end != 10) && (*end != 13)) break; } - SWLog::getSystemLog()->logWarning("getDirList: parsing item %s(%d)\n", start, end-start); - int status = ftpparse(&item, start, end - start); + SWLog::getSystemLog()->logDebug("getDirList: parsing item %s(%d)\n", start, end-start); + int status = ftpparse(&item, start, (int)(end - start)); // in ftpparse.h, there is a warning that name is not necessarily null terminated SWBuf name; name.append(item.name, item.namelen); - SWLog::getSystemLog()->logWarning("getDirList: got item %s\n", name.c_str()); + SWLog::getSystemLog()->logDebug("getDirList: got item %s\n", name.c_str()); if (status && name != "." && name != "..") { struct DirEntry i; i.name = name; @@ -124,24 +135,45 @@ vector<struct DirEntry> RemoteTransport::getDirList(const char *dirURL) { int RemoteTransport::copyDirectory(const char *urlPrefix, const char *dir, const char *dest, const char *suffix) { - unsigned int i; + SWLog::getSystemLog()->logDebug("RemoteTransport::copyDirectory"); int retVal = 0; - + SWBuf url = SWBuf(urlPrefix) + SWBuf(dir); removeTrailingSlash(url); url += '/'; - SWLog::getSystemLog()->logWarning("NetTransport: getting dir %s\n", url.c_str()); + SWLog::getSystemLog()->logDebug("NetTransport: getting dir %s\n", url.c_str()); vector<struct DirEntry> dirList = getDirList(url.c_str()); if (!dirList.size()) { SWLog::getSystemLog()->logWarning("NetTransport: failed to read dir %s\n", url.c_str()); return -1; } - + + // append files in sub directories and calculate total download size + unsigned int i = 0; long totalBytes = 0; - for (i = 0; i < dirList.size(); i++) - totalBytes += dirList[i].size; + for (;;) { + if (i == dirList.size()) + break; + + struct DirEntry &e = dirList.at(i); + + if (e.isDirectory) { + SWBuf name(e.name); // &e will be invalidated after first insertion + vector<struct DirEntry> sd = getDirList((url + name + '/').c_str()); + for (unsigned int ii = 0; ii < sd.size(); ii++) { + sd[ii].name = name + '/' + sd[ii].name; + dirList.push_back(sd[ii]); + } + dirList.erase(dirList.begin() + i); + } + else { + totalBytes += e.size; + i++; + } + } + long completedBytes = 0; for (i = 0; i < dirList.size(); i++) { struct DirEntry &dirEntry = dirList[i]; @@ -163,23 +195,12 @@ int RemoteTransport::copyDirectory(const char *urlPrefix, const char *dir, const SWBuf url = (SWBuf)urlPrefix + (SWBuf)dir; removeTrailingSlash(url); url += "/"; - url += dirEntry.name; //dont forget the final slash - if (!dirEntry.isDirectory) { - if (getURL(buffer.c_str(), url.c_str())) { - SWLog::getSystemLog()->logWarning("copyDirectory: failed to get file %s\n", url.c_str()); - return -2; - } - completedBytes += dirEntry.size; - } - else { - SWBuf subdir = (SWBuf)dir; - removeTrailingSlash(subdir); - subdir += (SWBuf)"/" + dirEntry.name; - if (copyDirectory(urlPrefix, subdir, buffer.c_str(), suffix)) { - SWLog::getSystemLog()->logWarning("copyDirectory: failed to get file %s\n", subdir.c_str()); - return -2; - } + url += dirEntry.name; + if (getURL(buffer.c_str(), url.c_str())) { + SWLog::getSystemLog()->logWarning("copyDirectory: failed to get file %s\n", url.c_str()); + return -2; } + completedBytes += dirEntry.size; } SWCATCH (...) {} if (term) { diff --git a/src/mgr/rtranspgdrive.cpp b/src/mgr/rtranspgdrive.cpp new file mode 100644 index 0000000..10931aa --- /dev/null +++ b/src/mgr/rtranspgdrive.cpp @@ -0,0 +1,174 @@ +/***************************************************************************** + * + * rtranspgdrive.cpp - RTransportGDrive + * + * $Id$ + * + * Copyright 2004-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 <rtranspgdrive.h> + +#include <fcntl.h> + +#include <swlog.h> + + +SWORD_NAMESPACE_START + +namespace { + + struct FtpFile { + const char *filename; + FILE *stream; + SWBuf *destBuf; + }; + + + // initialize/cleanup SYSTEMWIDE library with life of this static. + static class RTransportGDrive_init { + public: + RTransportGDrive_init() { + } + + ~RTransportGDrive_init() { + } + } _rTransportGDrive_init; + + + static int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) { + struct FtpFile *out=(struct FtpFile *)stream; + if (out && !out->stream && !out->destBuf) { + /* open file for writing */ + out->stream=fopen(out->filename, "wb"); + if (!out->stream) + return -1; /* failure, can't open file to write */ + } + if (out->destBuf) { + int s = (int)out->destBuf->size(); + out->destBuf->size(s+(size*nmemb)); + memcpy(out->destBuf->getRawData()+s, buffer, size*nmemb); + return (int)nmemb; + } + return (int)fwrite(buffer, size, nmemb, out->stream); + } + + + struct MyProgressData { + StatusReporter *sr; + bool *term; + }; + + + static int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) { + if (clientp) { + MyProgressData *pd = (MyProgressData *)clientp; + SWLog::getSystemLog()->logDebug("CURLFTPTransport report progress: totalSize: %ld; xfered: %ld\n", (long)dltotal, (long)dlnow); + if (pd->sr) { + if (dltotal < 0) dltotal = 0; + if (dlnow < 0) dlnow = 0; + if (dlnow > dltotal) dlnow = dltotal; + pd->sr->update(dltotal, dlnow); + } + if (*(pd->term)) return 1; + } + return 0; + } +} + + +RTransportGDrive::RTransportGDrive(const char *host, StatusReporter *sr) : RemoteTransport(host, sr) { + // session open +} + + +RTransportGDrive::~RTransportGDrive() { + // session cleanup +} + + +char RTransportGDrive::putURL(const char *destURL, const char *sourcePath, SWBuf *sourceBuf) { + return RemoteTransport::putURL(destURL, sourcePath, sourceBuf); +} +char RTransportGDrive::getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf) { + signed char retVal = 0; + struct FtpFile ftpfile = {destPath, 0, destBuf}; +#if 0 + + if (session) { + + CURLcode res; + + struct MyProgressData pd; + pd.sr = statusReporter; + pd.term = &term; + + curl_easy_setopt(session, CURLOPT_URL, sourceURL); + + SWBuf credentials = u + ":" + p; + curl_easy_setopt(session, CURLOPT_USERPWD, credentials.c_str()); + curl_easy_setopt(session, CURLOPT_WRITEFUNCTION, my_fwrite); + if (!passive) + curl_easy_setopt(session, CURLOPT_FTPPORT, "-"); + curl_easy_setopt(session, CURLOPT_NOPROGRESS, 0); + curl_easy_setopt(session, CURLOPT_PROGRESSDATA, &pd); + curl_easy_setopt(session, CURLOPT_PROGRESSFUNCTION, my_fprogress); + curl_easy_setopt(session, CURLOPT_DEBUGFUNCTION, my_trace); + /* Set a pointer to our struct to pass to the callback */ + curl_easy_setopt(session, CURLOPT_FILE, &ftpfile); + + /* Switch on full protocol/debug output */ + curl_easy_setopt(session, CURLOPT_VERBOSE, true); + curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT, 45); + + /* FTP connection settings */ + +#if (LIBCURL_VERSION_MAJOR > 7) || \ + ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR > 10)) || \ + ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 10) && (LIBCURL_VERSION_PATCH >= 5)) +# define EPRT_AVAILABLE 1 +#endif + +#ifdef EPRT_AVAILABLE + curl_easy_setopt(session, CURLOPT_FTP_USE_EPRT, 0); + SWLog::getSystemLog()->logDebug("***** using CURLOPT_FTP_USE_EPRT\n"); +#endif + + + SWLog::getSystemLog()->logDebug("***** About to perform curl easy action. \n"); + SWLog::getSystemLog()->logDebug("***** destPath: %s \n", destPath); + SWLog::getSystemLog()->logDebug("***** sourceURL: %s \n", sourceURL); + res = curl_easy_perform(session); + SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n"); + + // it seems CURL tries to use this option data later for some reason, so we unset here + curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL); + + if(CURLE_OK != res) { + retVal = -1; + } + } +#endif + + if (ftpfile.stream) + fclose(ftpfile.stream); /* close the local file */ + + return retVal; +} + + +SWORD_NAMESPACE_END + diff --git a/src/mgr/stringmgr.cpp b/src/mgr/stringmgr.cpp index 0390905..8538cd8 100644 --- a/src/mgr/stringmgr.cpp +++ b/src/mgr/stringmgr.cpp @@ -2,7 +2,7 @@ * * stringmgr.cpp - implementation of class StringMgr * - * $Id: stringmgr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: stringmgr.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -248,7 +248,7 @@ bool StringMgr::supportsUnicode() const { char *ICUStringMgr::upperUTF8(char *buf, unsigned int maxlen) const { char *ret = buf; - int max = (maxlen) ? maxlen : strlen(buf); + int max = (int)((maxlen) ? maxlen : strlen(buf)); UErrorCode err = U_ZERO_ERROR; diff --git a/src/mgr/swconfig.cpp b/src/mgr/swconfig.cpp index 748071c..1fcef2b 100644 --- a/src/mgr/swconfig.cpp +++ b/src/mgr/swconfig.cpp @@ -3,7 +3,7 @@ * swconfig.cpp - used for saving and retrieval of configuration * information * - * $Id: swconfig.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: swconfig.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,14 +29,18 @@ SWORD_NAMESPACE_START +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif SWConfig::SWConfig() { } -SWConfig::SWConfig(const char * ifilename) { +SWConfig::SWConfig(const char *ifilename) { filename = ifilename; - Load(); + load(); } @@ -44,9 +48,13 @@ SWConfig::~SWConfig() { } -void SWConfig::Load() { +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif - if (!filename.size()) return; // assert we have a filename +void SWConfig::load() { + + if (!getFileName().size()) return; // assert we have a filename FileDesc *cfile; char *buf, *data; @@ -55,9 +63,9 @@ void SWConfig::Load() { SWBuf sectname; bool first = true; - Sections.erase(Sections.begin(), Sections.end()); + getSections().erase(getSections().begin(), getSections().end()); - cfile = FileMgr::getSystemFileMgr()->open(filename.c_str(), FileMgr::RDONLY); + cfile = FileMgr::getSystemFileMgr()->open(getFileName().c_str(), FileMgr::RDONLY); if (cfile->getFd() > 0) { bool goodLine = FileMgr::getLine(cfile, line); @@ -76,7 +84,7 @@ void SWConfig::Load() { strcpy(buf, line.c_str()); if (*strstrip(buf) == '[') { if (!first) - Sections.insert(SectionMap::value_type(sectname, cursect)); + getSections().insert(SectionMap::value_type(sectname, cursect)); else first = false; cursect.erase(cursect.begin(), cursect.end()); @@ -97,32 +105,32 @@ void SWConfig::Load() { goodLine = FileMgr::getLine(cfile, line); } if (!first) - Sections.insert(SectionMap::value_type(sectname, cursect)); + getSections().insert(SectionMap::value_type(sectname, cursect)); FileMgr::getSystemFileMgr()->close(cfile); } } -void SWConfig::Save() { +void SWConfig::save() const { - if (!filename.size()) return; // assert we have a filename + if (!getFileName().size()) return; // assert we have a filename FileDesc *cfile; SWBuf buf; - SectionMap::iterator sit; - ConfigEntMap::iterator entry; + SectionMap::const_iterator sit; + ConfigEntMap::const_iterator entry; SWBuf sectname; - cfile = FileMgr::getSystemFileMgr()->open(filename.c_str(), FileMgr::RDWR|FileMgr::CREAT|FileMgr::TRUNC); + cfile = FileMgr::getSystemFileMgr()->open(getFileName().c_str(), FileMgr::RDWR|FileMgr::CREAT|FileMgr::TRUNC); if (cfile->getFd() > 0) { - for (sit = Sections.begin(); sit != Sections.end(); sit++) { + for (sit = getSections().begin(); sit != getSections().end(); ++sit) { buf = "\n["; buf += (*sit).first.c_str(); buf += "]\n"; cfile->write(buf.c_str(), buf.length()); - for (entry = (*sit).second.begin(); entry != (*sit).second.end(); entry++) { + for (entry = (*sit).second.begin(); entry != (*sit).second.end(); ++entry) { buf = (*entry).first.c_str(); buf += "="; buf += (*entry).second.c_str(); @@ -142,32 +150,45 @@ void SWConfig::augment(SWConfig &addFrom) { SectionMap::iterator section; ConfigEntMap::iterator entry, start, end; - for (section = addFrom.Sections.begin(); section != addFrom.Sections.end(); section++) { - for (entry = (*section).second.begin(); entry != (*section).second.end(); entry++) { - start = Sections[section->first].lower_bound(entry->first); - end = Sections[section->first].upper_bound(entry->first); + for (section = addFrom.getSections().begin(); section != addFrom.getSections().end(); ++section) { + for (entry = (*section).second.begin(); entry != (*section).second.end(); ++entry) { + start = getSections()[section->first].lower_bound(entry->first); + end = getSections()[section->first].upper_bound(entry->first); if (start != end) { if (((++start) != end) - || ((++(addFrom.Sections[section->first].lower_bound(entry->first))) != addFrom.Sections[section->first].upper_bound(entry->first))) { - for (--start; start != end; start++) { + || ((++(addFrom.getSections()[section->first].lower_bound(entry->first))) != addFrom.getSections()[section->first].upper_bound(entry->first))) { + for (--start; start != end; ++start) { if (!strcmp(start->second.c_str(), entry->second.c_str())) break; } if (start == end) - Sections[(*section).first].insert(ConfigEntMap::value_type((*entry).first, (*entry).second)); + getSections()[(*section).first].insert(ConfigEntMap::value_type((*entry).first, (*entry).second)); } - else Sections[section->first][entry->first.c_str()] = entry->second.c_str(); + else getSections()[section->first][entry->first.c_str()] = entry->second.c_str(); } - else Sections[section->first][entry->first.c_str()] = entry->second.c_str(); + else getSections()[section->first][entry->first.c_str()] = entry->second.c_str(); } } } -ConfigEntMap & SWConfig::operator [] (const char *section) { - return Sections[section]; -} +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + +// TODO: use deprecated public 'Sections' property for now until we remove deprecation +// and store in private property +SectionMap &SWConfig::getSections() { return Sections; } + +// TODO: use deprecated public 'filename' property for now until we remove deprecation +// and store in private property + +SWBuf SWConfig::getFileName() const { return filename; } +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif SWORD_NAMESPACE_END diff --git a/src/mgr/swlocale.cpp b/src/mgr/swlocale.cpp index a007238..7aa9a0a 100644 --- a/src/mgr/swlocale.cpp +++ b/src/mgr/swlocale.cpp @@ -3,7 +3,7 @@ * swlocale.cpp - implementation of Class SWLocale used for retrieval * of locale lookups * - * $Id: swlocale.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: swlocale.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -69,16 +69,16 @@ SWLocale::SWLocale(const char *ifilename) { for (abbrevsCnt = 0; builtin_abbrevs[abbrevsCnt].osis[0]; abbrevsCnt++); } - confEntry = localeSource->Sections["Meta"].find("Name"); - if (confEntry != localeSource->Sections["Meta"].end()) + confEntry = localeSource->getSection("Meta").find("Name"); + if (confEntry != localeSource->getSection("Meta").end()) stdstr(&name, (*confEntry).second.c_str()); - confEntry = localeSource->Sections["Meta"].find("Description"); - if (confEntry != localeSource->Sections["Meta"].end()) + confEntry = localeSource->getSection("Meta").find("Description"); + if (confEntry != localeSource->getSection("Meta").end()) stdstr(&description, (*confEntry).second.c_str()); - confEntry = localeSource->Sections["Meta"].find("Encoding"); //Either empty (==Latin1) or UTF-8 - if (confEntry != localeSource->Sections["Meta"].end()) + confEntry = localeSource->getSection("Meta").find("Encoding"); //Either empty (==Latin1) or UTF-8 + if (confEntry != localeSource->getSection("Meta").end()) stdstr(&encoding, (*confEntry).second.c_str()); } @@ -110,8 +110,8 @@ const char *SWLocale::translate(const char *text) { if (entry == p->lookupTable.end()) { ConfigEntMap::iterator confEntry; - confEntry = localeSource->Sections["Text"].find(text); - if (confEntry == localeSource->Sections["Text"].end()) + confEntry = localeSource->getSection("Text").find(text); + if (confEntry == localeSource->getSection("Text").end()) p->lookupTable.insert(LookupMap::value_type(text, text)); else {//valid value found /* @@ -169,12 +169,12 @@ const struct abbrev *SWLocale::getBookAbbrevs(int *retSize) { for (int j = 0; builtin_abbrevs[j].osis[0]; j++) { p->mergedAbbrevs[builtin_abbrevs[j].ab] = builtin_abbrevs[j].osis; } - ConfigEntMap::iterator it = localeSource->Sections["Book Abbrevs"].begin(); - ConfigEntMap::iterator end = localeSource->Sections["Book Abbrevs"].end(); + ConfigEntMap::iterator it = localeSource->getSection("Book Abbrevs").begin(); + ConfigEntMap::iterator end = localeSource->getSection("Book Abbrevs").end(); for (; it != end; it++) { p->mergedAbbrevs[it->first.c_str()] = it->second.c_str(); } - int size = p->mergedAbbrevs.size(); + int size = (int)p->mergedAbbrevs.size(); bookAbbrevs = new struct abbrev[size + 1]; int i = 0; for (LookupMap::iterator it = p->mergedAbbrevs.begin(); it != p->mergedAbbrevs.end(); it++, i++) { diff --git a/src/mgr/swmgr.cpp b/src/mgr/swmgr.cpp index b41c411..a4413d0 100644 --- a/src/mgr/swmgr.cpp +++ b/src/mgr/swmgr.cpp @@ -2,7 +2,7 @@ * * swmgr.cpp - used to interact with an install base of sword modules * - * $Id: swmgr.cpp 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: swmgr.cpp 3524 2017-11-07 03:08:49Z scribe $ * * Copyright 1998-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -74,8 +74,10 @@ #include <cipherfil.h> #include <rawfiles.h> #include <ztext.h> +#include <ztext4.h> #include <zld.h> #include <zcom.h> +#include <zcom4.h> #include <lzsscomprs.h> #include <utf8greekaccents.h> #include <utf8cantillation.h> @@ -93,7 +95,11 @@ #ifndef EXCLUDEZLIB #include "zipcomprs.h" +#endif +#ifndef EXCLUDEBZIP2 #include "bz2comprs.h" +#endif +#ifndef EXCLUDEXZ #include "xzcomprs.h" #endif @@ -126,6 +132,32 @@ const char *SWMgr::MODTYPE_LEXDICTS = "Lexicons / Dictionaries"; const char *SWMgr::MODTYPE_GENBOOKS = "Generic Books"; const char *SWMgr::MODTYPE_DAILYDEVOS = "Daily Devotional"; +namespace { + void setSystemLogLevel(SWConfig *sysConf, const char *logLevel = 0) { + SWBuf logLevelString = logLevel; + // kindof cheese. we should probably pass this in. + SWBuf logLocation = (sysConf ? "[SWORD] section of sword.conf" : "SWORD_LOGLEVEL"); + if (sysConf) { + ConfigEntMap::iterator entry; + if ((entry = sysConf->getSection("SWORD").find("LogLevel")) != sysConf->getSection("SWORD").end()) { + logLevelString = entry->second; + } + } + if (logLevelString.length()) { + int logLevel = logLevelString == "ERROR" ? SWLog::LOG_ERROR: + logLevelString == "WARN" ? SWLog::LOG_WARN: + logLevelString == "INFO" ? SWLog::LOG_INFO: + logLevelString == "TIMEDINFO" ? SWLog::LOG_TIMEDINFO: + logLevelString == "DEBUG" ? SWLog::LOG_DEBUG: + -1; + if (logLevel < 0) SWLog::getSystemLog()->logError("Invalid LogLevel found in %s: LogLevel: %s", logLocation.c_str(), logLevelString.c_str()); + else { + SWLog::getSystemLog()->setLogLevel(logLevel); + SWLog::getSystemLog()->logInformation("Setting log level from %s to %s", logLocation.c_str(), logLevelString.c_str()); + } + } + } +} void SWMgr::init() { SWOptionFilter *tmpFilter = 0; @@ -294,24 +326,11 @@ void SWMgr::init() { } -SWBuf SWMgr::getHomeDir() { - - // figure out 'home' directory for app data - SWBuf homeDir = getenv("HOME"); - if (!homeDir.length()) { - // silly windows - homeDir = getenv("APPDATA"); - } - if (homeDir.length()) { - if ((homeDir[homeDir.length()-1] != '\\') && (homeDir[homeDir.length()-1] != '/')) { - homeDir += "/"; - } - } - - return homeDir; -} - - +// TODO: because we're still calling deprecated virtual Load. Removed in 2.0 +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif void SWMgr::commonInit(SWConfig *iconfig, SWConfig *isysconfig, bool autoload, SWFilterMgr *filterMgr, bool multiMod) { init(); @@ -335,6 +354,9 @@ void SWMgr::commonInit(SWConfig *iconfig, SWConfig *isysconfig, bool autoload, S if (autoload) Load(); } +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif SWMgr::SWMgr(SWFilterMgr *filterMgr, bool multiMod) { @@ -347,6 +369,10 @@ SWMgr::SWMgr(SWConfig *iconfig, SWConfig *isysconfig, bool autoload, SWFilterMgr } +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif SWMgr::SWMgr(const char *iConfigPath, bool autoload, SWFilterMgr *filterMgr, bool multiMod, bool augmentHome) { init(); @@ -361,22 +387,23 @@ SWMgr::SWMgr(const char *iConfigPath, bool autoload, SWFilterMgr *filterMgr, boo this->augmentHome = augmentHome; path = iConfigPath; - int len = path.length(); + int len = (int)path.length(); if ((len < 1) || ((iConfigPath[len-1] != '\\') && (iConfigPath[len-1] != '/'))) path += "/"; + SWLog::getSystemLog()->logDebug("Checking at provided path: %s...", path.c_str()); if (FileMgr::existsFile(path.c_str(), "mods.conf")) { stdstr(&prefixPath, path.c_str()); path += "mods.conf"; stdstr(&configPath, path.c_str()); } - else { - if (FileMgr::existsDir(path.c_str(), "mods.d")) { - stdstr(&prefixPath, path.c_str()); - path += "mods.d"; - stdstr(&configPath, path.c_str()); - configType = 1; - } + else if (FileMgr::existsDir(path.c_str(), "mods.d")) { + SWLog::getSystemLog()->logDebug("Found mods.d/"); + stdstr(&prefixPath, path.c_str()); + path += "mods.d"; + stdstr(&configPath, path.c_str()); + configType = 1; } + else SWLog::getSystemLog()->logDebug("Config not found at provided path."); config = 0; sysConfig = 0; @@ -384,11 +411,14 @@ SWMgr::SWMgr(const char *iConfigPath, bool autoload, SWFilterMgr *filterMgr, boo if (autoload && configPath) Load(); } +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif SWMgr::~SWMgr() { - DeleteMods(); + deleteAllModules(); for (FilterList::iterator it = cleanupFilters.begin(); it != cleanupFilters.end(); it++) delete (*it); @@ -414,23 +444,33 @@ SWMgr::~SWMgr() { void SWMgr::findConfig(char *configType, char **prefixPath, char **configPath, std::list<SWBuf> *augPaths, SWConfig **providedSysConf) { + static bool setLogLevel = false; SWBuf path; SWBuf sysConfPath; ConfigEntMap::iterator entry; ConfigEntMap::iterator lastEntry; + if (!setLogLevel) { + SWBuf envLogLevel = getenv("SWORD_LOGLEVEL"); + if (envLogLevel.length()) { + setSystemLogLevel(0, envLogLevel); + setLogLevel = true; + } + } + SWConfig *sysConf = 0; SWBuf sysConfDataPath = ""; *configType = 0; - SWBuf homeDir = getHomeDir(); + SWBuf homeDir = FileMgr::getSystemFileMgr()->getHomeDir(); // check for a sysConf passed in to us SWLog::getSystemLog()->logDebug("Checking for provided SWConfig(\"sword.conf\")..."); if (providedSysConf && *providedSysConf) { sysConf = *providedSysConf; SWLog::getSystemLog()->logDebug("found."); + if (!setLogLevel) { setSystemLogLevel(sysConf); setLogLevel = true; } } // if we haven't been given our datapath in a sysconf, we need to track it down @@ -441,9 +481,10 @@ void SWMgr::findConfig(char *configType, char **prefixPath, char **configPath, s SWLog::getSystemLog()->logDebug("Overriding any systemwide or ~/.sword/ sword.conf with one found in current directory."); sysConfPath = "./sword.conf"; sysConf = new SWConfig(sysConfPath); - if ((entry = sysConf->Sections["Install"].find("DataPath")) != sysConf->Sections["Install"].end()) { + if ((entry = sysConf->getSection("Install").find("DataPath")) != sysConf->getSection("Install").end()) { sysConfDataPath = (*entry).second; } + if (!setLogLevel) { setSystemLogLevel(sysConf); setLogLevel = true; } if (providedSysConf) { *providedSysConf = sysConf; } @@ -553,7 +594,8 @@ void SWMgr::findConfig(char *configType, char **prefixPath, char **configPath, s } if (sysConf) { - if ((entry = sysConf->Sections["Install"].find("DataPath")) != sysConf->Sections["Install"].end()) { + if (!setLogLevel) { setSystemLogLevel(sysConf); setLogLevel = true; } + if ((entry = sysConf->getSection("Install").find("DataPath")) != sysConf->getSection("Install").end()) { sysConfDataPath = (*entry).second; } if (sysConfDataPath.size()) { @@ -586,10 +628,11 @@ void SWMgr::findConfig(char *configType, char **prefixPath, char **configPath, s // do some extra processing of sysConf if we have one if (sysConf) { + if (!setLogLevel) { setSystemLogLevel(sysConf); setLogLevel = true; } if (augPaths) { augPaths->clear(); - entry = sysConf->Sections["Install"].lower_bound("AugmentPath"); - lastEntry = sysConf->Sections["Install"].upper_bound("AugmentPath"); + entry = sysConf->getSection("Install").lower_bound("AugmentPath"); + lastEntry = sysConf->getSection("Install").upper_bound("AugmentPath"); for (;entry != lastEntry; entry++) { path = entry->second; if ((entry->second.c_str()[strlen(entry->second.c_str())-1] != '\\') && (entry->second.c_str()[strlen(entry->second.c_str())-1] != '/')) @@ -638,7 +681,7 @@ void SWMgr::findConfig(char *configType, char **prefixPath, char **configPath, s SWLog::getSystemLog()->logDebug("Checking $HOME/Library/Application Support/Sword/..."); - SWBuf pathCheck = getHomeDir(); + SWBuf pathCheck = FileMgr::getSystemFileMgr()->getHomeDir(); if (pathCheck.length()) { SWLog::getSystemLog()->logDebug("found (%s).", pathCheck.c_str()); path = pathCheck; @@ -756,8 +799,8 @@ void SWMgr::augmentModules(const char *ipath, bool multiMod) { // fix config's Section names to rename modules which are available more than once // find out which sections are in both config objects // inserting all configs first is not good because that overwrites old keys and new modules would share the same config - for (SectionMap::iterator it = config->Sections.begin(); it != config->Sections.end();) { - if (saveConfig->Sections.find( (*it).first ) != saveConfig->Sections.end()) { //if the new section is already present rename it + for (SectionMap::iterator it = config->getSections().begin(); it != config->getSections().end();) { + if (saveConfig->getSections().find((*it).first) != saveConfig->getSections().end()) { //if the new section is already present rename it ConfigEntMap entMap((*it).second); SWBuf name; @@ -765,17 +808,17 @@ void SWMgr::augmentModules(const char *ipath, bool multiMod) { do { //module name already used? name.setFormatted("%s_%d", (*it).first.c_str(), i); i++; - } while (config->Sections.find(name) != config->Sections.end()); + } while (config->getSections().find(name) != config->getSections().end()); - config->Sections.insert(SectionMap::value_type(name, entMap) ); + config->getSections().insert(SectionMap::value_type(name, entMap) ); SectionMap::iterator toErase = it++; - config->Sections.erase(toErase); + config->getSections().erase(toErase); } else ++it; } } - CreateMods(multiMod); + createAllModules(multiMod); stdstr(&prefixPath, savePrefixPath); delete []savePrefixPath; @@ -791,13 +834,13 @@ void SWMgr::augmentModules(const char *ipath, bool multiMod) { /*********************************************************************** - * SWMgr::Load - loads actual modules + * SWMgr::load - loads actual modules * * RET: status - 0 = ok; -1 no config found; 1 = no modules installed * */ -signed char SWMgr::Load() { +signed char SWMgr::load() { signed char ret = 0; if (!config) { // If we weren't passed a config object at construction, find a config file @@ -819,9 +862,9 @@ signed char SWMgr::Load() { SectionMap::iterator Sectloop, Sectend; ConfigEntMap::iterator Entryloop, Entryend; - DeleteMods(); + deleteAllModules(); - for (Sectloop = config->Sections.lower_bound("Globals"), Sectend = config->Sections.upper_bound("Globals"); Sectloop != Sectend; Sectloop++) { // scan thru all 'Globals' sections + for (Sectloop = config->getSections().lower_bound("Globals"), Sectend = config->getSections().upper_bound("Globals"); Sectloop != Sectend; Sectloop++) { // scan thru all 'Globals' sections for (Entryloop = (*Sectloop).second.lower_bound("AutoInstall"), Entryend = (*Sectloop).second.upper_bound("AutoInstall"); Entryloop != Entryend; Entryloop++) // scan thru all AutoInstall entries InstallScan((*Entryloop).second.c_str()); // Scan AutoInstall entry directory for new modules and install } @@ -830,16 +873,16 @@ signed char SWMgr::Load() { config = myconfig = 0; loadConfigDir(configPath); } - else config->Load(); + else config->load(); - CreateMods(mgrModeMultiMod); + createAllModules(mgrModeMultiMod); for (std::list<SWBuf>::iterator pathIt = augPaths.begin(); pathIt != augPaths.end(); pathIt++) { augmentModules(pathIt->c_str(), mgrModeMultiMod); } if (augmentHome) { // augment config with ~/.sword/mods.d if it exists --------------------- - SWBuf homeDir = getHomeDir(); + SWBuf homeDir = FileMgr::getSystemFileMgr()->getHomeDir(); if (homeDir.length() && configType != 2) { // 2 = user only SWBuf path = homeDir; path += ".sword/"; @@ -850,7 +893,7 @@ signed char SWMgr::Load() { } } // ------------------------------------------------------------------------- - if (!Modules.size()) // config exists, but no modules + if (!getModules().size()) // config exists, but no modules ret = 1; } @@ -912,11 +955,15 @@ SWModule *SWMgr::createModule(const char *name, const char *driver, ConfigEntMap else markup = FMT_GBF; - if (!stricmp(encoding.c_str(), "SCSU")) - enc = ENC_SCSU; - else if (!stricmp(encoding.c_str(), "UTF-8")) { + if (!stricmp(encoding.c_str(), "UTF-8")) { enc = ENC_UTF8; } + else if (!stricmp(encoding.c_str(), "SCSU")) { + enc = ENC_SCSU; + } + else if (!stricmp(encoding.c_str(), "UTF-16")) { + enc = ENC_UTF16; + } else enc = ENC_LATIN1; if ((entry = section.find("Direction")) == section.end()) { @@ -932,7 +979,7 @@ SWModule *SWMgr::createModule(const char *name, const char *driver, ConfigEntMap direction = DIRECTION_LTR; } - if ((!stricmp(driver, "zText")) || (!stricmp(driver, "zCom"))) { + if ((!stricmp(driver, "zText")) || (!stricmp(driver, "zCom")) || (!stricmp(driver, "zText4")) || (!stricmp(driver, "zCom4"))) { SWCompress *compress = 0; int blockType = CHAPTERBLOCKS; misc1 = ((entry = section.find("BlockType")) != section.end()) ? (*entry).second : (SWBuf)"CHAPTER"; @@ -948,10 +995,14 @@ SWModule *SWMgr::createModule(const char *name, const char *driver, ConfigEntMap if (!stricmp(misc1.c_str(), "ZIP")) compress = new ZipCompress(); else - if (!stricmp(misc1.c_str(), "BZIP2_UNSUPPORTED")) +#endif +#ifndef EXCLUDEBZIP2 + if (!stricmp(misc1.c_str(), "BZIP2")) compress = new Bzip2Compress(); else - if (!stricmp(misc1.c_str(), "XZ_UNSUPPORTED")) +#endif +#ifndef EXCLUDEXZ + if (!stricmp(misc1.c_str(), "XZ")) compress = new XzCompress(); else #endif @@ -961,7 +1012,12 @@ SWModule *SWMgr::createModule(const char *name, const char *driver, ConfigEntMap if (compress) { if (!stricmp(driver, "zText")) newmod = new zText(datapath.c_str(), name, description.c_str(), blockType, compress, 0, enc, direction, markup, lang.c_str(), versification); - else newmod = new zCom(datapath.c_str(), name, description.c_str(), blockType, compress, 0, enc, direction, markup, lang.c_str(), versification); + else if (!stricmp(driver, "zText4")) + newmod = new zText4(datapath.c_str(), name, description.c_str(), blockType, compress, 0, enc, direction, markup, lang.c_str(), versification); + else if (!stricmp(driver, "zCom4")) + newmod = new zCom4(datapath.c_str(), name, description.c_str(), blockType, compress, 0, enc, direction, markup, lang.c_str(), versification); + else + newmod = new zCom(datapath.c_str(), name, description.c_str(), blockType, compress, 0, enc, direction, markup, lang.c_str(), versification); } } @@ -1025,6 +1081,16 @@ SWModule *SWMgr::createModule(const char *name, const char *driver, ConfigEntMap compress = new ZipCompress(); else #endif +#ifndef EXCLUDEBZIP2 + if (!stricmp(misc1.c_str(), "BZIP2")) + compress = new Bzip2Compress(); + else +#endif +#ifndef EXCLUDEXZ + if (!stricmp(misc1.c_str(), "XZ")) + compress = new XzCompress(); + else +#endif if (!stricmp(misc1.c_str(), "LZSS")) compress = new LZSSCompress(); @@ -1042,7 +1108,7 @@ SWModule *SWMgr::createModule(const char *name, const char *driver, ConfigEntMap if (pos == 1) { SWBuf &dp = section["AbsoluteDataPath"]; - for (int i = dp.length() - 1; i; i--) { + for (int i = (int)dp.length() - 1; i; i--) { if (dp[i] == '/') { dp.setSize(i); break; @@ -1071,7 +1137,10 @@ SWModule *SWMgr::createModule(const char *name, const char *driver, ConfigEntMap } -void SWMgr::AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) { +void SWMgr::addGlobalOptionFilters(SWModule *module, ConfigEntMap §ion) { + + ConfigEntMap::iterator start = section.lower_bound("GlobalOptionFilter"); + ConfigEntMap::iterator end = section.upper_bound("GlobalOptionFilter"); for (;start != end; ++start) { OptionFilterMap::iterator it; @@ -1120,8 +1189,7 @@ void SWMgr::AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntM } -char SWMgr::filterText(const char *filterName, SWBuf &text, const SWKey *key, const SWModule *module) -{ +char SWMgr::filterText(const char *filterName, SWBuf &text, const SWKey *key, const SWModule *module) { char retVal = -1; // why didn't we use find here? for (OptionFilterMap::iterator it = optionFilters.begin(); it != optionFilters.end(); it++) { @@ -1144,8 +1212,11 @@ char SWMgr::filterText(const char *filterName, SWBuf &text, const SWKey *key, co } -void SWMgr::AddLocalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) -{ +void SWMgr::addLocalOptionFilters(SWModule *module, ConfigEntMap §ion) { + + ConfigEntMap::iterator start = section.lower_bound("LocalOptionFilter"); + ConfigEntMap::iterator end = section.upper_bound("LocalOptionFilter"); + for (;start != end; start++) { OptionFilterMap::iterator it; it = optionFilters.find((*start).second); @@ -1160,8 +1231,11 @@ void SWMgr::AddLocalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMa // manually specified StripFilters for special cases, like Papyri marks and such -void SWMgr::AddStripFilters(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) -{ +void SWMgr::addLocalStripFilters(SWModule *module, ConfigEntMap §ion) { + + ConfigEntMap::iterator start = section.lower_bound("LocalStripFilter"); + ConfigEntMap::iterator end = section.upper_bound("LocalStripFilter"); + for (;start != end; start++) { OptionFilterMap::iterator it; it = optionFilters.find((*start).second); @@ -1172,7 +1246,7 @@ void SWMgr::AddStripFilters(SWModule *module, ConfigEntMap §ion, ConfigEntMa } -void SWMgr::AddRawFilters(SWModule *module, ConfigEntMap §ion) { +void SWMgr::addRawFilters(SWModule *module, ConfigEntMap §ion) { SWBuf sourceformat, cipherKey; ConfigEntMap::iterator entry; @@ -1189,13 +1263,13 @@ void SWMgr::AddRawFilters(SWModule *module, ConfigEntMap §ion) { } -void SWMgr::AddEncodingFilters(SWModule *module, ConfigEntMap §ion) { +void SWMgr::addEncodingFilters(SWModule *module, ConfigEntMap §ion) { if (filterMgr) filterMgr->AddEncodingFilters(module, section); } -void SWMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) { +void SWMgr::addRenderFilters(SWModule *module, ConfigEntMap §ion) { SWBuf sourceformat; ConfigEntMap::iterator entry; @@ -1221,7 +1295,7 @@ void SWMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) { } -void SWMgr::AddStripFilters(SWModule *module, ConfigEntMap §ion) +void SWMgr::addStripFilters(SWModule *module, ConfigEntMap §ion) { SWBuf sourceformat; ConfigEntMap::iterator entry; @@ -1254,81 +1328,6 @@ void SWMgr::AddStripFilters(SWModule *module, ConfigEntMap §ion) } -void SWMgr::CreateMods(bool multiMod) { - SectionMap::iterator it; - ConfigEntMap::iterator start; - ConfigEntMap::iterator end; - ConfigEntMap::iterator entry; - SWModule *newmod; - SWBuf driver, misc1; - for (it = config->Sections.begin(); it != config->Sections.end(); it++) { - ConfigEntMap §ion = (*it).second; - newmod = 0; - - driver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (SWBuf)""; - if (driver.length()) { - newmod = createModule((*it).first, driver, section); - if (newmod) { - // Filters to add for this module and globally announce as an option to the user - // e.g. translit, strongs, redletterwords, etc, so users can turn these on and off globally - start = section.lower_bound("GlobalOptionFilter"); - end = section.upper_bound("GlobalOptionFilter"); - AddGlobalOptions(newmod, section, start, end); - - // Only add the option to the module, don't announce it's availability - // These are useful for like: filters that parse special entryAttribs in a text - // or whatever you might want to happen on entry lookup - start = section.lower_bound("LocalOptionFilter"); - end = section.upper_bound("LocalOptionFilter"); - AddLocalOptions(newmod, section, start, end); - - //STRIP FILTERS - - // add all basic ones for for the modtype - AddStripFilters(newmod, section); - - // Any special processing for this module when searching: - // e.g. for papyri, removed all [](). notation - start = section.lower_bound("LocalStripFilter"); - end = section.upper_bound("LocalStripFilter"); - AddStripFilters(newmod, section, start, end); - - AddRawFilters(newmod, section); - AddRenderFilters(newmod, section); - AddEncodingFilters(newmod, section); - - SWModule *oldmod = Modules[newmod->getName()]; - if (oldmod) { - delete oldmod; - } - - Modules[newmod->getName()] = newmod; - } - } - } -} - - -void SWMgr::DeleteMods() { - - ModMap::iterator it; - - for (it = Modules.begin(); it != Modules.end(); it++) - delete (*it).second; - - Modules.clear(); -} - - -void SWMgr::deleteModule(const char *modName) { - ModMap::iterator it = Modules.find(modName); - if (it != Modules.end()) { - delete (*it).second; - Modules.erase(it); - } -} - - void SWMgr::InstallScan(const char *dirname) { DIR *dir; @@ -1361,8 +1360,8 @@ void SWMgr::InstallScan(const char *dirname) // mods.conf else { if (!conffd) { - conffd = FileMgr::getSystemFileMgr()->open(config->filename.c_str(), FileMgr::WRONLY|FileMgr::APPEND); - if (conffd > 0) + conffd = FileMgr::getSystemFileMgr()->open(config->getFileName().c_str(), FileMgr::WRONLY|FileMgr::APPEND); + if (conffd && conffd->getFd() >= 0) conffd->seek(0L, SEEK_END); else { FileMgr::getSystemFileMgr()->close(conffd); @@ -1455,6 +1454,91 @@ StringList SWMgr::getGlobalOptionValues(const char *option) return options; } +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + +// TODO: use deprecated public 'Modules' property for now until we remove deprecation +// and store in private property +// also old deprecated virtuals so client overrides still are called + +void SWMgr::createAllModules(bool multiMod) { + SectionMap::iterator it; + ConfigEntMap::iterator entry; + SWModule *newmod; + SWBuf driver, misc1; + for (it = config->getSections().begin(); it != config->getSections().end(); it++) { + ConfigEntMap §ion = (*it).second; + newmod = 0; + + driver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (SWBuf)""; + if (driver.length()) { + newmod = createModule((*it).first, driver, section); + if (newmod) { + // Filters to add for this module and globally announce as an option to the user + // e.g. translit, strongs, redletterwords, etc, so users can turn these on and off globally + // TODO: addGlobalOptionFilters(newmod, section); + AddGlobalOptions(newmod, section, section.lower_bound("GlobalOptionFilter"), section.upper_bound("GlobalOptionFilter")); + + // Only add the option to the module, don't announce it's availability + // These are useful for like: filters that parse special entryAttribs in a text + // or whatever you might want to happen on entry lookup + // TODO: addLocalOptionFilters(newmod, section); + AddLocalOptions(newmod, section, section.lower_bound("LocalOptionFilter"), section.upper_bound("LocalOptionFilter")); + + //STRIP FILTERS + + // add all basic strip filters for for the modtype + // TODO: addStripFilters(newmod, section); + AddStripFilters(newmod, section); + + // Any module-specific processing specified in module config + // as entries LocalStripFilter= + // e.g. for papyri, removed all [](). notation + // TODO: addLocalStripFilters(newmod, section); + AddStripFilters(newmod, section, section.lower_bound("LocalStripFilter"), section.upper_bound("LocalStripFilter")); + + // TODO: addRawFilters(newmod, section); + AddRawFilters(newmod, section); + // TODO: addRenderFilters(newmod, section); + AddRenderFilters(newmod, section); + // TODO: addEncodingFilters(newmod, section); + AddEncodingFilters(newmod, section); + + // place our module in module container, removing first if one + // already exists by our same name + SWModule *oldmod = getModule(newmod->getName()); + if (oldmod) { + delete oldmod; + } + + Modules[newmod->getName()] = newmod; + } + } + } +} + + +void SWMgr::deleteAllModules() { + + ModMap::iterator it; + + for (it = getModules().begin(); it != getModules().end(); ++it) { + delete (*it).second; + } + + Modules.clear(); +} + + +void SWMgr::deleteModule(const char *modName) { + ModMap::iterator it = Modules.find(modName); + if (it != Modules.end()) { + delete (*it).second; + Modules.erase(it); + } +} signed char SWMgr::setCipherKey(const char *modName, const char *key) { FilterMap::iterator it; @@ -1481,5 +1565,13 @@ signed char SWMgr::setCipherKey(const char *modName, const char *key) { } +ModMap &SWMgr::getModules() { return Modules; } + +SWBuf SWMgr::getHomeDir() { return FileMgr::getSystemFileMgr()->getHomeDir(); } + +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + SWORD_NAMESPACE_END diff --git a/src/mgr/versificationmgr.cpp b/src/mgr/versificationmgr.cpp index 7972488..027889f 100644 --- a/src/mgr/versificationmgr.cpp +++ b/src/mgr/versificationmgr.cpp @@ -3,7 +3,7 @@ * versificationmgr.cpp - implementation of class VersificationMgr used * for managing versification systems * - * $Id: versificationmgr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: versificationmgr.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -45,6 +45,9 @@ #include <canon_catholic2.h> // Catholic2 v11n system (16 chapter Esther) #include <canon_lxx.h> // General LXX v11n system (includes GNT, as used in Orthodox Bibles) #include <canon_orthodox.h> // Orthodox v11n system as used in Orthodox Bibles +#include <canon_segond.h> // French v11n system as used by Segond Bibles and its derivatives +#include <canon_calvin.h> // French v11n system +#include <canon_darbyfr.h> // French v11n system based on John Darby's French translation using std::vector; using std::map; @@ -62,17 +65,20 @@ VersificationMgr *VersificationMgr::getSystemVersificationMgr() { systemVersificationMgr->registerVersificationSystem("Leningrad", otbooks_leningrad, ntbooks_null, vm_leningrad); systemVersificationMgr->registerVersificationSystem("MT", otbooks_mt, ntbooks_null, vm_mt); systemVersificationMgr->registerVersificationSystem("KJVA", otbooks_kjva, ntbooks, vm_kjva); - systemVersificationMgr->registerVersificationSystem("NRSV", otbooks, ntbooks, vm_nrsv); + systemVersificationMgr->registerVersificationSystem("NRSV", otbooks, ntbooks, vm_nrsv, mappings_nrsv); systemVersificationMgr->registerVersificationSystem("NRSVA", otbooks_nrsva, ntbooks, vm_nrsva); - systemVersificationMgr->registerVersificationSystem("Synodal", otbooks_synodal, ntbooks_synodal, vm_synodal); + systemVersificationMgr->registerVersificationSystem("Synodal", otbooks_synodal, ntbooks_synodal, vm_synodal, mappings_synodal); systemVersificationMgr->registerVersificationSystem("SynodalProt", otbooks_synodalProt, ntbooks_synodal, vm_synodalProt); - systemVersificationMgr->registerVersificationSystem("Vulg", otbooks_vulg, ntbooks_vulg, vm_vulg); + systemVersificationMgr->registerVersificationSystem("Vulg", otbooks_vulg, ntbooks_vulg, vm_vulg, mappings_vulg); systemVersificationMgr->registerVersificationSystem("German", otbooks_german, ntbooks, vm_german); systemVersificationMgr->registerVersificationSystem("Luther", otbooks_luther, ntbooks_luther, vm_luther); systemVersificationMgr->registerVersificationSystem("Catholic", otbooks_catholic, ntbooks, vm_catholic); systemVersificationMgr->registerVersificationSystem("Catholic2", otbooks_catholic2, ntbooks, vm_catholic2); systemVersificationMgr->registerVersificationSystem("LXX", otbooks_lxx, ntbooks, vm_lxx); systemVersificationMgr->registerVersificationSystem("Orthodox", otbooks_orthodox, ntbooks, vm_orthodox); + systemVersificationMgr->registerVersificationSystem("Calvin", otbooks, ntbooks, vm_calvin, mappings_calvin); + systemVersificationMgr->registerVersificationSystem("DarbyFr", otbooks, ntbooks, vm_darbyfr, mappings_darbyfr); + systemVersificationMgr->registerVersificationSystem("Segond", otbooks, ntbooks, vm_segond, mappings_segond); } return systemVersificationMgr; } @@ -83,6 +89,19 @@ public: /** Array[chapmax] of maximum verses in chapters */ vector<Book> books; map<SWBuf, int> osisLookup; + /** General mapping rule is that first verse of every chapter corresponds first + verse of another chapter in default intermediate canon(kjva), so mapping data + contains expections. Intermediate canon could not contain corresponding data. + + pointers on uchar[7]: 1 value - book id 1-based, ot+nt, 2-4 map to, 5-7 map + from (chap,verse from, verse to if greater then "verse from") + + TODO what if book name in one v11n differs from cannon + special section in mapping for book transformation + */ + typedef vector<const unsigned char*> mapping; + vector<mapping> mappings; + vector<const char*> mappingsExtraBooks; Private() { } @@ -115,7 +134,8 @@ public: } VersificationMgr::Book::Private &operator =(const VersificationMgr::Book::Private &other) { verseMax.clear(); - verseMax = other.verseMax; + int s = (int)other.verseMax.size(); + if (s) verseMax = other.verseMax; offsetPrecomputed = other.offsetPrecomputed; return *this; } @@ -179,7 +199,7 @@ int VersificationMgr::System::getBookNumberByOSISName(const char *bookName) cons } -void VersificationMgr::System::loadFromSBook(const sbook *ot, const sbook *nt, int *chMax) { +void VersificationMgr::System::loadFromSBook(const sbook *ot, const sbook *nt, int *chMax, const unsigned char *mappings) { int chap = 0; int book = 0; long offset = 0; // module heading @@ -188,7 +208,7 @@ void VersificationMgr::System::loadFromSBook(const sbook *ot, const sbook *nt, i p->books.push_back(Book(ot->name, ot->osis, ot->prefAbbrev, ot->chapmax)); offset++; // book heading Book &b = p->books[p->books.size()-1]; - p->osisLookup[b.getOSISName()] = p->books.size(); + p->osisLookup[b.getOSISName()] = (int)p->books.size(); for (int i = 0; i < ot->chapmax; i++) { b.p->verseMax.push_back(chMax[chap]); offset++; // chapter heading @@ -206,7 +226,7 @@ void VersificationMgr::System::loadFromSBook(const sbook *ot, const sbook *nt, i p->books.push_back(Book(nt->name, nt->osis, nt->prefAbbrev, nt->chapmax)); offset++; // book heading Book &b = p->books[p->books.size()-1]; - p->osisLookup[b.getOSISName()] = p->books.size(); + p->osisLookup[b.getOSISName()] = (int)p->books.size(); for (int i = 0; i < nt->chapmax; i++) { b.p->verseMax.push_back(chMax[chap]); offset++; // chapter heading @@ -219,6 +239,23 @@ void VersificationMgr::System::loadFromSBook(const sbook *ot, const sbook *nt, i BMAX[1] = book; // TODO: build offset speed array + + // parse mappings + if (mappings != NULL) { + const unsigned char *m=mappings; + for (; *m != 0; m += strlen((const char*)m)+1) { + p->mappingsExtraBooks.push_back((const char*)m); + } + p->mappings.resize(p->books.size()+p->mappingsExtraBooks.size()); + + for (++m; *m != 0; m += 7) { + p->mappings[m[0]-1].push_back(m); + if (*m > p->books.size()) { + p->mappings[m[7]-1].push_back(m); + m += 1; + } + } + } } @@ -255,7 +292,7 @@ int VersificationMgr::Book::getVerseMax(int chapter) const { int VersificationMgr::System::getBookCount() const { - return (p ? p->books.size() : 0); + return (int)(p ? p->books.size() : 0); } @@ -372,10 +409,10 @@ const VersificationMgr::System *VersificationMgr::getVersificationSystem(const c } -void VersificationMgr::registerVersificationSystem(const char *name, const sbook *ot, const sbook *nt, int *chMax) { +void VersificationMgr::registerVersificationSystem(const char *name, const sbook *ot, const sbook *nt, int *chMax, const unsigned char *mappings) { p->systems[name] = name; System &s = p->systems[name]; - s.loadFromSBook(ot, nt, chMax); + s.loadFromSBook(ot, nt, chMax, mappings); } @@ -391,6 +428,138 @@ const StringList VersificationMgr::getVersificationSystems() const { return retVal; } +void VersificationMgr::System::translateVerse(const System *dstSys, const char **book, int *chapter, int *verse, int *verse_end) const { + SWLog::getSystemLog()->logDebug("translate verse from %s to %s: %s.%i.%i-%i\n",getName(), dstSys->getName(), *book, *chapter, *verse, *verse_end); + + if (!strcmp(getName(),"KJVA") || !strcmp(getName(),"KJV")) { + if (!strcmp(dstSys->getName(),"KJVA") || !strcmp(dstSys->getName(),"KJV")) + return; + // reversed mapping + SWLog::getSystemLog()->logDebug("Perform reversed mapping.\n"); + int b = dstSys->getBookNumberByOSISName(*book)-1; + + SWLog::getSystemLog()->logDebug("\tgetBookNumberByOSISName %i %s.\n", b, *book); + + if (b < 0) { + SWLog::getSystemLog()->logDebug("\tmappingsExtraBooks.size() %i.\n", dstSys->p->mappingsExtraBooks.size()); + for (int i=0; i<(int)dstSys->p->mappingsExtraBooks.size(); ++i) { + SWLog::getSystemLog()->logDebug("\t%s %s.\n", *book, dstSys->p->mappingsExtraBooks[i]); + if (!strcmp(*book, dstSys->p->mappingsExtraBooks[i])) { + b = (int)p->books.size()+i-2; + break; + } + } + } + + SWLog::getSystemLog()->logDebug("\tb %i.\n", b); + + if (b >= (int)dstSys->p->mappings.size() || b < 0) { + SWLog::getSystemLog()->logDebug("no modification"); + return; + } + + const unsigned char *a = NULL; + + // reversed mapping should use forward search for item + for (unsigned int i=0; i<dstSys->p->mappings[b].size(); ++i) { + const unsigned char *m = dstSys->p->mappings[b][i]; + if (m[4] == *chapter && m[5] <= *verse) { + SWLog::getSystemLog()->logDebug("found mapping %i %i %i %i %i %i\n",m[1],m[2],m[3],m[4],m[5],m[6]); + if (m[5] == *verse || (m[6] >= *verse && m[5] <= *verse)) { + // inside of any mapping range + *chapter = m[1]; + *verse = m[2]; + *verse_end = m[3]; + if (*m >= dstSys->p->books.size()) { + SWLog::getSystemLog()->logWarning("map to extra books, possible bug source\n"); + *book = dstSys->getBook(m[7]-1)->getOSISName(); + } + return; + } + // destination mapping can have duplicate items, use the last (by using <=) + if (a == NULL || (a[5]>a[6]?a[5]:a[6]) <= (m[5]>m[6]?m[5]:m[6])) + a = m; + } + } + if (a != NULL) { + SWLog::getSystemLog()->logDebug("set appropriate: %i %i %i %i %i %i\n",a[1],a[2],a[3],a[4],a[5],a[6]); + (*chapter) = a[1]; + // shift verse + const int d = (a[3]>a[2]?a[3]:a[2])-(a[6]>a[5]?a[6]:a[5]); + if (*verse < *verse_end) + *verse_end += d; + else + *verse_end = (*verse) + d; + *verse += d; + if (*a > dstSys->p->books.size()) { + SWLog::getSystemLog()->logDebug("appropriate: %i %i %i %i %i %i %i %i\n",a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7]); + SWLog::getSystemLog()->logDebug("book: %s\n", dstSys->getBook(a[7]-1)->getOSISName()); + *book = dstSys->getBook(a[7]-1)->getOSISName(); + } + return; + } + SWLog::getSystemLog()->logDebug("There is no mapping.\n"); + } + else if (strcmp(dstSys->getName(),"KJVA") && strcmp(dstSys->getName(),"KJV")) { + const System *kjva = getSystemVersificationMgr()->getVersificationSystem("KJVA"); + const int src_verse = *verse; + + translateVerse(kjva, book, chapter, verse, verse_end); + + int interm_verse = *verse, interm_range = *verse_end, interm_chapter = *chapter; + const char *interm_book = *book; + + kjva->translateVerse(dstSys, book, chapter, verse, verse_end); + + // contraction->expansion fix + if (verse < verse_end && !(interm_verse < interm_range)) { + kjva->translateVerse(this, &interm_book, &interm_chapter, &interm_verse, &interm_range); + if (interm_verse < interm_range) { + *verse += src_verse - interm_verse; + if (*verse > *verse_end) + *verse = *verse_end; + else + *verse_end = *verse; + } + } + } + else { + SWLog::getSystemLog()->logDebug("Perform forward mapping.\n"); + const int b = getBookNumberByOSISName(*book)-1; + if (b >= (int)p->mappings.size()) + return; + // forward mapping should use reversed search for item + for (int i = (int)p->mappings[b].size()-1; i>=0; --i) { + const unsigned char *m = p->mappings[b][i]; + if (m[1] < *chapter) { + SWLog::getSystemLog()->logWarning("There is no mapping for this chapter.\n"); + return; + } + if (m[1] == *chapter && m[2] <= *verse) { + SWLog::getSystemLog()->logDebug("found mapping %i %i %i %i %i %i\n",m[1],m[2],m[3],m[4],m[5],m[6]); + if (m[2] == *verse || (m[3] >= *verse && m[2] <= *verse)) { + *chapter = m[4]; + *verse = m[5]; + *verse_end = m[6]; + } + else { + *chapter = m[4]; + // shift verse + const int d = (m[6]>m[5]?m[6]:m[5])-(m[3]>m[2]?m[3]:m[2]); + if (*verse < *verse_end) + *verse_end += d; + else + *verse_end = (*verse) + d; + *verse += d; + } + if (*m > p->books.size()) + *book = p->mappingsExtraBooks[m[0]-p->books.size()-1]; + return; + } + } + SWLog::getSystemLog()->logDebug("No mapping.\n"); + } +} SWORD_NAMESPACE_END diff --git a/src/modules/comments/Makefile.am b/src/modules/comments/Makefile.am index 7139cf8..8ca9fc9 100644 --- a/src/modules/comments/Makefile.am +++ b/src/modules/comments/Makefile.am @@ -6,4 +6,5 @@ include ../src/modules/comments/rawcom/Makefile.am include ../src/modules/comments/rawcom4/Makefile.am include ../src/modules/comments/rawfiles/Makefile.am include ../src/modules/comments/zcom/Makefile.am +include ../src/modules/comments/zcom4/Makefile.am include ../src/modules/comments/hrefcom/Makefile.am diff --git a/src/modules/comments/rawcom4/Makefile b/src/modules/comments/rawcom4/Makefile index a08e07e..35d6648 100644 --- a/src/modules/comments/rawcom4/Makefile +++ b/src/modules/comments/rawcom4/Makefile @@ -1,5 +1,5 @@ -
-root := ../../../..
-
-all:
- make -C ${root}
+ +root := ../../../.. + +all: + make -C ${root} diff --git a/src/modules/comments/rawcom4/rawcom4.cpp b/src/modules/comments/rawcom4/rawcom4.cpp index 7cfc603..f432712 100644 --- a/src/modules/comments/rawcom4/rawcom4.cpp +++ b/src/modules/comments/rawcom4/rawcom4.cpp @@ -4,7 +4,7 @@ * commentary files: * ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawcom4.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: rawcom4.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -72,7 +72,7 @@ SWBuf &RawCom4::getRawEntryBuf() const { VerseKey *key = &getVerseKey(); findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size); - entrySize = size; // support getEntrySize call + entrySize = (int)size; // support getEntrySize call entryBuf = ""; readText(key->getTestament(), start, size, entryBuf); diff --git a/src/modules/comments/zcom/zcom.cpp b/src/modules/comments/zcom/zcom.cpp index 839baf5..b6d18b2 100644 --- a/src/modules/comments/zcom/zcom.cpp +++ b/src/modules/comments/zcom/zcom.cpp @@ -3,7 +3,7 @@ * zcom.cpp - code for class 'zCom'- a module that reads raw commentary * files * - * $Id: zcom.cpp 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: zcom.cpp 3073 2014-03-05 00:27:52Z scribe $ * * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/comments/zcom4/Makefile b/src/modules/comments/zcom4/Makefile new file mode 100644 index 0000000..35d6648 --- /dev/null +++ b/src/modules/comments/zcom4/Makefile @@ -0,0 +1,5 @@ + +root := ../../../.. + +all: + make -C ${root} diff --git a/src/modules/comments/zcom4/Makefile.am b/src/modules/comments/zcom4/Makefile.am new file mode 100644 index 0000000..6ae887f --- /dev/null +++ b/src/modules/comments/zcom4/Makefile.am @@ -0,0 +1,2 @@ +zcom4dir = $(top_srcdir)/src/modules/comments/zcom4 +libsword_la_SOURCES += $(zcom4dir)/zcom4.cpp diff --git a/src/modules/comments/zcom4/zcom4.cpp b/src/modules/comments/zcom4/zcom4.cpp new file mode 100644 index 0000000..534582a --- /dev/null +++ b/src/modules/comments/zcom4/zcom4.cpp @@ -0,0 +1,220 @@ +/****************************************************************************** + * + * zcom4.cpp - code for class 'zCom4'- a module that reads compressed + * commentary files + * + * $Id: zcom4.cpp 3141 2014-03-19 01:24:04Z chrislit $ + * + * Copyright 1996-2014 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 <ctype.h> +#include <stdio.h> +#include <fcntl.h> + +#include <swbuf.h> +#include <zverse4.h> +#include <versekey.h> +#include <zcom4.h> +#include <filemgr.h> + +SWORD_NAMESPACE_START + +/****************************************************************************** + * zCom4 Constructor - Initializes data for instance of zCom4 + * + * ENT: ipath - path to data files + * iname - Internal name for module + * idesc - Name to display to user for module + * iblockType - verse, chapter, book, etc. of index chunks + * icomp - Compressor object + * idisp - Display object to use for displaying + */ + +zCom4::zCom4(const char *ipath, const char *iname, const char *idesc, int iblockType, SWCompress *icomp, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char *ilang, const char *versification) : zVerse4(ipath, -1, iblockType, icomp), SWCom(iname, idesc, idisp, enc, dir, mark, ilang, versification)/*, SWCompress()*/ +{ + blockType = iblockType; + lastWriteKey = 0; +} + +/****************************************************************************** + * zCom4 Destructor - Cleans up instance of zCom4 + */ + +zCom4::~zCom4() { + flushCache(); + + if (lastWriteKey) + delete lastWriteKey; +} + + +bool zCom4::isWritable() const { + return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); +} + + +/****************************************************************************** + * zCom4::getRawEntry - Returns the current verse buffer + * + * RET: buffer with verse + */ + +SWBuf &zCom4::getRawEntryBuf() const { + long start = 0; + unsigned long size = 0; + unsigned long buffnum = 0; + VerseKey &key = getVerseKey(); + + findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size, &buffnum); + entrySize = size; // support getEntrySize call + + entryBuf = ""; + + zReadText(key.getTestament(), start, size, buffnum, entryBuf); + rawFilter(entryBuf, &key); + +// if (!isUnicode()) + prepText(entryBuf); + + return entryBuf; +} + + +bool zCom4::sameBlock(VerseKey *k1, VerseKey *k2) { + if (k1->getTestament() != k2->getTestament()) + return false; + + switch (blockType) { + case VERSEBLOCKS: + if (k1->getVerse() != k2->getVerse()) + return false; + case CHAPTERBLOCKS: + if (k1->getChapter() != k2->getChapter()) + return false; + case BOOKBLOCKS: + if (k1->getBook() != k2->getBook()) + return false; + } + return true; +} + +void zCom4::setEntry(const char *inbuf, long len) { + VerseKey *key = &getVerseKey(); + + // see if we've jumped across blocks since last write + if (lastWriteKey) { + if (!sameBlock(lastWriteKey, key)) { + flushCache(); + } + delete lastWriteKey; + } + + doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len); + + lastWriteKey = (VerseKey *)key->clone(); // must delete +} + + +void zCom4::linkEntry(const SWKey *inkey) { + VerseKey *destkey = &getVerseKey(); + const VerseKey *srckey = &getVerseKey(inkey); + + doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex()); + + if (inkey != srckey) // free our key if we created a VerseKey + delete srckey; +} + +/****************************************************************************** + * zCom4::deleteEntry - deletes this entry + * + * RET: *this + */ + +void zCom4::deleteEntry() { + + VerseKey *key = &getVerseKey(); + doSetText(key->getTestament(), key->getTestamentIndex(), ""); +} + + +/****************************************************************************** + * zCom4::increment - Increments module key a number of entries + * + * ENT: increment - Number of entries to jump forward + * + * RET: *this + */ + +void zCom4::increment(int steps) { + long start; + unsigned long size; + unsigned long buffnum; + VerseKey *tmpkey = &getVerseKey(); + + findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size, &buffnum); + + SWKey lastgood = *tmpkey; + while (steps) { + long laststart = start; + unsigned long lastsize = size; + SWKey lasttry = *tmpkey; + (steps > 0) ? ++(*key) : --(*key); + tmpkey = &getVerseKey(); + + if ((error = key->popError())) { + *key = lastgood; + break; + } + long index = tmpkey->getTestamentIndex(); + findOffset(tmpkey->getTestament(), index, &start, &size, &buffnum); + if ( + (((laststart != start) || (lastsize != size)) // we're a different entry +// && (start > 0) + && (size)) // and we actually have a size + ||(!skipConsecutiveLinks)) { // or we don't want to skip consecutive links + steps += (steps < 0) ? 1 : -1; + lastgood = *tmpkey; + } + } + error = (error) ? KEYERR_OUTOFBOUNDS : 0; +} + +bool zCom4::isLinked(const SWKey *k1, const SWKey *k2) const { + long start1, start2; + unsigned long size1, size2; + unsigned long buffnum1, buffnum2; + VerseKey *vk1 = &getVerseKey(k1); + VerseKey *vk2 = &getVerseKey(k2); + if (vk1->getTestament() != vk2->getTestament()) return false; + + findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1, &buffnum1); + findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2, &buffnum2); + return start1 == start2 && buffnum1 == buffnum2; +} + +bool zCom4::hasEntry(const SWKey *k) const { + long start; + unsigned long size; + unsigned long buffnum; + VerseKey *vk = &getVerseKey(k); + + findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size, &buffnum); + return size; +} + +SWORD_NAMESPACE_END diff --git a/src/modules/common/Makefile.am b/src/modules/common/Makefile.am index 90a3f98..0bca03e 100644 --- a/src/modules/common/Makefile.am +++ b/src/modules/common/Makefile.am @@ -6,18 +6,22 @@ libsword_la_SOURCES += $(commondir)/swcomprs.cpp libsword_la_SOURCES += $(commondir)/lzsscomprs.cpp if HAVE_LIBZ -SWZLIB = $(commondir)/zipcomprs.cpp -SWZLIB += $(commondir)/bz2comprs.cpp -SWZLIB += $(commondir)/xzcomprs.cpp -else -SWZLIB = +libsword_la_SOURCES += $(commondir)/zipcomprs.cpp endif -libsword_la_SOURCES += $(SWZLIB) + +if HAVE_BZIP2 +libsword_la_SOURCES += $(commondir)/bz2comprs.cpp +endif + +if HAVE_XZ +libsword_la_SOURCES += $(commondir)/xzcomprs.cpp +endif + libsword_la_SOURCES += $(commondir)/rawverse.cpp libsword_la_SOURCES += $(commondir)/rawverse4.cpp libsword_la_SOURCES += $(commondir)/swcipher.cpp libsword_la_SOURCES += $(commondir)/zverse.cpp +libsword_la_SOURCES += $(commondir)/zverse4.cpp libsword_la_SOURCES += $(commondir)/zstr.cpp libsword_la_SOURCES += $(commondir)/entriesblk.cpp libsword_la_SOURCES += $(commondir)/sapphire.cpp - diff --git a/src/modules/common/bz2comprs.cpp b/src/modules/common/bz2comprs.cpp index 7863e98..6b9374e 100644 --- a/src/modules/common/bz2comprs.cpp +++ b/src/modules/common/bz2comprs.cpp @@ -3,7 +3,7 @@ * bz2comprs.cpp - Bzip2Compress, a driver class that provides bzip2 * compression (Burrows–Wheeler with Huffman coding) * - * $Id: bz2comprs.cpp 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: bz2comprs.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2000-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -26,7 +26,7 @@ #include <string.h> #include <stdio.h> #include <bz2comprs.h> -#include <zlib.h> +#include <bzlib.h> SWORD_NAMESPACE_START @@ -36,6 +36,7 @@ SWORD_NAMESPACE_START */ Bzip2Compress::Bzip2Compress() : SWCompress() { + level = 9; } @@ -59,20 +60,6 @@ Bzip2Compress::~Bzip2Compress() { void Bzip2Compress::Encode(void) { -/* -ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); - Compresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be at least 0.1% larger than - sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the - compressed buffer. - This function can be used to compress a whole file at once if the - input file is mmap'ed. - compress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer. -*/ direct = 0; // set direction needed by parent [Get|Send]Chars() // get buffer @@ -91,12 +78,12 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, } - zlen = (long) (len*1.001)+15; + zlen = (long) (len*1.01)+600; char *zbuf = new char[zlen+1]; if (len) { //printf("Doing compress\n"); - if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len) != Z_OK) + if (BZ2_bzBuffToBuffCompress(zbuf, (unsigned int*)&zlen, buf, (unsigned int)len, level, 0, 0) != BZ_OK) { printf("ERROR in compression\n"); } @@ -123,23 +110,7 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, void Bzip2Compress::Decode(void) { -/* -ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); - Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be large enough to hold the - entire uncompressed data. (The size of the uncompressed data must have - been saved previously by the compressor and transmitted to the decompressor - by some mechanism outside the scope of this compression library.) - Upon exit, destLen is the actual size of the compressed buffer. - This function can be used to decompress a whole file at once if the - input file is mmap'ed. - - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted. -*/ + direct = 1; // set direction needed by parent [Get|Send]Chars() // get buffer char chunk[1024]; @@ -147,7 +118,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, char *chunkbuf = zbuf; int chunklen; unsigned long zlen = 0; - while((chunklen = GetChars(chunk, 1023))) { + while((chunklen = (int)GetChars(chunk, 1023))) { memcpy(chunkbuf, chunk, chunklen); zlen += chunklen; if (chunklen < 1023) @@ -158,16 +129,16 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, //printf("Decoding complength{%ld} uncomp{%ld}\n", zlen, blen); if (zlen) { - unsigned long blen = zlen*20; // trust compression is less than 1000% + unsigned int blen = (unsigned int)(zlen*20); // trust compression is less than 1000% char *buf = new char[blen]; //printf("Doing decompress {%s}\n", zbuf); slen = 0; - switch (uncompress((Bytef*)buf, &blen, (Bytef*)zbuf, zlen)){ - case Z_OK: SendChars(buf, blen); slen = blen; break; - case Z_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break; - case Z_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break; - case Z_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break; - default: fprintf(stderr, "ERROR: an unknown error occured during decompression.\n"); break; + switch (BZ2_bzBuffToBuffDecompress(buf, &blen, zbuf, (unsigned int)zlen, 0, 0)){ + case BZ_OK: SendChars(buf, blen); slen = blen; break; + case BZ_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break; + case BZ_OUTBUFF_FULL: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break; + case BZ_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break; + default: fprintf(stderr, "ERROR: an unknown error occurred during decompression.\n"); break; } delete [] buf; } diff --git a/src/modules/common/entriesblk.cpp b/src/modules/common/entriesblk.cpp index 4872d28..85b7e0d 100644 --- a/src/modules/common/entriesblk.cpp +++ b/src/modules/common/entriesblk.cpp @@ -2,7 +2,7 @@ * * entriesblk.cpp - EntriesBlock facilitates compressed lex/dict modules * - * $Id: entriesblk.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: entriesblk.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -84,8 +84,8 @@ void EntriesBlock::getMetaEntry(int index, unsigned long *offset, unsigned long void EntriesBlock::setMetaEntry(int index, unsigned long offset, unsigned long size) { - __u32 rawOffset = archtosword32(offset); - __u32 rawSize = archtosword32(size); + __u32 rawOffset = (__u32)archtosword32(offset); + __u32 rawSize = (__u32)archtosword32(size); if (index >= getCount()) // assert index < count return; diff --git a/src/modules/common/rawstr.cpp b/src/modules/common/rawstr.cpp index 12371ab..7f5015f 100644 --- a/src/modules/common/rawstr.cpp +++ b/src/modules/common/rawstr.cpp @@ -5,7 +5,7 @@ * and provides lookup and parsing functions based on * class StrKey * - * $Id: rawstr.cpp 3181 2014-04-17 04:27:57Z greg.hellings $ + * $Id: rawstr.cpp 3524 2017-11-07 03:08:49Z scribe $ * * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -74,8 +74,10 @@ RawStr::RawStr(const char *ipath, int fileMode, bool caseSensitive) : caseSensit buf.setFormatted("%s.dat", path); datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true); - if (datfd < 0) { - SWLog::getSystemLog()->logError("%d", errno); + if (!datfd || datfd->getFd() < 0) { + // couldn't find datafile but this might be fine if we're + // merely instantiating a remote InstallMgr SWMgr + SWLog::getSystemLog()->logDebug("Couldn't open file: %s. errno: %d", buf.c_str(), errno); } instance++; @@ -111,7 +113,7 @@ void RawStr::getIDXBufDat(long ioffset, char **buf) const { int size; char ch; - if (datfd > 0) { + if (datfd && datfd->getFd() >= 0) { datfd->seek(ioffset, SEEK_SET); for (size = 0; datfd->read(&ch, 1) == 1; size++) { if ((ch == '\\') || (ch == 10) || (ch == 13)) @@ -145,7 +147,7 @@ void RawStr::getIDXBuf(long ioffset, char **buf) const { __u32 offset; - if (idxfd > 0) { + if (idxfd && idxfd->getFd() >= 0) { idxfd->seek(ioffset, SEEK_SET); idxfd->read(&offset, 4); @@ -183,9 +185,9 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long headoff = 0; stdstr(&key, ikey, 3); - if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3); + if (!caseSensitive) toupperstr_utf8(key, (unsigned int)(strlen(key)*3)); - int keylen = strlen(key); + int keylen = (int)strlen(key); bool substr = false; trybuf = maxbuf = 0; @@ -243,7 +245,7 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long idxfd->read(&tmpStart, 4); idxfd->read(&tmpSize, 2); if (idxoff) - *idxoff = tryoff; + *idxoff = (__u32)tryoff; *start = swordtoarch32(tmpStart); *size = swordtoarch16(tmpSize); @@ -262,17 +264,17 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long if (bad) { if(!awayFromSubstrCheck) retval = -1; - *start = laststart; + *start = (__u32)laststart; *size = lastsize; tryoff = lasttry; if (idxoff) - *idxoff = tryoff; + *idxoff = (__u32)tryoff; break; } idxfd->read(&tmpStart, 4); idxfd->read(&tmpSize, 2); if (idxoff) - *idxoff = tryoff; + *idxoff = (__u32)tryoff; *start = swordtoarch32(tmpStart); *size = swordtoarch16(tmpSize); @@ -346,7 +348,7 @@ void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) con while (true); // while we're resolving links if (idxbuflocal) { - int localsize = strlen(idxbuflocal); + int localsize = (int)strlen(idxbuflocal); localsize = (localsize < (*isize - 1)) ? localsize : (*isize - 1); strncpy(*idxbuf, idxbuflocal, localsize); (*idxbuf)[localsize] = 0; @@ -381,7 +383,7 @@ void RawStr::doSetText(const char *ikey, const char *buf, long len) char errorStatus = findOffset(ikey, &start, &size, 0, &idxoff); stdstr(&key, ikey, 2); - if (!caseSensitive) toupperstr_utf8(key, strlen(key)*2); + if (!caseSensitive) toupperstr_utf8(key, (unsigned int)(strlen(key)*2)); len = (len < 0) ? strlen(buf) : len; @@ -424,7 +426,7 @@ void RawStr::doSetText(const char *ikey, const char *buf, long len) while (true); // while we're resolving links } - endoff = idxfd->seek(0, SEEK_END); + endoff = (__u32)idxfd->seek(0, SEEK_END); shiftSize = endoff - idxoff; @@ -440,7 +442,7 @@ void RawStr::doSetText(const char *ikey, const char *buf, long len) memcpy(outbuf + size, buf, len); size = outsize = size + (len); - start = outstart = datfd->seek(0, SEEK_END); + start = outstart = (__u32)datfd->seek(0, SEEK_END); outstart = archtosword32(start); outsize = archtosword16(size); diff --git a/src/modules/common/rawstr4.cpp b/src/modules/common/rawstr4.cpp index c88e70d..0b54c00 100644 --- a/src/modules/common/rawstr4.cpp +++ b/src/modules/common/rawstr4.cpp @@ -5,7 +5,7 @@ * and provides lookup and parsing functions based on * class StrKey * - * $Id: rawstr4.cpp 3181 2014-04-17 04:27:57Z greg.hellings $ + * $Id: rawstr4.cpp 3524 2017-11-07 03:08:49Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -74,8 +74,10 @@ RawStr4::RawStr4(const char *ipath, int fileMode, bool caseSensitive) : caseSens buf.setFormatted("%s.dat", path); datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true); - if (datfd < 0) { - SWLog::getSystemLog()->logError("%d", errno); + if (!datfd || datfd->getFd() < 0) { + // couldn't find datafile but this might be fine if we're + // merely instantiating a remote InstallMgr SWMgr + SWLog::getSystemLog()->logDebug("Couldn't open file: %s. errno: %d", buf.c_str(), errno); } instance++; @@ -111,7 +113,7 @@ void RawStr4::getIDXBufDat(long ioffset, char **buf) const { int size; char ch; - if (datfd > 0) { + if ((unsigned long)datfd > 0) { datfd->seek(ioffset, SEEK_SET); for (size = 0; datfd->read(&ch, 1) == 1; size++) { if ((ch == '\\') || (ch == 10) || (ch == 13)) @@ -145,7 +147,7 @@ void RawStr4::getIDXBuf(long ioffset, char **buf) const { __u32 offset; - if (idxfd > 0) { + if ((unsigned long)idxfd > 0) { idxfd->seek(ioffset, SEEK_SET); idxfd->read(&offset, 4); @@ -193,9 +195,9 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon headoff = 0; stdstr(&key, ikey, 3); - if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3); + if (!caseSensitive) toupperstr_utf8(key, (unsigned int)(strlen(key)*3)); - int keylen = strlen(key); + int keylen = (int)strlen(key); bool substr = false; trybuf = maxbuf = 0; @@ -252,7 +254,7 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon idxfd->read(&tmpStart, 4); idxfd->read(&tmpSize, 4); if (idxoff) - *idxoff = tryoff; + *idxoff = (__u32)tryoff; *start = swordtoarch32(tmpStart); *size = swordtoarch32(tmpSize); @@ -271,17 +273,17 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon if (bad) { if(!awayFromSubstrCheck) retval = -1; - *start = laststart; - *size = lastsize; + *start = (__u32)laststart; + *size = (__u32)lastsize; tryoff = lasttry; if (idxoff) - *idxoff = tryoff; + *idxoff = (__u32)tryoff; break; } idxfd->read(&tmpStart, 4); idxfd->read(&tmpSize, 4); if (idxoff) - *idxoff = tryoff; + *idxoff = (__u32)tryoff; *start = swordtoarch32(tmpStart); *size = swordtoarch32(tmpSize); @@ -355,7 +357,7 @@ void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) co while (true); // while we're resolving links if (idxbuflocal) { - unsigned int localsize = strlen(idxbuflocal); + unsigned int localsize = (unsigned int)strlen(idxbuflocal); localsize = (localsize < (*isize - 1)) ? localsize : (*isize - 1); strncpy(*idxbuf, idxbuflocal, localsize); (*idxbuf)[localsize] = 0; @@ -389,7 +391,7 @@ void RawStr4::doSetText(const char *ikey, const char *buf, long len) { char errorStatus = findOffset(ikey, &start, &size, 0, &idxoff); stdstr(&key, ikey, 3); - if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3); + if (!caseSensitive) toupperstr_utf8(key, (unsigned int)(strlen(key)*3)); len = (len < 0) ? strlen(buf) : len; getIDXBufDat(start, &dbKey); @@ -432,7 +434,7 @@ void RawStr4::doSetText(const char *ikey, const char *buf, long len) { while (true); // while we're resolving links } - endoff = idxfd->seek(0, SEEK_END); + endoff = (__u32)idxfd->seek(0, SEEK_END); shiftSize = endoff - idxoff; @@ -446,9 +448,9 @@ void RawStr4::doSetText(const char *ikey, const char *buf, long len) { sprintf(outbuf, "%s%c%c", key, 13, 10); size = strlen(outbuf); memcpy(outbuf + size, buf, len); - size = outsize = size + len; + size = outsize = size + (__u32)len; - start = outstart = datfd->seek(0, SEEK_END); + start = outstart = (__u32)datfd->seek(0, SEEK_END); outstart = archtosword32(start); outsize = archtosword32(size); diff --git a/src/modules/common/rawverse.cpp b/src/modules/common/rawverse.cpp index 34fba10..a4e8008 100644 --- a/src/modules/common/rawverse.cpp +++ b/src/modules/common/rawverse.cpp @@ -5,7 +5,7 @@ * and provides lookup and parsing functions based on * class VerseKey * - * $Id: rawverse.cpp 3181 2014-04-17 04:27:57Z greg.hellings $ + * $Id: rawverse.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -186,7 +186,7 @@ void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len) size = (len < 0) ? strlen(buf) : len; - start = textfp[testmt-1]->seek(0, SEEK_END); + start = (__s32)textfp[testmt-1]->seek(0, SEEK_END); idxfp[testmt-1]->seek(idxoff, SEEK_SET); if (size) { diff --git a/src/modules/common/rawverse4.cpp b/src/modules/common/rawverse4.cpp index 100ef6b..92775b7 100644 --- a/src/modules/common/rawverse4.cpp +++ b/src/modules/common/rawverse4.cpp @@ -6,7 +6,7 @@ * and provides lookup and parsing functions based on * class VerseKey * - * $Id: rawverse4.cpp 3182 2014-04-17 04:28:36Z greg.hellings $ + * $Id: rawverse4.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -185,9 +185,9 @@ void RawVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) if (!testmt) testmt = ((idxfp[1]) ? 1:2); - size = (len < 0) ? strlen(buf) : len; + size = (__u32)((len < 0) ? strlen(buf) : len); - start = textfp[testmt-1]->seek(0, SEEK_END); + start = (__u32)textfp[testmt-1]->seek(0, SEEK_END); idxfp[testmt-1]->seek(idxoff, SEEK_SET); if (size) { diff --git a/src/modules/common/swcomprs.cpp b/src/modules/common/swcomprs.cpp index a9ac72e..ef7e27f 100644 --- a/src/modules/common/swcomprs.cpp +++ b/src/modules/common/swcomprs.cpp @@ -2,7 +2,7 @@ * * swcomprs.cpp - a driver class that provides compression utilities * - * $Id: swcomprs.cpp 3175 2014-04-17 04:21:31Z greg.hellings $ + * $Id: swcomprs.cpp 3121 2014-03-13 09:44:43Z chrislit $ * * Copyright 1996-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -35,6 +35,7 @@ SWORD_NAMESPACE_START SWCompress::SWCompress() { buf = zbuf = 0; + level = 6; Init(); } diff --git a/src/modules/common/xzcomprs.cpp b/src/modules/common/xzcomprs.cpp index 513e170..d29057d 100644 --- a/src/modules/common/xzcomprs.cpp +++ b/src/modules/common/xzcomprs.cpp @@ -3,7 +3,7 @@ * xzcomprs.cpp - XzCompress, a driver class that provides xz (LZMA2) * compression * - * $Id: xzcomprs.cpp 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: xzcomprs.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2000-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -21,12 +21,13 @@ * */ - #include <stdlib.h> #include <string.h> #include <stdio.h> #include <xzcomprs.h> -#include <zlib.h> + +#define LZMA_API_STATIC +#include <lzma.h> SWORD_NAMESPACE_START @@ -36,6 +37,24 @@ SWORD_NAMESPACE_START */ XzCompress::XzCompress() : SWCompress() { + level = 3; + + // start with the estimated memory usage for our preset + memlimit = lzma_easy_decoder_memusage(level | LZMA_PRESET_EXTREME); + + // and round up to a power of 2-- + // bit twiddle hack to determine next greatest power of 2 from: + // http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 + memlimit--; + memlimit |= memlimit >> 1; + memlimit |= memlimit >> 2; + memlimit |= memlimit >> 4; + memlimit |= memlimit >> 8; + memlimit |= memlimit >> 16; + memlimit++; + + // double that for safety's sake + memlimit <<= 1; } @@ -59,20 +78,6 @@ XzCompress::~XzCompress() { void XzCompress::Encode(void) { -/* -ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); - Compresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be at least 0.1% larger than - sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the - compressed buffer. - This function can be used to compress a whole file at once if the - input file is mmap'ed. - compress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer. -*/ direct = 0; // set direction needed by parent [Get|Send]Chars() // get buffer @@ -90,18 +95,22 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, chunkbuf = buf+len; } - - zlen = (long) (len*1.001)+15; + zlen = (long)lzma_stream_buffer_bound(len); char *zbuf = new char[zlen+1]; + size_t zpos = 0; + if (len) { //printf("Doing compress\n"); - if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len) != Z_OK) - { - printf("ERROR in compression\n"); - } - else { - SendChars(zbuf, zlen); + switch (lzma_easy_buffer_encode(level | LZMA_PRESET_EXTREME, LZMA_CHECK_CRC64, NULL, (const uint8_t*)buf, (size_t)len, (uint8_t*)zbuf, &zpos, (size_t)zlen)) { + case LZMA_OK: SendChars(zbuf, zpos); break; + case LZMA_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during compression.\n"); break; + case LZMA_UNSUPPORTED_CHECK: fprintf(stderr, "ERROR: unsupported_check error encountered during decompression.\n"); break; + case LZMA_OPTIONS_ERROR: fprintf(stderr, "ERROR: options error encountered during decompression.\n"); break; + case LZMA_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during compression.\n"); break; + case LZMA_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during compression.\n"); break; + case LZMA_PROG_ERROR: fprintf(stderr, "ERROR: program error encountered during decompression.\n"); break; + default: fprintf(stderr, "ERROR: an unknown error occurred during compression.\n"); break; } } else @@ -123,23 +132,7 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, void XzCompress::Decode(void) { -/* -ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); - Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be large enough to hold the - entire uncompressed data. (The size of the uncompressed data must have - been saved previously by the compressor and transmitted to the decompressor - by some mechanism outside the scope of this compression library.) - Upon exit, destLen is the actual size of the compressed buffer. - This function can be used to decompress a whole file at once if the - input file is mmap'ed. - - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted. -*/ + direct = 1; // set direction needed by parent [Get|Send]Chars() // get buffer char chunk[1024]; @@ -158,16 +151,25 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, //printf("Decoding complength{%ld} uncomp{%ld}\n", zlen, blen); if (zlen) { - unsigned long blen = zlen*20; // trust compression is less than 1000% + unsigned long blen = zlen*20; // trust compression is less than 2000% char *buf = new char[blen]; //printf("Doing decompress {%s}\n", zbuf); slen = 0; - switch (uncompress((Bytef*)buf, &blen, (Bytef*)zbuf, zlen)){ - case Z_OK: SendChars(buf, blen); slen = blen; break; - case Z_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break; - case Z_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break; - case Z_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break; - default: fprintf(stderr, "ERROR: an unknown error occured during decompression.\n"); break; + size_t zpos = 0; + size_t bpos = 0; + + switch (lzma_stream_buffer_decode((uint64_t *)&memlimit, 0, NULL, (const uint8_t*)zbuf, &zpos, (size_t)zlen, (uint8_t*)buf, &bpos, (size_t)&blen)){ + case LZMA_OK: SendChars(buf, bpos); slen = bpos; break; + case LZMA_FORMAT_ERROR: fprintf(stderr, "ERROR: format error encountered during decompression.\n"); break; + case LZMA_OPTIONS_ERROR: fprintf(stderr, "ERROR: options error encountered during decompression.\n"); break; + case LZMA_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break; + case LZMA_NO_CHECK: fprintf(stderr, "ERROR: no_check error encountered during decompression.\n"); break; + case LZMA_UNSUPPORTED_CHECK: fprintf(stderr, "ERROR: unsupported_check error encountered during decompression.\n"); break; + case LZMA_MEMLIMIT_ERROR: fprintf(stderr, "ERROR: memlimit error encountered during decompression.\n"); break; + case LZMA_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break; + case LZMA_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break; + case LZMA_PROG_ERROR: fprintf(stderr, "ERROR: program error encountered during decompression.\n"); break; + default: fprintf(stderr, "ERROR: an unknown error occurred during decompression.\n"); break; } delete [] buf; } @@ -178,4 +180,34 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, free (zbuf); } + +/****************************************************************************** + * XzCompress::SetLevel - This function sets the compression level of the + * compressor. + */ + +void XzCompress::setLevel(int l) { + level = l; + + // having changed the compression level, we need to adjust our memlimit accordingly, + // as in the constructor: + + // start with the estimated memory usage for our preset + memlimit = lzma_easy_decoder_memusage(level | LZMA_PRESET_EXTREME); + + // and round up to a power of 2-- + // bit twiddle hack to determine next greatest power of 2 from: + // http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 + memlimit--; + memlimit |= memlimit >> 1; + memlimit |= memlimit >> 2; + memlimit |= memlimit >> 4; + memlimit |= memlimit >> 8; + memlimit |= memlimit >> 16; + memlimit++; + + // double that for safety's sake + memlimit <<= 1; +}; + SWORD_NAMESPACE_END diff --git a/src/modules/common/zipcomprs.cpp b/src/modules/common/zipcomprs.cpp index 28471d8..557239e 100644 --- a/src/modules/common/zipcomprs.cpp +++ b/src/modules/common/zipcomprs.cpp @@ -3,7 +3,7 @@ * zipcomprs.cpp - ZipCompress, a driver class that provides zlib * compression * - * $Id: zipcomprs.cpp 3175 2014-04-17 04:21:31Z greg.hellings $ + * $Id: zipcomprs.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2000-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -38,6 +38,7 @@ SWORD_NAMESPACE_START ZipCompress::ZipCompress() : SWCompress() { // fprintf(stderr, "init compress\n"); + level = Z_DEFAULT_COMPRESSION; } @@ -62,18 +63,20 @@ ZipCompress::~ZipCompress() { void ZipCompress::Encode(void) { /* -ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); - Compresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be at least 0.1% larger than - sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the +ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen, + int level)); + + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the compressed buffer. - This function can be used to compress a whole file at once if the - input file is mmap'ed. - compress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. */ direct = 0; // set direction needed by parent [Get|Send]Chars() @@ -98,7 +101,7 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, if (len) { //printf("Doing compress\n"); - if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len) != Z_OK) + if (compress2((Bytef*)zbuf, &zlen, (const Bytef*)buf, len, level) != Z_OK) { printf("ERROR in compression\n"); } @@ -142,6 +145,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, enough memory, Z_BUF_ERROR if there was not enough room in the output buffer, or Z_DATA_ERROR if the input data was corrupted. */ + direct = 1; // set direction needed by parent [Get|Send]Chars() // get buffer char chunk[1024]; @@ -149,7 +153,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, char *chunkbuf = zbuf; int chunklen; unsigned long zlen = 0; - while((chunklen = GetChars(chunk, 1023))) { + while((chunklen = (int)GetChars(chunk, 1023))) { memcpy(chunkbuf, chunk, chunklen); zlen += chunklen; if (chunklen < 1023) @@ -169,7 +173,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, case Z_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break; case Z_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break; case Z_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break; - default: fprintf(stderr, "ERROR: an unknown error occured during decompression.\n"); break; + default: fprintf(stderr, "ERROR: an unknown error occurred during decompression.\n"); break; } delete [] buf; } diff --git a/src/modules/common/zstr.cpp b/src/modules/common/zstr.cpp index a745502..0b4f0f6 100644 --- a/src/modules/common/zstr.cpp +++ b/src/modules/common/zstr.cpp @@ -4,7 +4,7 @@ * files and provides lookup and parsing functions based on * class StrKey * - * $Id: zstr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: zstr.cpp 3524 2017-11-07 03:08:49Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -83,8 +83,10 @@ zStr::zStr(const char *ipath, int fileMode, long blockCount, SWCompress *icomp, buf.setFormatted("%s.zdt", path); zdtfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true); - if (datfd <= 0) { - SWLog::getSystemLog()->logError("%d", errno); + if (!zdtfd || zdtfd->getFd() < 0) { + // couldn't find datafile but this might be fine if we're + // merely instantiating a remote InstallMgr SWMgr + SWLog::getSystemLog()->logDebug("Couldn't open file: %s. errno: %d", buf.c_str(), errno); } cacheBlock = 0; @@ -133,7 +135,7 @@ void zStr::getKeyFromDatOffset(long ioffset, char **buf) const { int size; char ch; - if (datfd > 0) { + if (datfd && datfd->getFd() >= 0) { datfd->seek(ioffset, SEEK_SET); for (size = 0; datfd->read(&ch, 1) == 1; size++) { if ((ch == '\\') || (ch == 10) || (ch == 13)) @@ -167,7 +169,7 @@ void zStr::getKeyFromIdxOffset(long ioffset, char **buf) const { __u32 offset; - if (idxfd > 0) { + if (idxfd && idxfd->getFd() >= 0) { idxfd->seek(ioffset, SEEK_SET); idxfd->read(&offset, 4); offset = swordtoarch32(offset); @@ -198,19 +200,19 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const bool awayFromSubstrCheck = false; if (idxfd->getFd() >= 0) { - tailoff = maxoff = idxfd->seek(0, SEEK_END) - IDXENTRYSIZE; + tailoff = maxoff = (__s32)idxfd->seek(0, SEEK_END) - IDXENTRYSIZE; if (*ikey) { headoff = 0; stdstr(&key, ikey, 3); - if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3); + if (!caseSensitive) toupperstr_utf8(key, (unsigned int)(strlen(key)*3)); - int keylen = strlen(key); + int keylen = (int)strlen(key); bool substr = false; getKeyFromIdxOffset(maxoff, &maxbuf); while (headoff < tailoff) { - tryoff = (lastoff == -1) ? headoff + (((((tailoff / IDXENTRYSIZE) - (headoff / IDXENTRYSIZE))) / 2) * IDXENTRYSIZE) : lastoff; + tryoff = ((__s32)lastoff == -1) ? headoff + (((((tailoff / IDXENTRYSIZE) - (headoff / IDXENTRYSIZE))) / 2) * IDXENTRYSIZE) : (__s32)lastoff; lastoff = -1; getKeyFromIdxOffset(tryoff, &trybuf); @@ -295,7 +297,7 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const *idxoff = tryoff; - if (((laststart != start) || (lastsize != size)) && (start >= 0) && (size)) + if (((laststart != start) || (lastsize != size)) && size) away += (away < 0) ? 1 : -1; } @@ -366,7 +368,7 @@ void zStr::getText(long offset, char **idxbuf, char **buf) const { while (true); // while we're resolving links if (idxbuflocal) { - __u32 localsize = strlen(idxbuflocal); + __u32 localsize = (__u32)strlen(idxbuflocal); localsize = (localsize < (size - 1)) ? localsize : (size - 1); strncpy(*idxbuf, idxbuflocal, localsize); (*idxbuf)[localsize] = 0; @@ -416,7 +418,7 @@ void zStr::getCompressedText(long block, long entry, char **buf) const { cacheBlock = new EntriesBlock(rawBuf, len); cacheBlockIndex = block; } - size = cacheBlock->getEntrySize(entry); + size = (__u32)cacheBlock->getEntrySize(entry); *buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1); strcpy(*buf, cacheBlock->getEntry(entry)); } @@ -448,7 +450,7 @@ void zStr::setText(const char *ikey, const char *buf, long len) { len = (len < 0) ? strlen(buf) : len; stdstr(&key, ikey, 3); - if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3); + if (!caseSensitive) toupperstr_utf8(key, (unsigned int)(strlen(key)*3)); char notFound = findKeyIndex(ikey, &idxoff, 0); if (!notFound) { @@ -497,9 +499,9 @@ void zStr::setText(const char *ikey, const char *buf, long len) { } } - endoff = idxfd->seek(0, SEEK_END); + endoff = (__s32)idxfd->seek(0, SEEK_END); - shiftSize = endoff - idxoff; + shiftSize = endoff - (__s32)idxoff; if (shiftSize > 0) { idxBytes = new char [ shiftSize ]; @@ -509,7 +511,7 @@ void zStr::setText(const char *ikey, const char *buf, long len) { outbuf = new char [ len + strlen(key) + 5 ]; sprintf(outbuf, "%s%c%c", key, 13, 10); - size = strlen(outbuf); + size = (__u32)strlen(outbuf); if (len > 0) { // NOT a link if (!cacheBlock) { flushCache(); @@ -523,7 +525,7 @@ void zStr::setText(const char *ikey, const char *buf, long len) { } __u32 entry = cacheBlock->addEntry(buf); cacheDirty = true; - outstart = archtosword32(cacheBlockIndex); + outstart = (__u32)archtosword32(cacheBlockIndex); outsize = archtosword32(entry); memcpy (outbuf + size, &outstart, sizeof(__u32)); memcpy (outbuf + size + sizeof(__u32), &outsize, sizeof(__u32)); @@ -534,7 +536,7 @@ void zStr::setText(const char *ikey, const char *buf, long len) { size += len; } - start = datfd->seek(0, SEEK_END); + start = (__u32)datfd->seek(0, SEEK_END); outstart = archtosword32(start); outsize = archtosword32(size); @@ -609,7 +611,7 @@ void zStr::flushCache() const { unsigned long zdtSize = zdtfd->seek(0, SEEK_END); if ((cacheBlockIndex * ZDXENTRYSIZE) > (zdxSize - ZDXENTRYSIZE)) { // New Block - start = zdtSize; + start = (__u32)zdtSize; } else { zdxfd->seek(cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET); @@ -624,7 +626,7 @@ void zStr::flushCache() const { size = outsize; } else { // middle and bigger-- we have serious problems, for now let's put it at the end = lots of wasted space - start = zdtSize; + start = (__u32)zdtSize; } } diff --git a/src/modules/common/zverse.cpp b/src/modules/common/zverse.cpp index cd63eca..e975a81 100644 --- a/src/modules/common/zverse.cpp +++ b/src/modules/common/zverse.cpp @@ -5,7 +5,7 @@ * and provides lookup and parsing functions based on * class VerseKey for compressed modules * - * $Id: zverse.cpp 3166 2014-04-17 04:08:45Z greg.hellings $ + * $Id: zverse.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -67,7 +67,6 @@ zVerse::zVerse(const char *ipath, int fileMode, int blockType, SWCompress *icomp SWBuf buf; - nl = '\n'; path = 0; cacheBufIdx = -1; cacheTestament = 0; @@ -273,7 +272,7 @@ void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned lo compressor->Buf(0, &len); cacheBuf = (char *)calloc(len + 1, 1); memcpy(cacheBuf, compressor->Buf(), len); - cacheBufSize = strlen(cacheBuf); // TODO: can we just use len? + cacheBufSize = (int)strlen(cacheBuf); // TODO: can we just use len? cacheTestament = testmt; cacheBufIdx = ulBuffNum; } @@ -315,12 +314,12 @@ void zVerse::doSetText(char testmt, long idxoff, const char *buf, long len) { __u32 start; __u16 size; - __u32 outBufIdx = cacheBufIdx; + __u32 outBufIdx = (__u32)cacheBufIdx; idxoff *= 10; size = len; - start = strlen(cacheBuf); + start = (__u32)strlen(cacheBuf); if (!size) start = outBufIdx = 0; @@ -344,9 +343,9 @@ void zVerse::flushCache() const { __u32 size, outsize; __u32 zsize, outzsize; - idxoff = cacheBufIdx * 12; + idxoff = (__u32)cacheBufIdx * 12; if (cacheBuf) { - size = outsize = zsize = outzsize = strlen(cacheBuf); + size = outsize = zsize = outzsize = (__u32)strlen(cacheBuf); if (size) { // if (compressor) { // delete compressor; @@ -355,16 +354,16 @@ void zVerse::flushCache() const { compressor->Buf(cacheBuf); unsigned long tmpSize; compressor->zBuf(&tmpSize); - outzsize = zsize = tmpSize; + outzsize = zsize = (__u32)tmpSize; SWBuf buf; buf.setSize(zsize + 5); memcpy(buf.getRawData(), compressor->zBuf(&tmpSize), tmpSize); - outzsize = zsize = tmpSize; + outzsize = zsize = (__u32)tmpSize; buf.setSize(zsize); rawZFilter(buf, 1); // 1 = encipher - start = outstart = textfp[cacheTestament-1]->seek(0, SEEK_END); + start = outstart = (__u32)textfp[cacheTestament-1]->seek(0, SEEK_END); outstart = archtosword32(start); outsize = archtosword32(size); diff --git a/src/modules/common/zverse4.cpp b/src/modules/common/zverse4.cpp new file mode 100644 index 0000000..ff10b2d --- /dev/null +++ b/src/modules/common/zverse4.cpp @@ -0,0 +1,516 @@ +/****************************************************************************** + * + * zverse4.cpp - code for class 'zVerse4'- a module that reads raw text + * files: ot and nt using indexs ??.bks ??.cps ??.vss + * and provides lookup and parsing functions based on + * class VerseKey for compressed modules + * + * $Id: zverse4.cpp 3439 2016-10-23 08:32:02Z scribe $ + * + * Copyright 1996-2014 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 <ctype.h> +#include <stdio.h> +#include <fcntl.h> +#include <errno.h> +#include <stdlib.h> + +#include <utilstr.h> +#include <versekey.h> +#include <zverse4.h> +#include <sysdata.h> +#include <swbuf.h> +#include <filemgr.h> +#include <swcomprs.h> + + +SWORD_NAMESPACE_START + +/****************************************************************************** + * zVerse4 Statics + */ + +int zVerse4::instance = 0; + +const char zVerse4::uniqueIndexID[] = {'X', 'r', 'v', 'c', 'b'}; + +/****************************************************************************** + * zVerse4 Constructor - Initializes data for instance of zVerse4 + * + * ENT: ipath - path of the directory where data and index files are located. + * be sure to include the trailing separator (e.g. '/' or '\') + * (e.g. 'modules/texts/rawtext/webster/') + * fileMode - open mode for the files (FileMgr::RDONLY, etc.) + * blockType - verse, chapter, book, etc. + */ + +zVerse4::zVerse4(const char *ipath, int fileMode, int blockType, SWCompress *icomp) +{ + // this line, instead of just defaulting, to keep FileMgr out of header + if (fileMode == -1) fileMode = FileMgr::RDONLY; + + SWBuf buf; + + path = 0; + cacheBufIdx = -1; + cacheTestament = 0; + cacheBuf = 0; + dirtyCache = false; + stdstr(&path, ipath); + + if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\')) + path[strlen(path)-1] = 0; + + compressor = (icomp) ? icomp : new SWCompress(); + + if (fileMode == -1) { // try read/write if possible + fileMode = FileMgr::RDWR; + } + + buf.setFormatted("%s/ot.%czs", path, uniqueIndexID[blockType]); + idxfp[0] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true); + + buf.setFormatted("%s/nt.%czs", path, uniqueIndexID[blockType]); + idxfp[1] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true); + + buf.setFormatted("%s/ot.%czz", path, uniqueIndexID[blockType]); + textfp[0] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true); + + buf.setFormatted("%s/nt.%czz", path, uniqueIndexID[blockType]); + textfp[1] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true); + + buf.setFormatted("%s/ot.%czv", path, uniqueIndexID[blockType]); + compfp[0] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true); + + buf.setFormatted("%s/nt.%czv", path, uniqueIndexID[blockType]); + compfp[1] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true); + + instance++; +} + + +/****************************************************************************** + * zVerse4 Destructor - Cleans up instance of zVerse4 + */ + +zVerse4::~zVerse4() +{ + int loop1; + + if (cacheBuf) { + flushCache(); + free(cacheBuf); + } + + if (path) + delete [] path; + + if (compressor) + delete compressor; + + --instance; + + for (loop1 = 0; loop1 < 2; loop1++) { + FileMgr::getSystemFileMgr()->close(idxfp[loop1]); + FileMgr::getSystemFileMgr()->close(textfp[loop1]); + FileMgr::getSystemFileMgr()->close(compfp[loop1]); + } +} + + +/****************************************************************************** + * zVerse4::findoffset - Finds the offset of the key verse from the indexes + * + * + * + * ENT: testmt - testament to find (0 - Bible/module introduction) + * book - book to find (0 - testament introduction) + * chapter - chapter to find (0 - book introduction) + * verse - verse to find (0 - chapter introduction) + * start - address to store the starting offset + * size - address to store the size of the entry + */ + +void zVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long *size, unsigned long *buffnum) const +{ + __u32 ulBuffNum = 0; // buffer number + __u32 ulVerseStart = 0; // verse offset within buffer + __u32 usVerseSize = 0; // verse size + // set start to offset in + // set size to + // set + *start = *size = *buffnum = 0; + //fprintf(stderr, "Finding offset %ld\n", idxoff); + idxoff *= 12; // TODO: Is this the correct size? (throughout) + if (!testmt) { + testmt = ((idxfp[0]) ? 1:2); + } + + // assert we have and valid file descriptor + if (compfp[testmt-1]->getFd() < 1) + return; + + long newOffset = compfp[testmt-1]->seek(idxoff, SEEK_SET); + if (newOffset == idxoff) { + if (compfp[testmt-1]->read(&ulBuffNum, 4) != 4) { + fprintf(stderr, "Error reading ulBuffNum\n"); + return; + } + } + else return; + + if (compfp[testmt-1]->read(&ulVerseStart, 4) < 4) + { + fprintf(stderr, "Error reading ulVerseStart\n"); + return; + } + if (compfp[testmt-1]->read(&usVerseSize, 4) < 4) + { + fprintf(stderr, "Error reading usVerseSize\n"); + return; + } + + *buffnum = swordtoarch32(ulBuffNum); + *start = swordtoarch32(ulVerseStart); + *size = swordtoarch32(usVerseSize); + +} + + +/****************************************************************************** + * zVerse4::zreadtext - gets text at a given offset + * + * ENT: testmt - testament file to search in (0 - Old; 1 - New) + * start - starting offset where the text is located in the file + * size - size of text entry + 1 (null) + * buf - buffer to store text + * + */ + +void zVerse4::zReadText(char testmt, long start, unsigned long size, unsigned long ulBuffNum, SWBuf &inBuf) const { + __u32 ulCompOffset = 0; // compressed buffer start + __u32 ulCompSize = 0; // buffer size compressed + __u32 ulUnCompSize = 0; // buffer size uncompressed + + if (!testmt) { + testmt = ((idxfp[0]) ? 1:2); + } + + // assert we have and valid file descriptor + if (compfp[testmt-1]->getFd() < 1) + return; + + if (size && + !(((long) ulBuffNum == cacheBufIdx) && (testmt == cacheTestament) && (cacheBuf))) { + //fprintf(stderr, "Got buffer number{%ld} versestart{%ld} versesize{%d}\n", ulBuffNum, ulVerseStart, usVerseSize); + + if (idxfp[testmt-1]->seek(ulBuffNum*12, SEEK_SET)!=(long) ulBuffNum*12) + { + fprintf(stderr, "Error seeking compressed file index\n"); + return; + } + if (idxfp[testmt-1]->read(&ulCompOffset, 4)<4) + { + fprintf(stderr, "Error reading ulCompOffset\n"); + return; + } + if (idxfp[testmt-1]->read(&ulCompSize, 4)<4) + { + fprintf(stderr, "Error reading ulCompSize\n"); + return; + } + if (idxfp[testmt-1]->read(&ulUnCompSize, 4)<4) + { + fprintf(stderr, "Error reading ulUnCompSize\n"); + return; + } + + ulCompOffset = swordtoarch32(ulCompOffset); + ulCompSize = swordtoarch32(ulCompSize); + ulUnCompSize = swordtoarch32(ulUnCompSize); + + if (textfp[testmt-1]->seek(ulCompOffset, SEEK_SET)!=(long)ulCompOffset) + { + fprintf(stderr, "Error: could not seek to right place in compressed text\n"); + return; + } + SWBuf pcCompText; + pcCompText.setSize(ulCompSize+5); + + if (textfp[testmt-1]->read(pcCompText.getRawData(), ulCompSize)<(long)ulCompSize) { + fprintf(stderr, "Error reading compressed text\n"); + return; + } + pcCompText.setSize(ulCompSize); + rawZFilter(pcCompText, 0); // 0 = decipher + + unsigned long bufSize = ulCompSize; + compressor->zBuf(&bufSize, pcCompText.getRawData()); + + if (cacheBuf) { + flushCache(); + free(cacheBuf); + } + + unsigned long len = 0; + compressor->Buf(0, &len); + cacheBuf = (char *)calloc(len + 1, 1); + memcpy(cacheBuf, compressor->Buf(), len); + cacheBufSize = (int)strlen(cacheBuf); // TODO: can we just use len? + cacheTestament = testmt; + cacheBufIdx = ulBuffNum; + } + + inBuf = ""; + if ((size > 0) && cacheBuf && ((unsigned)start < cacheBufSize)) { + inBuf.setFillByte(0); + inBuf.setSize(size+1); + strncpy(inBuf.getRawData(), &(cacheBuf[start]), size); + inBuf.setSize(strlen(inBuf.c_str())); + } +} + + +/****************************************************************************** + * zVerse4::settext - Sets text for current offset + * + * ENT: testmt - testament to find (0 - Bible/module introduction) + * idxoff - offset into .vss + * buf - buffer to store + * len - length of buffer (0 - null terminated) + */ + +void zVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) { + + len = (len < 0) ? strlen(buf) : len; + if (!testmt) + testmt = ((idxfp[0]) ? 1:2); + if ((!dirtyCache) || (cacheBufIdx < 0)) { + cacheBufIdx = idxfp[testmt-1]->seek(0, SEEK_END) / 12; + cacheTestament = testmt; + if (cacheBuf) + free(cacheBuf); + cacheBuf = (char *)calloc(len + 1, 1); + } + else cacheBuf = (char *)((cacheBuf)?realloc(cacheBuf, strlen(cacheBuf)+(len + 1)):calloc((len + 1), 1)); + + dirtyCache = true; + + __u32 start; + __u32 size; + __u32 outBufIdx = (__u32)cacheBufIdx; + + idxoff *= 12; + size = (__u32)len; + + start = (__u32)strlen(cacheBuf); + + if (!size) + start = outBufIdx = 0; + + outBufIdx = archtosword32(outBufIdx); + start = archtosword32(start); + size = archtosword32(size); + + compfp[testmt-1]->seek(idxoff, SEEK_SET); + compfp[testmt-1]->write(&outBufIdx, 4); + compfp[testmt-1]->write(&start, 4); + compfp[testmt-1]->write(&size, 4); + strcat(cacheBuf, buf); +} + + +void zVerse4::flushCache() const { + if (dirtyCache) { + __u32 idxoff; + __u32 start, outstart; + __u32 size, outsize; + __u32 zsize, outzsize; + + idxoff = (__u32)cacheBufIdx * 12; + if (cacheBuf) { + size = outsize = zsize = outzsize = (__u32)strlen(cacheBuf); + if (size) { + compressor->Buf(cacheBuf); + unsigned long tmpSize; + compressor->zBuf(&tmpSize); + outzsize = zsize = (__u32)tmpSize; + + SWBuf buf; + buf.setSize(zsize + 5); + memcpy(buf.getRawData(), compressor->zBuf(&tmpSize), tmpSize); + outzsize = zsize = (__u32)tmpSize; + buf.setSize(zsize); + rawZFilter(buf, 1); // 1 = encipher + + start = outstart = (__u32)textfp[cacheTestament-1]->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword32(size); + outzsize = archtosword32(zsize); + + textfp[cacheTestament-1]->write(buf, zsize); + + idxfp[cacheTestament-1]->seek(idxoff, SEEK_SET); + idxfp[cacheTestament-1]->write(&outstart, 4); + idxfp[cacheTestament-1]->write(&outzsize, 4); + idxfp[cacheTestament-1]->write(&outsize, 4); + } + free(cacheBuf); + cacheBuf = 0; + } + dirtyCache = false; + } +} + +/****************************************************************************** + * RawVerse::linkentry - links one entry to another + * + * ENT: testmt - testament to find (0 - Bible/module introduction) + * destidxoff - dest offset into .vss + * srcidxoff - source offset into .vss + */ + +void zVerse4::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { + __s32 bufidx; + __s32 start; + __u32 size; + + destidxoff *= 12; + srcidxoff *= 12; + + if (!testmt) + testmt = ((idxfp[1]) ? 1:2); + + // get source + compfp[testmt-1]->seek(srcidxoff, SEEK_SET); + compfp[testmt-1]->read(&bufidx, 4); + compfp[testmt-1]->read(&start, 4); + compfp[testmt-1]->read(&size, 4); + + // write dest + compfp[testmt-1]->seek(destidxoff, SEEK_SET); + compfp[testmt-1]->write(&bufidx, 4); + compfp[testmt-1]->write(&start, 4); + compfp[testmt-1]->write(&size, 4); +} + + +/****************************************************************************** + * RawVerse::CreateModule - Creates new module files + * + * ENT: path - directory to store module files + * RET: error status + */ + +char zVerse4::createModule(const char *ipath, int blockBound, const char *v11n) +{ + char *path = 0; + char *buf = new char [ strlen (ipath) + 20 ]; + char retVal = 0; + FileDesc *fd, *fd2; + __s32 offset = 0; + __s32 size = 0; + VerseKey vk; + + stdstr(&path, ipath); + + if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\')) + path[strlen(path)-1] = 0; + + sprintf(buf, "%s/ot.%czs", path, uniqueIndexID[blockBound]); + FileMgr::removeFile(buf); + fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE); + if (fd->getFd() < 1) goto erroropen1; + FileMgr::getSystemFileMgr()->close(fd); + + sprintf(buf, "%s/nt.%czs", path, uniqueIndexID[blockBound]); + FileMgr::removeFile(buf); + fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE); + if (fd->getFd() < 1) goto erroropen1; + FileMgr::getSystemFileMgr()->close(fd); + + sprintf(buf, "%s/ot.%czz", path, uniqueIndexID[blockBound]); + FileMgr::removeFile(buf); + fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE); + if (fd->getFd() < 1) goto erroropen1; + FileMgr::getSystemFileMgr()->close(fd); + + sprintf(buf, "%s/nt.%czz", path, uniqueIndexID[blockBound]); + FileMgr::removeFile(buf); + fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE); + if (fd->getFd() < 1) goto erroropen1; + FileMgr::getSystemFileMgr()->close(fd); + + sprintf(buf, "%s/ot.%czv", path, uniqueIndexID[blockBound]); + FileMgr::removeFile(buf); + fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE); + if (fd->getFd() < 1) goto erroropen1; + + sprintf(buf, "%s/nt.%czv", path, uniqueIndexID[blockBound]); + FileMgr::removeFile(buf); + fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE); + if (fd2->getFd() < 1) goto erroropen2; + + vk.setVersificationSystem(v11n); + vk.setIntros(true); + + offset = archtosword32(offset); + size = archtosword32(size); + + for (vk = TOP; !vk.popError(); vk++) { + if (vk.getTestament() < 2) { + if (fd->write(&offset, 4) != 4) goto writefailure; //compBufIdxOffset + if (fd->write(&offset, 4) != 4) goto writefailure; + if (fd->write(&size, 4) != 4) goto writefailure; + } + else { + if (fd2->write(&offset, 4) != 4) goto writefailure; //compBufIdxOffset + if (fd2->write(&offset, 4) != 4) goto writefailure; + if (fd2->write(&size, 4) != 4) goto writefailure; + } + } + fd2->write(&offset, 4); //compBufIdxOffset + fd2->write(&offset, 4); + fd2->write(&size, 4); + + goto cleanup; + +erroropen1: + retVal = -1; + goto cleanup1; + +erroropen2: + retVal = -1; + goto cleanup; + +writefailure: + retVal = -2; + +cleanup: + FileMgr::getSystemFileMgr()->close(fd2); +cleanup1: + FileMgr::getSystemFileMgr()->close(fd); + + delete [] path; + delete [] buf; + + return retVal; +} + + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/Makefile.am b/src/modules/filters/Makefile.am index a3d1154..3e8556b 100644 --- a/src/modules/filters/Makefile.am +++ b/src/modules/filters/Makefile.am @@ -15,6 +15,7 @@ GBFFIL += $(filtersdir)/gbfheadings.cpp GBFFIL += $(filtersdir)/gbfredletterwords.cpp GBFFIL += $(filtersdir)/gbfmorph.cpp GBFFIL += $(filtersdir)/gbfwordjs.cpp +GBFFIL += $(filtersdir)/gbflatex.cpp THMLFIL = $(filtersdir)/thmlstrongs.cpp THMLFIL += $(filtersdir)/thmlfootnotes.cpp @@ -30,11 +31,13 @@ THMLFIL += $(filtersdir)/thmlhtmlhref.cpp THMLFIL += $(filtersdir)/thmlxhtml.cpp THMLFIL += $(filtersdir)/thmlwebif.cpp THMLFIL += $(filtersdir)/thmlwordjs.cpp +THMLFIL += $(filtersdir)/thmllatex.cpp TEIFIL = $(filtersdir)/teiplain.cpp TEIFIL += $(filtersdir)/teirtf.cpp TEIFIL += $(filtersdir)/teihtmlhref.cpp TEIFIL += $(filtersdir)/teixhtml.cpp +TEIFIL += $(filtersdir)/teilatex.cpp CONVFIL = $(filtersdir)/gbfthml.cpp CONVFIL += $(filtersdir)/gbfosis.cpp @@ -61,6 +64,7 @@ OSISFIL += $(filtersdir)/osisglosses.cpp OSISFIL += $(filtersdir)/osisenum.cpp OSISFIL += $(filtersdir)/osisxlit.cpp OSISFIL += $(filtersdir)/osisreferencelinks.cpp +OSISFIL += $(filtersdir)/osislatex.cpp libsword_la_SOURCES += $(filtersdir)/latin1utf8.cpp libsword_la_SOURCES += $(filtersdir)/latin1utf16.cpp @@ -70,6 +74,7 @@ libsword_la_SOURCES += $(filtersdir)/utf8html.cpp libsword_la_SOURCES += $(filtersdir)/utf8latin1.cpp libsword_la_SOURCES += $(filtersdir)/unicodertf.cpp libsword_la_SOURCES += $(filtersdir)/scsuutf8.cpp +libsword_la_SOURCES += $(filtersdir)/utf8scsu.cpp libsword_la_SOURCES += $(filtersdir)/utf8cantillation.cpp libsword_la_SOURCES += $(filtersdir)/utf8hebrewpoints.cpp diff --git a/src/modules/filters/gbfheadings.cpp b/src/modules/filters/gbfheadings.cpp index 7e19ea1..a679924 100644 --- a/src/modules/filters/gbfheadings.cpp +++ b/src/modules/filters/gbfheadings.cpp @@ -3,7 +3,7 @@ * gbfheadings.cpp - SWFilter descendant to hide or show headings * in a GBF module * - * $Id: gbfheadings.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: gbfheadings.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -93,11 +93,13 @@ char GBFHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *mod continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + // TODO: why is this + 2 ? token[tokpos+2] = 0; + } } - else { + else { if (!hide) { text += *from; } diff --git a/src/modules/filters/gbfhtmlhref.cpp b/src/modules/filters/gbfhtmlhref.cpp index 6df038e..723137f 100644 --- a/src/modules/filters/gbfhtmlhref.cpp +++ b/src/modules/filters/gbfhtmlhref.cpp @@ -2,7 +2,7 @@ * * gbfhtmlhref.cpp - GBF to HTML filter with hrefs * - * $Id: gbfhtmlhref.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: gbfhtmlhref.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -232,19 +232,13 @@ bool GBFHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData SWBuf type = tag.getAttribute("type"); SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); SWBuf noteName = tag.getAttribute("n"); - VerseKey *vkey = NULL; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } - if (vkey) { + if (u->vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. //char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=n&value=%s&module=%s&passage=%s\"><small><sup class=\"n\">*n%s</sup></small></a> ", URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey->getText()).c_str(), + URL::encode(u->vkey->getText()).c_str(), (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str(): "")); } u->suspendTextPassThru = true; diff --git a/src/modules/filters/gbflatex.cpp b/src/modules/filters/gbflatex.cpp new file mode 100644 index 0000000..d3c726a --- /dev/null +++ b/src/modules/filters/gbflatex.cpp @@ -0,0 +1,198 @@ +/****************************************************************************** + * + * gbflatex.cpp - GBF to LaTeX + * + * $Id: gbflatex.cpp 3548 2017-12-10 05:11:38Z scribe $ + * + * Copyright 2011-2014 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 <stdlib.h> +#include <gbflatex.h> +#include <swmodule.h> +#include <utilxml.h> +#include <versekey.h> +#include <ctype.h> +#include <url.h> + +SWORD_NAMESPACE_START + +const char *GBFLaTeX::getHeader() const { + return "\\usepackage{color}"; +} + +GBFLaTeX::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + if (module) { + version = module->getName(); + } +} + +GBFLaTeX::GBFLaTeX() { + setTokenStart("<"); + setTokenEnd(">"); + + setTokenCaseSensitive(true); + + //addTokenSubstitute("Rf", ")</small></font>"); + addTokenSubstitute("FA", "{\\color{maroon}"); // for ASV footnotes to mark text + addTokenSubstitute("Rx", "}"); + addTokenSubstitute("FI", "\\emph{"); // italics begin + addTokenSubstitute("Fi", "}"); + addTokenSubstitute("FB", "\\bold{"); // bold begin + addTokenSubstitute("Fb", "}"); + addTokenSubstitute("FR", "{\\swordwoj{"); // words of Jesus begin + addTokenSubstitute("Fr", "}"); + addTokenSubstitute("FU", "\\underline{"); // underline begin + addTokenSubstitute("Fu", "}"); + addTokenSubstitute("FO", "\\begin{quote}"); // Old Testament quote begin + addTokenSubstitute("Fo", "\\end{quote}"); + addTokenSubstitute("FS", "\\textsuperscript{"); // Superscript begin// Subscript begin + addTokenSubstitute("Fs", "}"); + addTokenSubstitute("FV", "\\textsubscript{"); // Subscript begin + addTokenSubstitute("Fv", "}"); + addTokenSubstitute("TT", "\\section*{"); // Book title begin + addTokenSubstitute("Tt", "}"); + addTokenSubstitute("PP", "\\begin{swordpoetry}"); // poetry begin + addTokenSubstitute("Pp", "\\end{swordpoetry}"); + addTokenSubstitute("Fn", ""); // font end + addTokenSubstitute("CL", "\\\\"); // new line + addTokenSubstitute("CM", "\\\\"); // paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired + addTokenSubstitute("CG", ""); // ??? + addTokenSubstitute("CT", ""); // ??? + addTokenSubstitute("JR", "{\\raggedright{}"); // right align begin + addTokenSubstitute("JC", "{\\raggedcenter{}"); // center align begin + addTokenSubstitute("JL", "}"); // align end + + renderNoteNumbers = false; +} + + +bool GBFLaTeX::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { + const char *tok; + MyUserData *u = (MyUserData *)userData; + + if (!substituteToken(buf, token)) { + XMLTag tag(token); + + if (!strncmp(token, "WG", 2)) { // strong's numbers + //buf += " <small><em><<a href=\"type=Strongs value="; + buf += " \\swordstrong[Greek]{"; + for (tok = token+2; *tok; tok++) + //if(token[i] != '\"') + buf += *tok; + buf += ", "; + for (tok = token + 2; *tok; tok++) + //if(token[i] != '\"') + buf += *tok; + buf += "}"; + } + else if (!strncmp(token, "WH", 2)) { // strong's numbers + buf += " \\swordstrong[Hebrew]{"; + for (tok = token+2; *tok; tok++) + //if(token[i] != '\"') + buf += *tok; + buf += ", "; + for (tok = token + 2; *tok; tok++) + //if(token[i] != '\"') + buf += *tok; + buf += "}"; + } + else if (!strncmp(token, "WTG", 3)) { // strong's numbers tense + buf += " \\swordstrong[Greektense]{"; + for (tok = token + 3; *tok; tok++) + if(*tok != '\"') + buf += *tok; + buf += ", "; + for (tok = token + 3; *tok; tok++) + if(*tok != '\"') + buf += *tok; + buf += "}"; + } + else if (!strncmp(token, "WTH", 3)) { // strong's numbers tense + buf += " \\swordstrong[Hebrewtense]{"; + for (tok = token + 3; *tok; tok++) + if(*tok != '\"') + buf += *tok; + buf += ","; + for (tok = token + 3; *tok; tok++) + if(*tok != '\"') + buf += *tok; + buf += "}"; + } + + else if (!strncmp(token, "WT", 2) && strncmp(token, "WTH", 3) && strncmp(token, "WTG", 3)) { // morph tags + buf += " \\swordmorph{"; + + for (tok = token + 2; *tok; tok++) + if(*tok != '\"') + buf += *tok; + buf += ", >"; + for (tok = token + 2; *tok; tok++) + if(*tok != '\"') + buf += *tok; + buf += "}"; + } + + else if (!strcmp(tag.getName(), "RX")) { + buf += "\\swordxref{"; + for (tok = token + 3; *tok; tok++) { + if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') { + buf += *tok; + } + else { + break; + } + } + buf += "}"; + } + else if (!strcmp(tag.getName(), "RF")) { + SWBuf type = tag.getAttribute("type"); + SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); + if (u->vkey) { + + buf.appendFormatted("\\swordfootnote{%s}{%s}{%s}{", + footnoteNumber.c_str(), + u->version.c_str(), + u->vkey->getText()).c_str(); + } + u->suspendTextPassThru = false; + } + else if (!strcmp(tag.getName(), "Rf")) { + u->suspendTextPassThru = false; + buf += "}"; + } + else if (!strncmp(token, "FN", 2)) { + buf += "\\swordfont{"; + for (tok = token + 2; *tok; tok++) + if(*tok != '\"') + buf += *tok; + buf += "}"; + } + + else if (!strncmp(token, "CA", 2)) { // ASCII value + buf += (char)atoi(&token[2]); + } + + else { + return false; + } + } + return true; +} + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfmorph.cpp b/src/modules/filters/gbfmorph.cpp index 3399ae8..cf1405b 100644 --- a/src/modules/filters/gbfmorph.cpp +++ b/src/modules/filters/gbfmorph.cpp @@ -3,7 +3,7 @@ * gbfmorph.cpp - SWFilter descendant to hide or show morph tags * in a GBF module * - * $Id: gbfmorph.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: gbfmorph.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -84,11 +84,13 @@ char GBFMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + // TODO: why is this + 2 ? token[tokpos+2] = 0; + } } - else { + else { text += *from; lastspace = (*from == ' '); } diff --git a/src/modules/filters/gbfplain.cpp b/src/modules/filters/gbfplain.cpp index b2a1ae4..45588af 100644 --- a/src/modules/filters/gbfplain.cpp +++ b/src/modules/filters/gbfplain.cpp @@ -3,7 +3,7 @@ * gbfplain.cpp - SWFilter descendant to strip out all GBF tags or * convert to ASCII rendered symbols * - * $Id: gbfplain.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: gbfplain.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -103,9 +103,11 @@ char GBFPlain::processText (SWBuf &text, const SWKey *key, const SWModule *modul continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + // TODO: why is this + 2 ? token[tokpos+2] = 0; + } } else text.append(*from); } diff --git a/src/modules/filters/gbfredletterwords.cpp b/src/modules/filters/gbfredletterwords.cpp index cac3cd9..f3e74f3 100644 --- a/src/modules/filters/gbfredletterwords.cpp +++ b/src/modules/filters/gbfredletterwords.cpp @@ -3,7 +3,7 @@ * gbfredletterwords.cpp - SWFilter descendant to toggle red coloring of * words of Christ in a GBF module * - * $Id: gbfredletterwords.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: gbfredletterwords.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -101,9 +101,12 @@ char GBFRedLetterWords::processText(SWBuf &text, const SWKey *key, const SWModul continue; } if (intoken) { - if (tokpos < 4090) + if (tokpos < 4090) { token[tokpos++] = *from; + // TODO: why is this + 2 ? The below comment still doesn't help me understand. The switch statment + // is commented out in this filter token[tokpos+2] = 0; // +2 cuz we init token with 2 extra '0' because of switch statement + } } else { text += *from; diff --git a/src/modules/filters/gbfrtf.cpp b/src/modules/filters/gbfrtf.cpp index 8a8e1b1..c327c82 100644 --- a/src/modules/filters/gbfrtf.cpp +++ b/src/modules/filters/gbfrtf.cpp @@ -2,7 +2,7 @@ * * gbfrtf.cpp - SWFilter descendant to convert all GBF tags to RTF tags * - * $Id: gbfrtf.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: gbfrtf.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -307,9 +307,11 @@ char GBFRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module) continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + // TODO: why is this + 2 ? token[tokpos+2] = 0; + } } else { if (!hideText) { diff --git a/src/modules/filters/gbfstrongs.cpp b/src/modules/filters/gbfstrongs.cpp index dd4e167..65473de 100644 --- a/src/modules/filters/gbfstrongs.cpp +++ b/src/modules/filters/gbfstrongs.cpp @@ -3,7 +3,7 @@ * gbfstrongs.cpp - SWFilter descendant to hide or show Strong's number * in a GBF module * - * $Id: gbfstrongs.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: gbfstrongs.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -58,7 +58,7 @@ char GBFStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *modu bool lastspace = false; int word = 1; char val[128]; - char wordstr[5]; + char wordstr[11]; char *valto; unsigned int textStart = 0, textEnd = 0; bool newText = false; @@ -75,7 +75,7 @@ char GBFStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *modu token[0] = 0; token[1] = 0; token[2] = 0; - textEnd = text.size(); + textEnd = (unsigned int)text.size(); continue; } if (*from == '>') { // process tokens @@ -110,7 +110,7 @@ char GBFStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *modu if (lastspace) text--; } - if (newText) {textStart = text.size(); newText = false; } + if (newText) {textStart = (unsigned int)text.size(); newText = false; } continue; } } @@ -130,15 +130,17 @@ char GBFStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *modu text += '<'; text += token; text += '>'; - if (newText) {textStart = text.size(); newText = false; } + if (newText) {textStart = (unsigned int)text.size(); newText = false; } continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + // TODO: why is this + 2 ? token[tokpos+2] = 0; + } } - else { + else { text += *from; lastspace = (*from == ' '); } diff --git a/src/modules/filters/gbfthml.cpp b/src/modules/filters/gbfthml.cpp index 303b240..d3dd611 100644 --- a/src/modules/filters/gbfthml.cpp +++ b/src/modules/filters/gbfthml.cpp @@ -2,7 +2,7 @@ * * gbfthml.cpp - GBF to ThML filter * - * $Id: gbfthml.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: gbfthml.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -52,8 +52,7 @@ char GBFThML::processText(SWBuf &text, const SWKey *key, const SWModule *module) token[2] = 0; continue; } - if (*from == '>') - { + if (*from == '>') { intoken = false; // process desired tokens switch (*token) { @@ -210,9 +209,15 @@ char GBFThML::processText(SWBuf &text, const SWKey *key, const SWModule *module) continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + //TODO: why is this + 2? Are we trying to keep 2 or 3 nulls after the last valid char? + // tokpos has been incremented past the last valid token. it should be pointing to null + // +1 should give us 2 nulls, but we're +2 here, which actually keeps 3 nulls after the + // last valid char. Why are we doing any of this? These were written before SWBuf and should + // probably be switched to SWBuf, but perf tests before and after the switch should be run token[tokpos+2] = 0; + } } else text += *from; } diff --git a/src/modules/filters/gbfwordjs.cpp b/src/modules/filters/gbfwordjs.cpp index c9d1bd3..b0f352e 100644 --- a/src/modules/filters/gbfwordjs.cpp +++ b/src/modules/filters/gbfwordjs.cpp @@ -2,7 +2,7 @@ * * gbfwordjs.cpp - SWFilter descendant for ??? * - * $Id: gbfwordjs.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: gbfwordjs.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -88,7 +88,7 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul token[0] = 0; token[1] = 0; token[2] = 0; - textEnd = text.length(); + textEnd = (unsigned int)text.length(); continue; } if (*from == '>') { // process tokens @@ -137,7 +137,7 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul text += token; text += '>'; if (needWordOut) { - char wstr[10]; + char wstr[11]; sprintf(wstr, "%03d", word-2); AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]); needWordOut = false; @@ -212,27 +212,29 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul else m = morph.c_str(); spanStart.appendFormatted("<span class=\"clk\" onclick=\"p('%s','%s','%s','%s','','%s');\" >", lexName.c_str(), strong.c_str(), wordID.c_str(), m, modName.c_str()); text.insert(textStr, spanStart); - lastAppendLen = spanStart.length(); + lastAppendLen = (unsigned int)spanStart.length(); } } } if (newText) { - textStart = text.length(); newText = false; + textStart = (unsigned int)text.length(); newText = false; } continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + // TODO: why is this + 2 ? token[tokpos+2] = 0; + } } - else { + else { text += *from; } } - char wstr[10]; + char wstr[11]; sprintf(wstr, "%03d", word-1); AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]); needWordOut = false; diff --git a/src/modules/filters/gbfxhtml.cpp b/src/modules/filters/gbfxhtml.cpp index 56d7663..b62fe3a 100644 --- a/src/modules/filters/gbfxhtml.cpp +++ b/src/modules/filters/gbfxhtml.cpp @@ -2,7 +2,7 @@ * * gbfxhtml.cpp - GBF to classed XHTML * - * $Id: gbfxhtml.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: gbfxhtml.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -171,19 +171,13 @@ bool GBFXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *u SWBuf type = tag.getAttribute("type"); SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); SWBuf noteName = tag.getAttribute("n"); - VerseKey *vkey = NULL; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } - if (vkey) { + if (u->vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. //char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=n&value=%s&module=%s&passage=%s\"><small><sup class=\"n\">*n%s</sup></small></a> ", URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey->getText()).c_str(), + URL::encode(u->vkey->getText()).c_str(), (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str(): "")); } u->suspendTextPassThru = true; diff --git a/src/modules/filters/greeklexattribs.cpp b/src/modules/filters/greeklexattribs.cpp index 1c2533d..1d98db2 100644 --- a/src/modules/filters/greeklexattribs.cpp +++ b/src/modules/filters/greeklexattribs.cpp @@ -3,7 +3,7 @@ * greeklexattribs.cpp - SWFilter descendant to set entry attributes * for greek lexicons * - * $Id: greeklexattribs.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: greeklexattribs.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -44,7 +44,7 @@ char GreekLexAttribs::processText(SWBuf &text, const SWKey *key, const SWModule string phrase; string freq; char val[128], *valto; - char wordstr[7]; + char wordstr[11]; const char *currentPhrase = 0; const char *currentPhraseEnd = 0; int number = 0; diff --git a/src/modules/filters/osisheadings.cpp b/src/modules/filters/osisheadings.cpp index 7a5f525..74ed5ce 100644 --- a/src/modules/filters/osisheadings.cpp +++ b/src/modules/filters/osisheadings.cpp @@ -3,7 +3,7 @@ * osisheadings.cpp - SWFilter descendant to hide or show headings * in an OSIS module * - * $Id: osisheadings.cpp 3194 2014-04-24 03:02:47Z greg.hellings $ + * $Id: osisheadings.cpp 3423 2016-06-25 13:21:48Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -51,6 +51,7 @@ namespace { SWBuf heading; int depth; int headerNum; + bool canonical; MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { clear(); @@ -62,6 +63,7 @@ namespace { heading = ""; depth = 0; headerNum = 0; + canonical=false; } }; } @@ -88,16 +90,16 @@ bool OSISHeadings::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat // are we currently in a heading? if (u->currentHeadingName.size()) { u->heading.append(u->lastTextNode); + if (SWBuf("true") == tag.getAttribute("canonical")) u->canonical = true; if (name == u->currentHeadingName) { if (tag.isEndTag(u->sID)) { if (!u->depth-- || u->sID) { // see comment below about preverse div changed and needing to preserve the <title> container tag for old school pre-verse titles // we've just finished a heading. It's all stored up in u->heading - bool canonical = (SWBuf("true") == u->currentHeadingTag.getAttribute("canonical")); bool preverse = (SWBuf("x-preverse") == u->currentHeadingTag.getAttribute("subType") || SWBuf("x-preverse") == u->currentHeadingTag.getAttribute("subtype")); // do we want to put anything in EntryAttributes? - if (u->module->isProcessEntryAttributes() && (option || canonical || !preverse)) { + if (u->module->isProcessEntryAttributes() && (option || u->canonical || !preverse)) { SWBuf buf; buf.appendFormatted("%i", u->headerNum++); // leave the actual <title...> wrapper in if we're part of an old school preverse title // because now frontend have to deal with preverse as a div which may or may not include <title> elements @@ -121,7 +123,7 @@ bool OSISHeadings::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat } // do we want the heading in the body? - if (!preverse && (option || canonical)) { + if (!preverse && (option || u->canonical)) { buf.append(u->currentHeadingTag); buf.append(u->heading); buf.append(tag); @@ -148,6 +150,7 @@ bool OSISHeadings::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat u->sID = u->currentHeadingTag.getAttribute("sID"); u->depth = 0; u->suspendTextPassThru = true; + u->canonical = (SWBuf("true") == tag.getAttribute("canonical")); return true; } diff --git a/src/modules/filters/osishtmlhref.cpp b/src/modules/filters/osishtmlhref.cpp index 9cda9ab..94194ac 100644 --- a/src/modules/filters/osishtmlhref.cpp +++ b/src/modules/filters/osishtmlhref.cpp @@ -2,7 +2,7 @@ * * osishtmlhref.cpp - OSIS to HTML with hrefs filter * - * $Id: osishtmlhref.cpp 3173 2014-04-17 04:20:33Z greg.hellings $ + * $Id: osishtmlhref.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2003-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -117,14 +117,12 @@ OSISHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : tagStacks = new TagStacks(); wordsOfChristStart = "<font color=\"red\"> "; wordsOfChristEnd = "</font> "; + osisQToTick = true; // default + isBiblicalText = false; if (module) { osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false"))); version = module->getName(); - BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); - } - else { - osisQToTick = true; // default - version = ""; + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } } @@ -201,9 +199,9 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat outText("<ruby><rb>", buf, u); outText(lastText, buf, u); + outText("</rb><rp>(</rp><rt>", buf, u); val = strchr(attrib, ':'); val = (val) ? (val + 1) : attrib; - outText("</rb><rp>(</rp><rt>", buf, u); outText(val, buf, u); outText("</rt><rp>)</rp></ruby>", buf, u); } @@ -241,22 +239,15 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat if (!strongsMarkup) { // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); SWBuf noteName = tag.getAttribute("n"); - VerseKey *vkey = NULL; char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); u->inXRefNote = true; // Why this change? Ben Morgan: Any note can have references in, so we need to set this to true for all notes // u->inXRefNote = (ch == 'x'); - - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", ch, URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey ? vkey->getText() : u->key->getText()).c_str(), + URL::encode(u->vkey ? u->vkey->getText() : u->key->getText()).c_str(), ch, ch, (renderNoteNumbers ? noteName.c_str() : "")); @@ -267,7 +258,7 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat if (tag.isEndTag()) { u->suspendTextPassThru = (--u->suspendLevel); u->inXRefNote = false; - u->lastSuspendSegment = ""; // fix/work-around for nasb devineName in note bug + u->lastSuspendSegment = ""; // fix/work-around for nasb divineName in note bug } } @@ -322,7 +313,7 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat // Compensate for starting : ref = the_ref + 1; - int size = target.size() - ref.size() - 1; + int size = (int)(target.size() - ref.size() - 1); work.setSize(size); strncpy(work.getRawData(), target, size); @@ -460,7 +451,7 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat const unsigned char *tmpBuf = (const unsigned char *)lastText.c_str(); getUniCharFromUTF8(&tmpBuf); - int char_length = (tmpBuf - (const unsigned char *)lastText.c_str()); + int char_length = (int)(tmpBuf - (const unsigned char *)lastText.c_str()); scratch.setFormatted("%.*s<font size=\"-1\">%s</font>", char_length, lastText.c_str(), @@ -509,7 +500,7 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat else if (type == "ol") { outText("</span>", buf, u); } - else if (type == "sup") { + else if (type == "super") { outText("</sup>", buf, u); } else if (type == "sub") { @@ -595,7 +586,7 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat if ((type == "added") || (type == "supplied")) outText("<i>", buf, u); else if (type == "tenseChange") - buf += "*"; + outText( "*", buf, u); } else if (tag.isEndTag()) { SWBuf type = u->lastTransChange; diff --git a/src/modules/filters/osislatex.cpp b/src/modules/filters/osislatex.cpp new file mode 100644 index 0000000..e642f07 --- /dev/null +++ b/src/modules/filters/osislatex.cpp @@ -0,0 +1,766 @@ +/****************************************************************************** + * + * osislatex.cpp - Render filter for LaTeX of an OSIS module + * + * $Id: osislatex.cpp 3548 2017-12-10 05:11:38Z scribe $ + * + * Copyright 2011-2014 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 <stdlib.h> +#include <ctype.h> +#include <osislatex.h> +#include <utilxml.h> +#include <utilstr.h> +#include <versekey.h> +#include <swmodule.h> +#include <url.h> +#include <stringmgr.h> +#include <stack> + +SWORD_NAMESPACE_START + +const char *OSISLaTeX::getHeader() const { +// can be used to return static start-up info, like packages to load. Not sure yet if I want to retain it. + + const static char *header = "\ + \\LoadClass[11pt,a4paper,twoside,headinclude=true,footinclude=true,BCOR=0mm,DIV=calc]{scrbook}\n\ + \\LoadClass[11pt,a4paper,twoside,headinclude=true,footinclude=true,BCOR=0mm,DIV=calc]{scrbook}\n\ + \\NeedsTeXFormat{LaTeX2e}\n\ + \\ProvidesClass{sword}[2015/03/29 CrossWire LaTeX class for Biblical texts]\n\ + %\\sworddiclink{%s}{%s}{\n\ + %\\sworddictref{%s}{%s}{\n\ + %\\sworddict{%s}{\n\ + %\\sworddivinename}{%s}{\n\ + %\\swordfont{\n\ + %\\swordfootnote[%c]{%s}{%s}{%s}{%s}{\n\ + %\\swordfootnote{%s}{%s}{%s}{\n\ + %\\swordfootnote{%s}{%s}{%s}{%s}{\n\ + %\\swordmorph{\n\ + %\\swordmorph[Greek]{%s}\n\ + %\\swordmorph[lemma]{%s}\n\ + %\\swordmorph{%s}\n\ + %\\swordpoetryline{\n\ + %\\swordquote{\n\ + %\\swordref{%s}{%s}{\n\ + %\\swordsection{\n\ + %\\swordsection{}{\n\ + %\\swordsection{book}{\n\ + %\\swordsection{sechead}{\n\ + %\\swordstrong[Greek]{\n\ + %\\swordstrong[Greektense]{\n\ + %\\swordstrong[Hebrew]{\n\ + %\\swordstrong[Hebrewtense]{\n\ + %\\swordstrong[%s]{%s}{\n\ + %\\swordstrong{%s}{%s}\n\ + %\\swordtitle{\n\ + %\\swordtranschange{supplied}{\n\ + %\\swordtranschange{tense}{\n\ + %\\swordwoj{\n\ + %\\swordxref{\n\ + %\\swordxref{%s}{\n\ + %\\swordxref{%s}{%s}{\n\ + "; + return header; +} + + +namespace { + +// though this might be slightly slower, possibly causing an extra bool check, this is a renderFilter +// so speed isn't the absolute highest priority, and this is a very minor possible hit +static inline void outText(const char *t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; } +static inline void outText(char t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; } + +void processLemma(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) { + const char *attrib; + const char *val; + if ((attrib = tag.getAttribute("lemma"))) { + int count = tag.getAttributePartCount("lemma", ' '); + int i = (count > 1) ? 0 : -1; // -1 for whole value cuz it's faster, but does the same thing as 0 + do { + attrib = tag.getAttribute("lemma", i, ' '); + if (i < 0) i = 0; // to handle our -1 condition + val = strchr(attrib, ':'); + val = (val) ? (val + 1) : attrib; + SWBuf gh; + if(*val == 'G') + gh = "Greek"; + if(*val == 'H') + gh = "Hebrew"; + const char *val2 = val; + if ((strchr("GH", *val)) && (isdigit(val[1]))) + val2++; + //if ((!strcmp(val2, "3588")) && (lastText.length() < 1)) + // show = false; + //else { + if (!suspendTextPassThru) { + buf.appendFormatted("\\swordstrong{%s}{%s}", + (gh.length()) ? gh.c_str() : "", + val2); + } + //} + + } while (++i < count); + } +} + + + +void processMorph(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) { + const char * attrib; + const char *val; + if ((attrib = tag.getAttribute("morph"))) { // && (show)) { + SWBuf savelemma = tag.getAttribute("savlm"); + //if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1)) + // show = false; + //if (show) { + int count = tag.getAttributePartCount("morph", ' '); + int i = (count > 1) ? 0 : -1; // -1 for whole value cuz it's faster, but does the same thing as 0 + do { + attrib = tag.getAttribute("morph", i, ' '); + if (i < 0) i = 0; // to handle our -1 condition + val = strchr(attrib, ':'); + val = (val) ? (val + 1) : attrib; + const char *val2 = val; + if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2]))) + val2+=2; + if (!suspendTextPassThru) { + buf.appendFormatted("\\swordmorph{%s}", + tag.getAttribute("morph") + ); + } + } while (++i < count); + //} + } +} + + +} // end anonymous namespace + +BasicFilterUserData *OSISLaTeX::createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); +} + + +OSISLaTeX::OSISLaTeX() { + setTokenStart("<"); + setTokenEnd(">"); + + setEscapeStart("&"); + setEscapeEnd(";"); + + setEscapeStringCaseSensitive(true); + setPassThruNumericEscapeString(true); + + addAllowedEscapeString("quot"); + addAllowedEscapeString("apos"); + addAllowedEscapeString("amp"); + addAllowedEscapeString("lt"); + addAllowedEscapeString("gt"); + + setTokenCaseSensitive(true); + + // addTokenSubstitute("lg", "<br />"); + // addTokenSubstitute("/lg", "<br />"); + + morphFirst = false; + renderNoteNumbers = false; +} + +class OSISLaTeX::TagStack : public std::stack<SWBuf> { +}; + +OSISLaTeX::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key), quoteStack(new TagStack()), hiStack(new TagStack()), titleStack(new TagStack()), lineStack(new TagStack()) { + inXRefNote = false; + suspendLevel = 0; + divLevel = "module"; + wordsOfChristStart = "\\swordwoj{"; + wordsOfChristEnd = "}"; + consecutiveNewlines = 0; + firstCell = false; +} + +OSISLaTeX::MyUserData::~MyUserData() { + delete quoteStack; + delete hiStack; + delete titleStack; + delete lineStack; +} + +void OSISLaTeX::MyUserData::outputNewline(SWBuf &buf) { + if (++consecutiveNewlines <= 2) { + outText("//\n", buf, this); + supressAdjacentWhitespace = true; + } +} +bool OSISLaTeX::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { + MyUserData *u = (MyUserData *)userData; + SWBuf scratch; + + bool sub = (u->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token); + if (!sub) { + // manually process if it wasn't a simple substitution + XMLTag tag(token); + + // <w> tag + if (!strcmp(tag.getName(), "w")) { + + // start <w> tag + if ((!tag.isEmpty()) && (!tag.isEndTag())) { + u->w = token; + } + + // end or empty <w> tag + else { + bool endTag = tag.isEndTag(); + SWBuf lastText; + //bool show = true; // to handle unplaced article in kjv2003-- temporary till combined + + if (endTag) { + tag = u->w.c_str(); + lastText = u->lastTextNode.c_str(); + } + else lastText = "stuff"; + + const char *attrib; + const char *val; + if ((attrib = tag.getAttribute("xlit"))) { + val = strchr(attrib, ':'); + val = (val) ? (val + 1) : attrib; + outText(" ", buf, u); + outText(val, buf, u); + } + if ((attrib = tag.getAttribute("gloss"))) { + // I'm sure this is not the cleanest way to do it, but it gets the job done + // for rendering ruby chars properly ^_^ + buf -= lastText.length(); + + outText("\\ruby{", buf, u); + outText(lastText, buf, u); + outText("}{", buf, u); + outText(attrib, buf, u); + outText("}", buf, u); + } + if (!morphFirst) { + processLemma(u->suspendTextPassThru, tag, buf); + processMorph(u->suspendTextPassThru, tag, buf); + } + else { + processMorph(u->suspendTextPassThru, tag, buf); + processLemma(u->suspendTextPassThru, tag, buf); + } + if ((attrib = tag.getAttribute("POS"))) { + val = strchr(attrib, ':'); + val = (val) ? (val + 1) : attrib; + outText(" ", buf, u); + outText(val, buf, u); + } + + + } + } + + // <note> tag + + else if (!strcmp(tag.getName(), "note")) { + if (!tag.isEndTag()) { + SWBuf type = tag.getAttribute("type"); + bool strongsMarkup = (type == "x-strongsMarkup" || type == "strongsMarkup"); // the latter is deprecated + if (strongsMarkup) { + tag.setEmpty(false); // handle bug in KJV2003 module where some note open tags were <note ... /> + } + + if (!tag.isEmpty()) { + + if (!strongsMarkup) { // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off + SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf footnoteBody = ""; + if (u->module){ + footnoteBody += u->module->getEntryAttributes()["Footnote"][footnoteNumber]["body"]; + } + SWBuf noteName = tag.getAttribute("n"); + + u->inXRefNote = true; // Why this change? Ben Morgan: Any note can have references in, so we need to set this to true for all notes +// u->inXRefNote = (ch == 'x'); + + if (u->vkey) { + //printf("URL = %s\n",URL::encode(u->vkey->getText()).c_str()); + buf.appendFormatted("\\swordfootnote{%s}{%s}{%s}{%s}{%s}{", + + footnoteNumber.c_str(), + u->version.c_str(), + u->vkey->getText(), + tag.getAttribute("type"), + (renderNoteNumbers ? noteName.c_str() : "")); + if (u->module) { + outText( u->module->renderText(footnoteBody).c_str(), buf, u); + } + } + else { + buf.appendFormatted("\\swordfootnote{%s}{%s}{%s}{%s}{%s}{", + footnoteNumber.c_str(), + u->version.c_str(), + u->key->getText(), + tag.getAttribute("type"), + (renderNoteNumbers ? noteName.c_str() : "")); + if (u->module) { + outText( u->module->renderText(footnoteBody).c_str(), buf, u); + } + } + } + } + u->suspendTextPassThru = (++u->suspendLevel); + } + if (tag.isEndTag()) { + u->suspendTextPassThru = (--u->suspendLevel); + u->inXRefNote = false; + u->lastSuspendSegment = ""; // fix/work-around for nasb divineName in note bug + outText("}", buf, u); + } + } + + // <p> paragraph and <lg> linegroup tags + else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { // non-empty start tag + u->outputNewline(buf); + } + else if (tag.isEndTag()) { // end tag + u->outputNewline(buf); + } + else { // empty paragraph break marker + u->outputNewline(buf); + } + } + + // Milestoned paragraphs, created by osis2mod + // <div type="paragraph" sID.../> + // <div type="paragraph" eID.../> + else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && (!strcmp(tag.getAttribute("type"), "x-p") || !strcmp(tag.getAttribute("type"), "paragraph"))) { + // <div type="paragraph" sID... /> + if (tag.getAttribute("sID")) { // non-empty start tag + u->outputNewline(buf); + } + // <div type="paragraph" eID... /> + else if (tag.getAttribute("eID")) { + u->outputNewline(buf); + } + } + + // <reference> tag + else if (!strcmp(tag.getName(), "reference")) { + if (!u->inXRefNote) { // only show these if we're not in an xref note + if (!tag.isEndTag()) { + SWBuf target; + SWBuf work; + SWBuf ref; + bool is_scripRef = false; + + target = tag.getAttribute("osisRef"); + const char* the_ref = strchr(target, ':'); + + if(!the_ref) { + // No work + ref = target; + is_scripRef = true; + } + else { + // Compensate for starting : + ref = the_ref + 1; + + int size = (int)(target.size() - ref.size() - 1); + work.setSize(size); + strncpy(work.getRawData(), target, size); + + // For Bible:Gen.3.15 or Bible.vulgate:Gen.3.15 + if(!strncmp(work, "Bible", 5)) + is_scripRef = true; + } + + if(is_scripRef) + { + buf.appendFormatted("\\swordxref{%s}{", + ref.c_str() +// (work.size()) ? URL::encode(work.c_str()).c_str() : "") + ); + } + else + { + // Dictionary link, or something + buf.appendFormatted("\\sworddiclink{%s}{%s}{", // work, entry + work.c_str(), + ref.c_str() + ); + } + } + else { + outText("}", buf, u); + } + } + } + + // <l> poetry, etc + else if (!strcmp(tag.getName(), "l")) { + // start line marker + if (tag.getAttribute("sID") || (!tag.isEndTag() && !tag.isEmpty())) { + // nested lines plus if the line itself has an x-indent type attribute value + outText("\\swordpoetryline{", buf, u); + u->lineStack->push(tag.toString()); + } + // end line marker + else if (tag.getAttribute("eID") || tag.isEndTag()) { + outText("}", buf, u); + u->outputNewline(buf); + if (u->lineStack->size()) u->lineStack->pop(); + } + // <l/> without eID or sID + // Note: this is improper osis. This should be <lb/> + else if (tag.isEmpty() && !tag.getAttribute("sID")) { + u->outputNewline(buf); + } + } + + // <lb.../> + else if (!strcmp(tag.getName(), "lb") && (!tag.getAttribute("type") || strcmp(tag.getAttribute("type"), "x-optional"))) { + u->outputNewline(buf); + } + // <milestone type="line"/> + // <milestone type="x-p"/> + // <milestone type="cQuote" marker="x"/> + else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type"))) { + if (!strcmp(tag.getAttribute("type"), "line")) { + u->outputNewline(buf); + if (tag.getAttribute("subType") && !strcmp(tag.getAttribute("subType"), "x-PM")) { + u->outputNewline(buf); + } + } + else if (!strcmp(tag.getAttribute("type"),"x-p")) { + if (tag.getAttribute("marker")) + outText(tag.getAttribute("marker"), buf, u); + else outText("<!p>", buf, u); + } + else if (!strcmp(tag.getAttribute("type"), "cQuote")) { + const char *tmp = tag.getAttribute("marker"); + bool hasMark = tmp; + SWBuf mark = tmp; + tmp = tag.getAttribute("level"); + int level = (tmp) ? atoi(tmp) : 1; + + // first check to see if we've been given an explicit mark + if (hasMark) + outText(mark, buf, u); + // finally, alternate " and ', if config says we should supply a mark + else if (u->osisQToTick) + outText((level % 2) ? '\"' : '\'', buf, u); + } + } + + // <title> + + else if (!strcmp(tag.getName(), "title")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + const char *tmp = tag.getAttribute("type"); + bool hasType = tmp; + SWBuf type = tmp; + + outText("\n\\swordtitle{", buf, u); + outText(u->divLevel, buf, u); + outText("}{", buf, u); + + if (hasType) outText(type, buf, u); + else outText("", buf, u); + + outText("}{", buf, u); + } + else if (tag.isEndTag()) { + outText( "}", buf, u); + ++u->consecutiveNewlines; + u->supressAdjacentWhitespace = true; + } + } + + // <list> + else if (!strcmp(tag.getName(), "list")) { + if((!tag.isEndTag()) && (!tag.isEmpty())) { + outText("\n\\begin{itemize}", buf, u); + } + else if (tag.isEndTag()) { + outText("\n\\end{itemize}", buf, u); + ++u->consecutiveNewlines; + u->supressAdjacentWhitespace = true; + } + } + + // <item> + else if (!strcmp(tag.getName(), "item")) { + if((!tag.isEndTag()) && (!tag.isEmpty())) { + outText("\n\\item ", buf, u); + } + else if (tag.isEndTag()) { + ++u->consecutiveNewlines; + u->supressAdjacentWhitespace = true; + } + } + // <catchWord> & <rdg> tags (italicize) + else if (!strcmp(tag.getName(), "rdg") || !strcmp(tag.getName(), "catchWord")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + outText("\\emph{", buf, u); + } + else if (tag.isEndTag()) { + outText("}", buf, u); + } + } + + // divineName + else if (!strcmp(tag.getName(), "divineName")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + outText( "\\sworddivinename{", buf, u); + u->suspendTextPassThru = (++u->suspendLevel); + } + else if (tag.isEndTag()) { + SWBuf lastText = u->lastSuspendSegment.c_str(); + u->suspendTextPassThru = (--u->suspendLevel); + if (lastText.size()) { + scratch.setFormatted("%s}", lastText.c_str()); + outText(scratch.c_str(), buf, u); + } + } + } + + // <hi> text highlighting + else if (!strcmp(tag.getName(), "hi")) { + SWBuf type = tag.getAttribute("type"); + + // handle tei rend attribute if type doesn't exist + if (!type.length()) type = tag.getAttribute("rend"); + + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + if (type == "bold" || type == "b" || type == "x-b") { + outText("\\textbold{", buf, u); + } + + // there is no officially supported OSIS overline attribute, + // thus either TEI overline or OSIS x-overline would be best, + // but we have used "ol" in the past, as well. Once a valid + // OSIS overline attribute is made available, these should all + // eventually be deprecated and never documented that they are supported. + else if (type == "ol" || type == "overline" || type == "x-overline") { + outText("\\textoverline{", buf, u); + } + + else if (type == "super") { + outText("\\textsuperscript{", buf, u); + } + else if (type == "sub") { + outText("\\textsubscript{", buf, u); + } + else { // all other types + outText("\\emph {", buf, u); + } + u->hiStack->push(tag.toString()); + } + else if (tag.isEndTag()) { + outText("}", buf, u); + } + } + + // <q> quote + // Rules for a quote element: + // If the tag is empty with an sID or an eID then use whatever it specifies for quoting. + // Note: empty elements without sID or eID are ignored. + // If the tag is <q> then use it's specifications and push it onto a stack for </q> + // If the tag is </q> then use the pushed <q> for specification + // If there is a marker attribute, possibly empty, this overrides osisQToTick. + // If osisQToTick, then output the marker, using level to determine the type of mark. + else if (!strcmp(tag.getName(), "q")) { + SWBuf type = tag.getAttribute("type"); + SWBuf who = tag.getAttribute("who"); + const char *tmp = tag.getAttribute("level"); + int level = (tmp) ? atoi(tmp) : 1; + tmp = tag.getAttribute("marker"); + bool hasMark = tmp; + SWBuf mark = tmp; + + // open <q> or <q sID... /> + if ((!tag.isEmpty() && !tag.isEndTag()) || (tag.isEmpty() && tag.getAttribute("sID"))) { + // if <q> then remember it for the </q> + if (!tag.isEmpty()) { + u->quoteStack->push(tag.toString()); + } + + // Do this first so quote marks are included as WoC + if (who == "Jesus") + outText(u->wordsOfChristStart, buf, u); + + // first check to see if we've been given an explicit mark + if (hasMark) + outText(mark, buf, u); + //alternate " and ' + else if (u->osisQToTick) + outText((level % 2) ? '\"' : '\'', buf, u); + } + // close </q> or <q eID... /> + else if ((tag.isEndTag()) || (tag.isEmpty() && tag.getAttribute("eID"))) { + // if it is </q> then pop the stack for the attributes + if (tag.isEndTag() && !u->quoteStack->empty()) { + XMLTag qTag(u->quoteStack->top()); + if (u->quoteStack->size()) u->quoteStack->pop(); + + type = qTag.getAttribute("type"); + who = qTag.getAttribute("who"); + tmp = qTag.getAttribute("level"); + level = (tmp) ? atoi(tmp) : 1; + tmp = qTag.getAttribute("marker"); + hasMark = tmp; + mark = tmp; + } + + // first check to see if we've been given an explicit mark + if (hasMark) + outText(mark, buf, u); + // finally, alternate " and ', if config says we should supply a mark + else if (u->osisQToTick) + outText((level % 2) ? '\"' : '\'', buf, u); + + // Do this last so quote marks are included as WoC + if (who == "Jesus") + outText(u->wordsOfChristEnd, buf, u); + } + } + + // <transChange> + else if (!strcmp(tag.getName(), "transChange")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + SWBuf type = tag.getAttribute("type"); + u->lastTransChange = type; + + // just do all transChange tags this way for now + if ((type == "added") || (type == "supplied")) + outText("\\swordtranschange{supplied}{", buf, u); + else if (type == "tenseChange") + outText( "\\swordtranschange{tense}{", buf, u); + } + else if (tag.isEndTag()) { + outText("}", buf, u); + } + else { // empty transChange marker? + } + } + + // image + else if (!strcmp(tag.getName(), "figure")) { + const char *src = tag.getAttribute("src"); + if (src) { // assert we have a src attribute + SWBuf filepath; + if (userData->module) { + filepath = userData->module->getConfigEntry("AbsoluteDataPath"); + if ((filepath.size()) && (filepath[filepath.size()-1] != '/') && (src[0] != '/')) + filepath += '/'; + } + filepath += src; + + outText("\\figure{", buf, u); + outText("\\includegraphics{", buf, u); + outText(filepath.c_str(), buf, u); + outText("}}", buf, u); + + } + } + + // ok to leave these in + else if (!strcmp(tag.getName(), "div")) { + SWBuf type = tag.getAttribute("type"); + if (type == "module") { + u->divLevel = type; + outText("\n", buf, u); + } + else if (type == "testament") { + u->divLevel = type; + outText("\n", buf, u); + } + else if (type == "bookGroup") { + u->divLevel = type; + outText("\n", buf, u); + } + else if (type == "book") { + u->divLevel = type; + outText("\n", buf, u); + } + else if (type == "majorSection") { + u->divLevel = type; + outText("\n", buf, u); + } + else if (type == "section") { + u->divLevel = type; + outText("\n", buf, u); + } + else if (type == "paragraph") { + u->divLevel = type; + outText("\n", buf, u); + } + } + else if (!strcmp(tag.getName(), "span")) { + outText( "", buf, u); + } + else if (!strcmp(tag.getName(), "br")) { + outText( "\\", buf, u); + } + else if (!strcmp(tag.getName(), "table")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + outText( "\n\\begin{tabular}", buf, u); + } + else if (tag.isEndTag()) { + outText( "\n\\end{tabular}", buf, u); + ++u->consecutiveNewlines; + u->supressAdjacentWhitespace = true; + } + + } + else if (!strcmp(tag.getName(), "row")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + outText( "\n", buf, u); + u->firstCell = true; + } + else if (tag.isEndTag()) { + outText( "//", buf, u); + u->firstCell = false; + } + + } + else if (!strcmp(tag.getName(), "cell")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + if (u->firstCell == false) { + outText( " & ", buf, u); + } + else { + u->firstCell = false; + } + } + else if (tag.isEndTag()) { + outText( "", buf, u); + } + } + else { + if (!u->supressAdjacentWhitespace) u->consecutiveNewlines = 0; + return false; // we still didn't handle token + } + } + if (!u->supressAdjacentWhitespace) u->consecutiveNewlines = 0; + return true; +} + + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/osislemma.cpp b/src/modules/filters/osislemma.cpp index cf5d8f4..12881ff 100644 --- a/src/modules/filters/osislemma.cpp +++ b/src/modules/filters/osislemma.cpp @@ -3,7 +3,7 @@ * osislemma.cpp - SWFilter descendant to hide or show lemmata * in a OSIS module * - * $Id: osislemma.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: osislemma.cpp 3483 2017-06-25 15:19:34Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -67,6 +67,15 @@ char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *modul intoken = false; if (token.startsWith("w ")) { // Word XMLTag wtag(token); + + // always save off lemma if we haven't yet + if (!wtag.getAttribute("savlm")) { + const char *l = wtag.getAttribute("lemma"); + if (l) { + wtag.setAttribute("savlm", l); + } + } + int count = wtag.getAttributePartCount("lemma", ' '); for (int i = 0; i < count; i++) { SWBuf a = wtag.getAttribute("lemma", i, ' '); @@ -78,6 +87,7 @@ char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *modul count--; } } + token = wtag; token.trim(); // drop <> diff --git a/src/modules/filters/osismorph.cpp b/src/modules/filters/osismorph.cpp index 71de8e5..4ccf15b 100644 --- a/src/modules/filters/osismorph.cpp +++ b/src/modules/filters/osismorph.cpp @@ -3,7 +3,7 @@ * osismorph.cpp - SWFilter descendant to hide or show morph tags * in a OSIS module * - * $Id: osismorph.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: osismorph.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -90,11 +90,12 @@ char OSISMorph::processText(SWBuf &text, const SWKey *key, const SWModule *modul continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; token[tokpos] = 0; + } } - else { + else { text.append(*from); } } diff --git a/src/modules/filters/osismorphsegmentation.cpp b/src/modules/filters/osismorphsegmentation.cpp index 1d91428..0e5c1cc 100644 --- a/src/modules/filters/osismorphsegmentation.cpp +++ b/src/modules/filters/osismorphsegmentation.cpp @@ -4,7 +4,7 @@ * morphemes (for morpheme segmented Hebrew in * the WLC) * - * $Id: osismorphsegmentation.cpp 3186 2014-04-17 04:33:19Z greg.hellings $ + * $Id: osismorphsegmentation.cpp 3153 2014-04-14 16:22:11Z scribe $ * * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/osisosis.cpp b/src/modules/filters/osisosis.cpp index 2bc5cbb..f3dca3a 100644 --- a/src/modules/filters/osisosis.cpp +++ b/src/modules/filters/osisosis.cpp @@ -2,7 +2,7 @@ * * osisosis.cpp - internal OSIS to public OSIS filter * - * $Id: osisosis.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: osisosis.cpp 3338 2015-03-12 20:04:06Z refdoc $ * * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -58,39 +58,28 @@ char OSISOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module char status = SWBasicFilter::processText(text, key, module); VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey) { - SWBuf ref = ""; if (vkey->getVerse()) { - ref.appendFormatted("\t\t<verse osisID=\"%s\">", vkey->getOSISRef()); - } - - if (ref.length() > 0) { - - text = ref + text; - - if (vkey->getVerse()) { - VerseKey *tmp = (VerseKey *)vkey->clone(); - *tmp = *vkey; - tmp->setAutoNormalize(false); - tmp->setIntros(true); - - text += "</verse>"; - + VerseKey *tmp = (VerseKey *)vkey->clone(); + *tmp = *vkey; + tmp->setAutoNormalize(false); + tmp->setIntros(true); + + *tmp = MAXVERSE; + if (*vkey == *tmp) { + tmp->setVerse(0); +// sprintf(ref, "\t</div>"); +// pushString(&to, ref); + *tmp = MAXCHAPTER; *tmp = MAXVERSE; if (*vkey == *tmp) { + tmp->setChapter(0); tmp->setVerse(0); // sprintf(ref, "\t</div>"); // pushString(&to, ref); - *tmp = MAXCHAPTER; - *tmp = MAXVERSE; - if (*vkey == *tmp) { - tmp->setChapter(0); - tmp->setVerse(0); -// sprintf(ref, "\t</div>"); -// pushString(&to, ref); - } } - delete tmp; } + delete tmp; + } // // else if (vkey->Chapter()) { @@ -98,7 +87,7 @@ char OSISOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module // } // else sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef()); // - } + } return status; } @@ -149,11 +138,12 @@ bool OSISOSIS::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *u else if (!strcmp(tag.getName(), "note")) { if (!tag.isEndTag()) { SWBuf type = tag.getAttribute("type"); + bool strongsMarkup = (type == "x-strongsMarkup" || type == "strongsMarkup"); // the latter is deprecated if (strongsMarkup) { tag.setEmpty(false); // handle bug in KJV2003 module where some note open tags were <note ... /> } - + if (!tag.isEmpty()) { tag.setAttribute("swordFootnote", 0); @@ -162,6 +152,13 @@ bool OSISOSIS::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *u } else u->suspendTextPassThru = true; } + + if (u->module) { + XMLTag tag = token; + SWBuf swordFootnote = tag.getAttribute("swordFootnote"); + SWBuf footnoteBody = u->module->getEntryAttributes()["Footnote"][swordFootnote]["body"]; + buf.append(u->module->renderText(footnoteBody)); + } } if (tag.isEndTag()) { if (u->suspendTextPassThru == false) diff --git a/src/modules/filters/osisplain.cpp b/src/modules/filters/osisplain.cpp index d594028..436d0c7 100644 --- a/src/modules/filters/osisplain.cpp +++ b/src/modules/filters/osisplain.cpp @@ -2,7 +2,7 @@ * * osisplain.cpp - An SWFilter that provides stripping of OSIS tags * - * $Id: osisplain.cpp 3290 2014-12-04 04:54:52Z greg.hellings $ + * $Id: osisplain.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,6 +25,8 @@ #include <ctype.h> #include <versekey.h> #include <stringmgr.h> +#include <utilxml.h> +#include <swmodule.h> SWORD_NAMESPACE_START @@ -35,7 +37,6 @@ namespace { public: SWBuf w; XMLTag tag; - VerseKey *vk; char testament; SWBuf hiType; MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {} @@ -58,22 +59,35 @@ OSISPlain::OSISPlain() { addEscapeStringSubstitute("gt", ">"); addEscapeStringSubstitute("quot", "\""); - setTokenCaseSensitive(true); - addTokenSubstitute("title", "\n"); - addTokenSubstitute("/title", "\n"); - addTokenSubstitute("/l", "\n"); - addTokenSubstitute("lg", "\n"); - addTokenSubstitute("/lg", "\n"); + setTokenCaseSensitive(true); + addTokenSubstitute("title", "\n"); + addTokenSubstitute("/title", "\n"); + addTokenSubstitute("/l", "\n"); + addTokenSubstitute("lg", "\n"); + addTokenSubstitute("/lg", "\n"); + + setStageProcessing(PRECHAR); } + BasicFilterUserData *OSISPlain::createUserData(const SWModule *module, const SWKey *key) { MyUserData *u = new MyUserData(module, key); - u->vk = SWDYNAMIC_CAST(VerseKey, u->key); - u->testament = (u->vk) ? u->vk->getTestament() : 2; // default to NT + u->testament = (u->vkey) ? u->vkey->getTestament() : 2; // default to NT return u; } +bool OSISPlain::processStage(char stage, SWBuf &text, char *&from, BasicFilterUserData *userData) { + // this is a strip filter so we want to do this as optimized as possible. Avoid calling + // getUniCharFromUTF8 for slight speed improvement + + if (stage == PRECHAR) { + if (from[0] == 0xC2 && from[1] == 0xAD) return true; // skip soft hyphens + } + return false; +} + + bool OSISPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { // manually process if it wasn't a simple substitution if (!substituteToken(buf, token)) { @@ -105,10 +119,8 @@ bool OSISPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * buf.append('>'); } if ((attrib = u->tag.getAttribute("gloss"))) { - val = strchr(attrib, ':'); - val = (val) ? (val + 1) : attrib; buf.append(" <"); - buf.append(val); + buf.append(attrib); buf.append('>'); } if ((attrib = u->tag.getAttribute("lemma"))) { @@ -168,6 +180,12 @@ bool OSISPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * buf.append(" ["); } else u->suspendTextPassThru = true; + if (u->module) { + XMLTag tag = token; + SWBuf swordFootnote = tag.getAttribute("swordFootnote"); + SWBuf footnoteBody = u->module->getEntryAttributes()["Footnote"][swordFootnote]["body"]; + buf.append(u->module->renderText(footnoteBody)); + } } else if (!strncmp(token, "/note", 5)) { if (!u->suspendTextPassThru) @@ -234,12 +252,17 @@ bool OSISPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * } } else { - buf.append("*"); + buf.append("* "); buf.append(u->lastSuspendSegment); - buf.append("*"); + buf.append(" *"); } u->suspendTextPassThru = false; } + + else if ((!strncmp(token, "q", 1) && (u->tag.getAttribute("marker")))) { + buf.append(u->tag.getAttribute("marker")); + } + // <milestone type="line"/> else if (!strncmp(token, "milestone", 9)) { @@ -248,6 +271,9 @@ bool OSISPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * userData->supressAdjacentWhitespace = true; buf.append('\n'); } + if (u->tag.getAttribute("marker")) { + buf.append(u->tag.getAttribute("marker")); + } } else { diff --git a/src/modules/filters/osisreferencelinks.cpp b/src/modules/filters/osisreferencelinks.cpp index 83308e4..bb30517 100644 --- a/src/modules/filters/osisreferencelinks.cpp +++ b/src/modules/filters/osisreferencelinks.cpp @@ -3,7 +3,7 @@ * osisreferencelinks.cpp - SWFilter descendant to toggle OSIS reference * links with specified type/subType * - * $Id: osisreferencelinks.cpp 2995 2013-12-28 06:32:26Z greg.hellings $ + * $Id: osisreferencelinks.cpp 2989 2013-10-09 08:22:21Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/osisrtf.cpp b/src/modules/filters/osisrtf.cpp index 7bc5639..522a0a8 100644 --- a/src/modules/filters/osisrtf.cpp +++ b/src/modules/filters/osisrtf.cpp @@ -2,7 +2,7 @@ * * osisrtf.cpp - OSIS to RTF filter * - * $Id: osisrtf.cpp 3156 2014-04-17 03:50:37Z greg.hellings $ * + * $Id: osisrtf.cpp 3548 2017-12-10 05:11:38Z scribe $ * * * Copyright 2003-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -36,7 +36,7 @@ namespace { class MyUserData : public BasicFilterUserData { public: bool osisQToTick; - bool BiblicalText; + bool isBiblicalText; bool inXRefNote; int suspendLevel; std::stack<char *> quoteStack; @@ -49,13 +49,14 @@ namespace { MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { inXRefNote = false; - BiblicalText = false; + isBiblicalText = false; suspendLevel = 0; + osisQToTick = true; // default if (module) { version = module->getName(); - BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false"))); } - osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false"))); } @@ -244,15 +245,9 @@ bool OSISRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us && (type != "strongsMarkup") // deprecated ) { SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); - VerseKey *vkey = NULL; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } - if (vkey) { + if (u->vkey) { char ch = ((!strcmp(type.c_str(), "crossReference")) || (!strcmp(type.c_str(), "x-cross-ref"))) ? 'x':'n'; - scratch.setFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->getVerse(), footnoteNumber.c_str()); + scratch.setFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, u->vkey->getVerse(), footnoteNumber.c_str()); outText(scratch.c_str(), buf, u); u->inXRefNote = (ch == 'x'); } diff --git a/src/modules/filters/osisscripref.cpp b/src/modules/filters/osisscripref.cpp index 99d6709..ec188d9 100644 --- a/src/modules/filters/osisscripref.cpp +++ b/src/modules/filters/osisscripref.cpp @@ -3,7 +3,7 @@ * osisscripref.cpp - SWFilter descendant to hide or show scripture * references in an OSIS module * - * $Id: osisscripref.cpp 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: osisscripref.cpp 3045 2014-03-02 07:53:52Z chrislit $ * * Copyright 2003-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/osisstrongs.cpp b/src/modules/filters/osisstrongs.cpp index b937883..0c17446 100644 --- a/src/modules/filters/osisstrongs.cpp +++ b/src/modules/filters/osisstrongs.cpp @@ -3,7 +3,7 @@ * osisstrongs.cpp - SWFilter descendant to hide or show Strong's number * in a OSIS module * - * $Id: osisstrongs.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: osisstrongs.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -57,7 +57,7 @@ char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod SWBuf token; bool intoken = false; int wordNum = 1; - char wordstr[5]; + char wordstr[11]; const char *wordStart = 0; SWBuf page = ""; // some modules include <seg> page info, so we add these to the words @@ -88,6 +88,15 @@ char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod if (token.startsWith("w ")) { // Word XMLTag wtag(token); + + // always save off lemma if we haven't yet + if (!wtag.getAttribute("savlm")) { + const char *l = wtag.getAttribute("lemma"); + if (l) { + wtag.setAttribute("savlm", l); + } + } + if (module->isProcessEntryAttributes()) { wordStart = from+1; char gh = 0; @@ -117,7 +126,7 @@ char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod const char *m = strchr(attrib, ':'); if (m) { - int len = m-attrib; + int len = (int)(m-attrib); mClass.append(attrib, len); attrib += (len+1); } @@ -138,19 +147,19 @@ char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod } while (++i < count); } - if ((attrib = wtag.getAttribute("lemma"))) { - int count = wtag.getAttributePartCount("lemma", ' '); + if ((attrib = wtag.getAttribute("savlm"))) { + int count = wtag.getAttributePartCount("savlm", ' '); int i = (count > 1) ? 0 : -1; // -1 for whole value cuz it's faster, but does the same thing as 0 do { gh = 0; SWBuf lClass = ""; SWBuf l = ""; - attrib = wtag.getAttribute("lemma", i, ' '); + attrib = wtag.getAttribute("savlm", i, ' '); if (i < 0) i = 0; // to handle our -1 condition const char *m = strchr(attrib, ':'); if (m) { - int len = m-attrib; + int len = (int)(m-attrib); lClass.append(attrib, len); attrib += (len+1); } @@ -217,7 +226,7 @@ char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod if (wtag.isEmpty()) { int j; - for (j = token.length()-1; ((j>0) && (strchr(" /", token[j]))); j--); + for (j = (int)token.length()-1; ((j>0) && (strchr(" /", token[j]))); j--); token.size(j+1); } @@ -232,35 +241,27 @@ char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod wordNum++; } + // if we won't want strongs, then lets get them out of lemma if (!option) { -/* - * Code which handles multiple lemma types. Kindof works but breaks at least WEBIF filters for strongs. - * int count = wtag.getAttributePartCount("lemma", ' '); - for (int i = 0; i < count; i++) { + for (int i = 0; i < count; ++i) { SWBuf a = wtag.getAttribute("lemma", i, ' '); const char *prefix = a.stripPrefix(':'); if ((prefix) && (!strcmp(prefix, "x-Strongs") || !strcmp(prefix, "strong") || !strcmp(prefix, "Strong"))) { // remove attribute part wtag.setAttribute("lemma", 0, i, ' '); - i--; - count--; + --i; + --count; } } -* Instead the codee below just removes the lemma attribute -*****/ - const char *l = wtag.getAttribute("lemma"); - if (l) { - SWBuf savlm = l; - wtag.setAttribute("lemma", 0); - wtag.setAttribute("savlm", savlm); - token = wtag; - token.trim(); - // drop <> - token << 1; - token--; - } + + } + token = wtag; + token.trim(); + // drop <> + token << 1; + token--; } if (token.startsWith("/w")) { // Word End if (module->isProcessEntryAttributes()) { diff --git a/src/modules/filters/osiswebif.cpp b/src/modules/filters/osiswebif.cpp index 4894777..2aa80a7 100644 --- a/src/modules/filters/osiswebif.cpp +++ b/src/modules/filters/osiswebif.cpp @@ -3,7 +3,7 @@ * osiswebif.cpp - OSIS to HTML filter with hrefs for strongs and * morph tags * - * $Id: osiswebif.cpp 3285 2014-12-03 06:14:50Z greg.hellings $ + * $Id: osiswebif.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -83,7 +83,7 @@ bool OSISWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * if ((attrib = tag.getAttribute("gloss"))) { val = strchr(attrib, ':'); val = (val) ? (val + 1) : attrib; - buf.appendFormatted(" %s", val); +// buf.appendFormatted(" %s", val); } if ((attrib = tag.getAttribute("lemma"))) { int count = tag.getAttributePartCount("lemma", ' '); @@ -144,15 +144,9 @@ bool OSISWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * if (!strongsMarkup) { // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); SWBuf modName = (u->module) ? u->module->getName() : ""; - VerseKey *vkey = NULL; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } - if (vkey) { + if (u->vkey) { char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); -// buf.appendFormatted("<a href=\"noteID=%s.%c.%s\"><small><sup>*%c</sup></small></a> ", vkey->getText(), ch, footnoteNumber.c_str(), ch); +// buf.appendFormatted("<a href=\"noteID=%s.%c.%s\"><small><sup>*%c</sup></small></a> ", u->vkey->getText(), ch, footnoteNumber.c_str(), ch); buf.appendFormatted("<span class=\"fn\" onclick=\"f(\'%s\',\'%s\',\'%s\');\" >%c</span>", modName.c_str(), u->key->getText(), footnoteNumber.c_str(), ch); } } diff --git a/src/modules/filters/osiswordjs.cpp b/src/modules/filters/osiswordjs.cpp index 75946a8..2da57c9 100644 --- a/src/modules/filters/osiswordjs.cpp +++ b/src/modules/filters/osiswordjs.cpp @@ -2,7 +2,7 @@ * * osiswordjs.cpp - SWFilter descendant for ??? * - * $Id: osiswordjs.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: osiswordjs.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -66,7 +66,7 @@ char OSISWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu int tokpos = 0; bool intoken = false; int wordNum = 1; - char wordstr[5]; + char wordstr[11]; SWBuf modName = (module)?module->getName():""; // add TR to w src in KJV then remove this next line SWBuf wordSrcPrefix = (modName == "KJV")?SWBuf("TR"):modName; @@ -171,6 +171,10 @@ char OSISWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu // 'p' = 'fillpop' to save bandwidth text.appendFormatted("<span class=\"clk\" onclick=\"p('%s','%s','%s','%s','%s','%s');\" >", lexName.c_str(), lemma.c_str(), wordID.c_str(), morph.c_str(), page.c_str(), modName.c_str()); wordNum++; + + if (wtag.isEmpty()) { + text += "</w></span>"; + } } if ((*token == '/') && (token[1] == 'w') && option) { // Word text += "</w></span>"; @@ -185,9 +189,10 @@ char OSISWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; token[tokpos+2] = 0; + } } else { text.append(*from); diff --git a/src/modules/filters/osisxhtml.cpp b/src/modules/filters/osisxhtml.cpp index fb743e2..bfdb123 100644 --- a/src/modules/filters/osisxhtml.cpp +++ b/src/modules/filters/osisxhtml.cpp @@ -2,7 +2,7 @@ * * osisxhtml.cpp - Render filter for classed XHTML of an OSIS module * - * $Id: osisxhtml.cpp 3290 2014-12-04 04:54:52Z greg.hellings $ + * $Id: osisxhtml.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2011-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -37,15 +37,25 @@ const char *OSISXHTML::getHeader() const { const static char *header = "\ .divineName { font-variant: small-caps; }\n\ .wordsOfJesus { color: red; }\n\ - .transChangeSupplied { font-style: italic; }\n\ - .overline { text-decoration: overline; }\n\ - .indent1 { margin-left: 10px }\n\ - .indent2 { margin-left: 20px }\n\ - .indent3 { margin-left: 30px }\n\ - .indent4 { margin-left: 40px }\n\ + .transChange { font-style: italic; }\n\ + .transChange.transChange-supplied { font-style: italic; }\n\ + .transChange.transChange-added { font-style: italic; }\n\ + .transChange.transChange-tenseChange::before { content: '*'; }\n\ + .transChange.transChange-tenseChange { font-style: normal; }\n\ + .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; }\n\ + .overline { text-decoration: overline; }\n\ + .indent1 { margin-left: 1em; }\n\ + .indent2 { margin-left: 2em; }\n\ + .indent3 { margin-left: 3em; }\n\ + .indent4 { margin-left: 4em; }\n\ + abbr { &:hover{ &:before{ content: attr(title); } } }\n\ .small-caps { font-variant: small-caps; }\n\ .selah { text-align: right; width: 50%; margin: 0; padding: 0; }\n\ .acrostic { text-align: center; }\n\ + .colophon {font-style: italic; font-size: small; display: block; }\n\ + .rdg { font-style: italic; }\n\ + .catchWord {font-style: bold; }\n\ + .x-p-indent {text-indent: 1em; }\n\ "; // Acrostic for things like the titles in Psalm 119 return header; @@ -67,14 +77,19 @@ void processLemma(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) { int i = (count > 1) ? 0 : -1; // -1 for whole value cuz it's faster, but does the same thing as 0 do { attrib = tag.getAttribute("lemma", i, ' '); + SWBuf at = attrib; + const char *prefix = at.stripPrefix(':'); if (i < 0) i = 0; // to handle our -1 condition val = strchr(attrib, ':'); val = (val) ? (val + 1) : attrib; SWBuf gh; - if(*val == 'G') + if (*val == 'G') { gh = "Greek"; - if(*val == 'H') + } + else if (*val == 'H') { gh = "Hebrew"; + } + else if (prefix) gh = prefix; const char *val2 = val; if ((strchr("GH", *val)) && (isdigit(val[1]))) val2++; @@ -82,7 +97,7 @@ void processLemma(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) { // show = false; //else { if (!suspendTextPassThru) { - buf.appendFormatted("<small><em class=\"strongs\"><<a href=\"passagestudy.jsp?action=showStrongs&type=%s&value=%s\" class=\"strongs\">%s</a>></em></small>", + buf.appendFormatted("<small><em class=\"strongs\"><<a class=\"strongs\" href=\"passagestudy.jsp?action=showStrongs&type=%s&value=%s\" class=\"strongs\">%s</a>></em></small>", (gh.length()) ? gh.c_str() : "", URL::encode(val2).c_str(), val2); @@ -114,7 +129,7 @@ void processMorph(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) { if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2]))) val2+=2; if (!suspendTextPassThru) { - buf.appendFormatted("<small><em class=\"morph\">(<a href=\"passagestudy.jsp?action=showMorph&type=%s&value=%s\" class=\"morph\">%s</a>)</em></small>", + buf.appendFormatted("<small><em class=\"morph\">(<a class=\"morph\" href=\"passagestudy.jsp?action=showMorph&type=%s&value=%s\" class=\"morph\">%s</a>)</em></small>", URL::encode(tag.getAttribute("morph")).c_str(), URL::encode(val).c_str(), val2); @@ -165,18 +180,16 @@ OSISXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : Ba suspendLevel = 0; wordsOfChristStart = "<span class=\"wordsOfJesus\"> "; wordsOfChristEnd = "</span> "; - interModuleLinkStart = "<a href=\"sword://%s/%s\">"; + interModuleLinkStart = "<a class=\"%s\" href=\"sword://%s/%s\">"; interModuleLinkEnd = "</a>"; + isBiblicalText = false; + osisQToTick = true; // default + consecutiveNewlines = 0; if (module) { osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false"))); version = module->getName(); - BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } - else { - osisQToTick = true; // default - version = ""; - } - consecutiveNewlines = 0; } OSISXHTML::MyUserData::~MyUserData() { @@ -186,9 +199,17 @@ OSISXHTML::MyUserData::~MyUserData() { delete lineStack; } + void OSISXHTML::MyUserData::outputNewline(SWBuf &buf) { if (++consecutiveNewlines <= 2) { - outText("<br />\n", buf, this); + // any newlines at the start of a verse should get appended to a preverse heading + // since preverse cause a newline, simply be sure we have a preverse + if (!buf.size() && vkey && vkey->getVerse() && module && module->isProcessEntryAttributes()) { + module->getEntryAttributes()["Heading"]["Preverse"]["0"] += "<div></div>"; + } + else { + outText("<br />\n", buf, this); + } supressAdjacentWhitespace = true; } } @@ -235,9 +256,9 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * outText("<ruby><rb>", buf, u); outText(lastText, buf, u); + outText("</rb><rp>(</rp><rt>", buf, u); val = strchr(attrib, ':'); val = (val) ? (val + 1) : attrib; - outText("</rb><rp>(</rp><rt>", buf, u); outText(val, buf, u); outText("</rt><rp>)</rp></ruby>", buf, u); } @@ -257,7 +278,7 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * } /*if (endTag) - buf += "}";*/ + outText( "}", buf, u);*/ } } @@ -265,6 +286,16 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * else if (!strcmp(tag.getName(), "note")) { if (!tag.isEndTag()) { SWBuf type = tag.getAttribute("type"); + SWBuf subType = tag.getAttribute("subType"); + SWBuf classExtras = ""; + + if (type.size()) { + classExtras.append(" ").append(type); + } + if (subType.size()) { + classExtras.append(" ").append(subType); + } + bool strongsMarkup = (type == "x-strongsMarkup" || type == "strongsMarkup"); // the latter is deprecated if (strongsMarkup) { tag.setEmpty(false); // handle bug in KJV2003 module where some note open tags were <note ... /> @@ -275,30 +306,26 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * if (!strongsMarkup) { // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); SWBuf noteName = tag.getAttribute("n"); - VerseKey *vkey = NULL; char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); u->inXRefNote = true; // Why this change? Ben Morgan: Any note can have references in, so we need to set this to true for all notes // u->inXRefNote = (ch == 'x'); - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } - if (vkey) { - //printf("URL = %s\n",URL::encode(vkey->getText()).c_str()); - buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", + if (u->vkey) { + //printf("URL = %s\n",URL::encode(u->vkey->getText()).c_str()); + buf.appendFormatted("<a class=\"%s\" href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", + classExtras.c_str(), ch, URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey->getText()).c_str(), + URL::encode(u->vkey->getText()).c_str(), ch, ch, (renderNoteNumbers ? noteName.c_str() : "")); } else { - buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", + buf.appendFormatted("<a class=\"%s\" href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", + classExtras.c_str(), ch, URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), @@ -314,11 +341,11 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * if (tag.isEndTag()) { u->suspendTextPassThru = (--u->suspendLevel); u->inXRefNote = false; - u->lastSuspendSegment = ""; // fix/work-around for nasb devineName in note bug + u->lastSuspendSegment = ""; // fix/work-around for nasb divineName in note bug } } - // <p> paragraph and <lg> linegroup tags + // <p> paragraph and <lg> linegroup tags except newline at start of verse (immediately after verse number) else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) { if ((!tag.isEndTag()) && (!tag.isEmpty())) { // non-empty start tag u->outputNewline(buf); @@ -334,14 +361,24 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * // Milestoned paragraphs, created by osis2mod // <div type="paragraph" sID.../> // <div type="paragraph" eID.../> - else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && (!strcmp(tag.getAttribute("type"), "x-p") || !strcmp(tag.getAttribute("type"), "paragraph"))) { + else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && (!strcmp(tag.getAttribute("type"), "x-p") || !strcmp(tag.getAttribute("type"), "paragraph") || !strcmp(tag.getAttribute("type"), "colophon"))) { // <div type="paragraph" sID... /> if (tag.getAttribute("sID")) { // non-empty start tag u->outputNewline(buf); + // safe because we've verified type is present from if statement above + if (!strcmp(tag.getAttribute("type"), "colophon")) { + outText("<div class=\"colophon\">", buf, u); + } + } // <div type="paragraph" eID... /> else if (tag.getAttribute("eID")) { u->outputNewline(buf); + // safe because we've verified type is present from if statement above + if (!strcmp(tag.getAttribute("type"), "colophon")) { + outText("</div>", buf, u); + } + } } @@ -352,10 +389,18 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * SWBuf target; SWBuf work; SWBuf ref; + SWBuf type; + SWBuf classes = ""; + bool is_scripRef = false; target = tag.getAttribute("osisRef"); const char* the_ref = strchr(target, ':'); + type = tag.getAttribute("type"); + + if (type.size()) { + classes.append(type); + } if(!the_ref) { // No work @@ -377,7 +422,8 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * if(is_scripRef) { - buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=\">", + buf.appendFormatted("<a class=\"%s\" href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=\">", + classes.c_str(), URL::encode(ref.c_str()).c_str() // (work.size()) ? URL::encode(work.c_str()).c_str() : "") ); @@ -385,7 +431,8 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * else { // Dictionary link, or something - buf.appendFormatted(u->interModuleLinkStart, + buf.appendFormatted(u->interModuleLinkStart, + classes.c_str(), URL::encode(work.c_str()).c_str(), URL::encode(ref.c_str()).c_str() ); @@ -440,18 +487,20 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * // <milestone type="x-p"/> // <milestone type="cQuote" marker="x"/> else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type"))) { - if (!strcmp(tag.getAttribute("type"), "line")) { + // safe because we've verified type is present from if statement above + const char *type = tag.getAttribute("type"); + if (!strcmp(type, "line")) { u->outputNewline(buf); if (tag.getAttribute("subType") && !strcmp(tag.getAttribute("subType"), "x-PM")) { u->outputNewline(buf); } } - else if (!strcmp(tag.getAttribute("type"),"x-p")) { + else if (!strcmp(type,"x-p")) { if (tag.getAttribute("marker")) outText(tag.getAttribute("marker"), buf, u); else outText("<!p>", buf, u); } - else if (!strcmp(tag.getAttribute("type"), "cQuote")) { + else if (!strcmp(type, "cQuote")) { const char *tmp = tag.getAttribute("marker"); bool hasMark = tmp; SWBuf mark = tmp; @@ -465,41 +514,55 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * else if (u->osisQToTick) outText((level % 2) ? '\"' : '\'', buf, u); } + else if (!strcmp(type, "x-importer")) { + //drop tag as not relevant + } + + + else { + SWBuf type = tag.getAttribute("type"); + outText(SWBuf("<span class=\"") + type + "\"/>", buf,u); + } } // <title> else if (!strcmp(tag.getName(), "title")) { if ((!tag.isEndTag()) && (!tag.isEmpty())) { SWBuf type = tag.getAttribute("type"); - bool keepType = false; + SWBuf canonical = tag.getAttribute("canonical"); + + SWBuf classExtras = ""; + if (type.size()) { - keepType = true; - } - VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, u->key); - if (vkey && !vkey->getVerse()) { - if (!vkey->getChapter()) { - if (!vkey->getBook()) { - if (!vkey->getTestament()) { - buf += SWBuf("<h1 class=\"moduleHeader ") + (keepType ? type : "") + "\">"; + classExtras.append(" ").append(type); + } + if (canonical.size() && !strcmp(canonical,"true")) { + classExtras.append(" canonical"); + } + if (u->vkey && !u->vkey->getVerse()) { + if (!u->vkey->getChapter()) { + if (!u->vkey->getBook()) { + if (!u->vkey->getTestament()) { + outText(SWBuf("<h1 class=\"moduleHeader") + classExtras + "\">", buf, u); tag.setAttribute("pushed", "h1"); } else { - buf += SWBuf("<h1 class=\"testamentHeader ") + (keepType ? type : "") + "\">"; + outText(SWBuf("<h1 class=\"testamentHeader") + classExtras + "\">", buf, u); tag.setAttribute("pushed", "h1"); } } else { - buf += SWBuf("<h1 class=\"bookHeader ") + (keepType ? type : "") + "\">"; + outText(SWBuf("<h1 class=\"bookHeader") + classExtras + "\">", buf, u); tag.setAttribute("pushed", "h1"); } } else { - buf += SWBuf("<h2 class=\"chapterHeader ") + (keepType ? type : "") + "\">"; + outText(SWBuf("<h2 class=\"chapterHeader") + classExtras + "\">", buf, u); tag.setAttribute("pushed", "h2"); } } else { - buf += SWBuf("<h3 class=\"") + (keepType ? type : "") + "\">"; + outText(SWBuf("<h3 class=\"title") + classExtras + "\">", buf, u); tag.setAttribute("pushed", "h3"); } u->titleStack->push(tag.toString()); @@ -510,10 +573,10 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * if (u->titleStack->size()) u->titleStack->pop(); SWBuf pushed = tag.getAttribute("pushed"); if (pushed.size()) { - buf += (SWBuf)"</" + pushed + ">\n\n"; + outText((SWBuf)"</" + pushed + ">\n\n", buf, u); } else { - buf += "</h3>\n\n"; + outText( "</h3>\n\n", buf, u); } ++u->consecutiveNewlines; u->supressAdjacentWhitespace = true; @@ -547,10 +610,12 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * // <catchWord> & <rdg> tags (italicize) else if (!strcmp(tag.getName(), "rdg") || !strcmp(tag.getName(), "catchWord")) { if ((!tag.isEndTag()) && (!tag.isEmpty())) { - outText("<i>", buf, u); + outText("<span class=\"", buf, u); + outText(tag.getName(), buf, u); + outText("\">", buf, u); } else if (tag.isEndTag()) { - outText("</i>", buf, u); + outText("</span>", buf, u); } } @@ -617,7 +682,7 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * else if (type == "ol") { outText("</span>", buf, u); } - else if (type == "sup") { + else if (type == "super") { outText("</sup>", buf, u); } else if (type == "sub") { @@ -700,17 +765,16 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * if ((!tag.isEndTag()) && (!tag.isEmpty())) { SWBuf type = tag.getAttribute("type"); u->lastTransChange = type; - - // just do all transChange tags this way for now - if ((type == "added") || (type == "supplied")) - outText("<span class=\"transChangeSupplied\">", buf, u); - else if (type == "tenseChange") - buf += "*"; + + outText("<span class=\"transChange", buf, u); + if (type.length()) { + outText(" transChange-", buf, u); + outText(type, buf, u); + } + outText("\">", buf, u); } else if (tag.isEndTag()) { - SWBuf type = u->lastTransChange; - if ((type == "added") || (type == "supplied")) - outText("</span>", buf, u); + outText("</span>", buf, u); } else { // empty transChange marker? } @@ -754,22 +818,42 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * } else if (type == "majorSection") { } - else { - buf += tag; + else if ((!tag.isEndTag()) && (!tag.isEmpty())) { + SWBuf type = tag.getAttribute("type"); + outText("<div class=\"", buf, u); + outText(type, buf, u); + outText("\">", buf, u); + } + else if (tag.isEndTag()) { + outText("</div>", buf, u); } + else if (!(type == "colophon")) outText(tag, buf, u); + } else if (!strcmp(tag.getName(), "span")) { - buf += tag; + outText(tag, buf, u); + } + else if (!strcmp(tag.getName(), "abbr")) { + if (!tag.isEndTag()) { + SWBuf title = tag.getAttribute("expansion"); + outText("<abbr title=\"", buf, u); + outText(title, buf, u); + outText("\">", buf, u); + } + else if (tag.isEndTag()) { + outText("</abbr>", buf, u); + } + } else if (!strcmp(tag.getName(), "br")) { - buf += tag; + outText( tag, buf, u); } else if (!strcmp(tag.getName(), "table")) { if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf += "<table><tbody>\n"; + outText( "<table><tbody>\n", buf, u); } else if (tag.isEndTag()) { - buf += "</tbody></table>\n"; + outText( "</tbody></table>\n", buf, u); ++u->consecutiveNewlines; u->supressAdjacentWhitespace = true; } @@ -777,19 +861,19 @@ bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * } else if (!strcmp(tag.getName(), "row")) { if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf += "\t<tr>"; + outText( "\t<tr>", buf, u); } else if (tag.isEndTag()) { - buf += "</tr>\n"; + outText( "</tr>\n", buf, u); } } else if (!strcmp(tag.getName(), "cell")) { if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf += "<td>"; + outText( "<td>", buf, u); } else if (tag.isEndTag()) { - buf += "</td>"; + outText( "</td>", buf, u); } } else { diff --git a/src/modules/filters/rtfhtml.cpp b/src/modules/filters/rtfhtml.cpp index df02f38..81a38ea 100644 --- a/src/modules/filters/rtfhtml.cpp +++ b/src/modules/filters/rtfhtml.cpp @@ -2,7 +2,7 @@ * * rtfhtml.cpp - filter to convert RTF to HTML * - * $Id: rtfhtml.cpp 2981 2013-09-15 00:05:26Z scribe $ + * $Id: rtfhtml.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1999 The team of Bibletime (info@bibletime.de) * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) @@ -55,7 +55,7 @@ char RTFHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) num.append(from, end-from); __s16 n = atoi(num.c_str()); __u32 u = (__u16)n; - text.append(getUTF8FromUniChar(u)); + getUTF8FromUniChar(u, &text); from += (end-from); continue; } diff --git a/src/modules/filters/scsuutf8.cpp b/src/modules/filters/scsuutf8.cpp index c68ea1f..73e4a3f 100644 --- a/src/modules/filters/scsuutf8.cpp +++ b/src/modules/filters/scsuutf8.cpp @@ -3,9 +3,9 @@ * scsuutf8.cpp - SWFilter descendant to convert a SCSU character to * UTF-8 * - * $Id: scsuutf8.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: scsuutf8.cpp 3472 2017-05-22 04:19:02Z scribe $ * - * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,223 +23,240 @@ /* This class is based on: * http://czyborra.com/scsu/scsu.c written by Roman Czyborra@dds.nl - * on Andrea's balcony in North Amsterdam on 1998-08-04 - * Thanks to Richard Verhoeven <rcb5@win.tue.nl> for his suggestion - * to correct the haphazard "if" after UQU to "else if" on 1998-10-01 - * + * * This is a deflator to UTF-8 output for input compressed in SCSU, * the (Reuters) Standard Compression Scheme for Unicode as described * in http://www.unicode.org/unicode/reports/tr6.html */ -#include <stdlib.h> -#include <stdio.h> -#include <swmodule.h> - #include <scsuutf8.h> +#include <swbuf.h> +#ifdef _ICU_ +#include <unicode/unistr.h> +#endif + SWORD_NAMESPACE_START SCSUUTF8::SCSUUTF8() { +#ifdef _ICU_ + // initialize SCSU converter + scsuConv = ucnv_open("SCSU", &err); + // initialize UTF-8 converter + utf8Conv = ucnv_open("UTF-8", &err); +#else + active = 0; + mode = 0; +#endif } - -unsigned char* SCSUUTF8::UTF8Output(unsigned long uchar, unsigned char* text) -{ - /* join UTF-16 surrogates without any pairing sanity checks */ - - static int d; - - if (uchar >= 0xd800 && uchar <= 0xdbff) { d = uchar & 0x3f; return text; } - if (uchar >= 0xdc00 && uchar <= 0xdfff) { uchar = uchar + 0x2400 + d * 0x400; } - - /* output one character as UTF-8 multibyte sequence */ - - if (uchar < 0x80) { - *text++ = c; - } - else if (uchar < 0x800) { - *text++ = 0xc0 | uchar >> 6; - *text++ = 0x80 | (uchar & 0x3f); - } - else if (uchar < 0x10000) { - *text++ = 0xe0 | uchar >> 12; - *text++ = 0x80 | (uchar >> 6 & 0x3f); - *text++ = 0x80 | (uchar & 0x3f); - } - else if (uchar < 0x200000) { - *text++ = 0xf0 | uchar >> 18; - *text++ = 0x80 | (uchar >> 12 & 0x3f); - *text++ = 0x80 | (uchar >> 6 & 0x3f); - *text++ = 0x80 | (uchar & 0x3f); - } - - return text; +SCSUUTF8::~SCSUUTF8() { +#ifdef _ICU_ + ucnv_close(scsuConv); + ucnv_close(utf8Conv); +#endif } - -char SCSUUTF8::processText(SWBuf &text, const SWKey *key, const SWModule *module) { -/* - unsigned char *to, *from; - unsigned long buflen = len * FILTERPAD; - char active = 0, mode = 0; - if ((unsigned long)key < 2) // hack, we're en(1)/de(0)ciphering - return -1; - - static unsigned short start[8] = {0x0000,0x0080,0x0100,0x0300,0x2000,0x2080,0x2100,0x3000}; - static unsigned short slide[8] = {0x0080,0x00C0,0x0400,0x0600,0x0900,0x3040,0x30A0,0xFF00}; - static unsigned short win[256] = { - 0x0000, 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380, - 0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, - 0x0800, 0x0880, 0x0900, 0x0980, 0x0A00, 0x0A80, 0x0B00, 0x0B80, - 0x0C00, 0x0C80, 0x0D00, 0x0D80, 0x0E00, 0x0E80, 0x0F00, 0x0F80, - 0x1000, 0x1080, 0x1100, 0x1180, 0x1200, 0x1280, 0x1300, 0x1380, - 0x1400, 0x1480, 0x1500, 0x1580, 0x1600, 0x1680, 0x1700, 0x1780, - 0x1800, 0x1880, 0x1900, 0x1980, 0x1A00, 0x1A80, 0x1B00, 0x1B80, - 0x1C00, 0x1C80, 0x1D00, 0x1D80, 0x1E00, 0x1E80, 0x1F00, 0x1F80, - 0x2000, 0x2080, 0x2100, 0x2180, 0x2200, 0x2280, 0x2300, 0x2380, - 0x2400, 0x2480, 0x2500, 0x2580, 0x2600, 0x2680, 0x2700, 0x2780, - 0x2800, 0x2880, 0x2900, 0x2980, 0x2A00, 0x2A80, 0x2B00, 0x2B80, - 0x2C00, 0x2C80, 0x2D00, 0x2D80, 0x2E00, 0x2E80, 0x2F00, 0x2F80, - 0x3000, 0x3080, 0x3100, 0x3180, 0x3200, 0x3280, 0x3300, 0x3800, - 0xE000, 0xE080, 0xE100, 0xE180, 0xE200, 0xE280, 0xE300, 0xE380, - 0xE400, 0xE480, 0xE500, 0xE580, 0xE600, 0xE680, 0xE700, 0xE780, - 0xE800, 0xE880, 0xE900, 0xE980, 0xEA00, 0xEA80, 0xEB00, 0xEB80, - 0xEC00, 0xEC80, 0xED00, 0xED80, 0xEE00, 0xEE80, 0xEF00, 0xEF80, - 0xF000, 0xF080, 0xF100, 0xF180, 0xF200, 0xF280, 0xF300, 0xF380, - 0xF400, 0xF480, 0xF500, 0xF580, 0xF600, 0xF680, 0xF700, 0xF780, - 0xF800, 0xF880, 0xF900, 0xF980, 0xFA00, 0xFA80, 0xFB00, 0xFB80, - 0xFC00, 0xFC80, 0xFD00, 0xFD80, 0xFE00, 0xFE80, 0xFF00, 0xFF80, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x00C0, 0x0250, 0x0370, 0x0530, 0x3040, 0x30A0, 0xFF60 - }; - - if (!len) - return 0; - - memmove(&text[buflen - len], text, len); - from = (unsigned char*)&text[buflen - len]; - to = (unsigned char *)text; - - // ------------------------------- - - for (int i = 0; i < len;) { - - - if (i >= len) break; - c = from[i++]; - - if (c >= 0x80) - { - to = UTF8Output (c - 0x80 + slide[active], to); +#ifndef _ICU_ +unsigned short SCSUUTF8::start[] = {0x0000,0x0080,0x0100,0x0300,0x2000,0x2080,0x2100,0x3000}; +unsigned short SCSUUTF8::slide[] = {0x0080,0x00C0,0x0400,0x0600,0x0900,0x3040,0x30A0,0xFF00}; +unsigned short SCSUUTF8::win[] = { + 0x0000, 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380, + 0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, + 0x0800, 0x0880, 0x0900, 0x0980, 0x0A00, 0x0A80, 0x0B00, 0x0B80, + 0x0C00, 0x0C80, 0x0D00, 0x0D80, 0x0E00, 0x0E80, 0x0F00, 0x0F80, + 0x1000, 0x1080, 0x1100, 0x1180, 0x1200, 0x1280, 0x1300, 0x1380, + 0x1400, 0x1480, 0x1500, 0x1580, 0x1600, 0x1680, 0x1700, 0x1780, + 0x1800, 0x1880, 0x1900, 0x1980, 0x1A00, 0x1A80, 0x1B00, 0x1B80, + 0x1C00, 0x1C80, 0x1D00, 0x1D80, 0x1E00, 0x1E80, 0x1F00, 0x1F80, + 0x2000, 0x2080, 0x2100, 0x2180, 0x2200, 0x2280, 0x2300, 0x2380, + 0x2400, 0x2480, 0x2500, 0x2580, 0x2600, 0x2680, 0x2700, 0x2780, + 0x2800, 0x2880, 0x2900, 0x2980, 0x2A00, 0x2A80, 0x2B00, 0x2B80, + 0x2C00, 0x2C80, 0x2D00, 0x2D80, 0x2E00, 0x2E80, 0x2F00, 0x2F80, + 0x3000, 0x3080, 0x3100, 0x3180, 0x3200, 0x3280, 0x3300, 0x3800, + 0xE000, 0xE080, 0xE100, 0xE180, 0xE200, 0xE280, 0xE300, 0xE380, + 0xE400, 0xE480, 0xE500, 0xE580, 0xE600, 0xE680, 0xE700, 0xE780, + 0xE800, 0xE880, 0xE900, 0xE980, 0xEA00, 0xEA80, 0xEB00, 0xEB80, + 0xEC00, 0xEC80, 0xED00, 0xED80, 0xEE00, 0xEE80, 0xEF00, 0xEF80, + 0xF000, 0xF080, 0xF100, 0xF180, 0xF200, 0xF280, 0xF300, 0xF380, + 0xF400, 0xF480, 0xF500, 0xF580, 0xF600, 0xF680, 0xF700, 0xF780, + 0xF800, 0xF880, 0xF900, 0xF980, 0xFA00, 0xFA80, 0xFB00, 0xFB80, + 0xFC00, 0xFC80, 0xFD00, 0xFD80, 0xFE00, 0xFE80, 0xFF00, 0xFF80, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00C0, 0x0250, 0x0370, 0x0530, 0x3040, 0x30A0, 0xFF60, +}; + +int SCSUUTF8::UTF8Output(unsigned long uchar, SWBuf* utf8Buf) +{ + // join UTF-16 surrogates without any pairing sanity checks + if (uchar >= 0xd800 && uchar <= 0xdbff) { + d = uchar & 0x3ff; + return 0; } - else if (c >= 0x20 && c <= 0x7F) - { - to = UTF8Output (c, to); + if (uchar >= 0xdc00 && uchar <= 0xdfff) { + uchar = uchar + 0x2400 + d * 0x400; } - else if (c == 0x0 || c == 0x9 || c == 0xA || c == 0xC || c == 0xD) - { - to = UTF8Output (c, to); + + // output one character as UTF-8 multibyte sequence + + if (uchar < 0x80) { + utf8Buf += uchar; } - else if (c >= 0x1 && c <= 0x8) // SQn - { - if (i >= len) break; - d = from[i++]; // single quote - - to = UTF8Output (d < 0x80 ? d + start [c - 0x1] : - d - 0x80 + slide [c - 0x1], to); + else if (uchar < 0x800) { + utf8Buf += (0xc0 | (uchar>>6)); + utf8Buf += (0x80 | (uchar & 0x3f)); } - else if (c >= 0x10 && c <= 0x17) // SCn - { - active = c - 0x10; // change window + else if (uchar < 0x10000) { + utf8Buf += (0xe0 | (uchar>>12)); + utf8Buf += (0x80 | (uchar>>6 & 0x3f)); + utf8Buf += (0x80 | (uchar & 0x3f)); } - else if (c >= 0x18 && c <= 0x1F) // SDn - { - active = c - 0x18; // define window - if (i >= len) break; - slide [active] = win [from[i++]]; + else if (uchar < 0x200000) { + utf8Buf += (0xf0 | (uchar>>18)); + utf8Buf += (0x80 | (uchar>>12 & 0x3f)); + utf8Buf += (0x80 | (uchar>>6 & 0x3f)); + utf8Buf += (0x80 | (uchar & 0x3f)); } - else if (c == 0xB) // SDX - { - if (i >= len) break; - c = from[i++]; - - if (i >= len) break; - d = from[i++]; + + return 0; +} +#endif - slide [active = c>>5] = 0x10000 + (((c & 0x1F) << 8 | d) << 7); +char SCSUUTF8::processText(SWBuf &text, const SWKey *key, const SWModule *module) { + if ((unsigned long)key < 2) // hack, we're en(1)/de(0)ciphering + return -1; + +#ifdef _ICU_ + // Try decoding with ICU if possible + err = U_ZERO_ERROR; + UnicodeString utf16Text(text.getRawData(), text.length(), scsuConv, err); + err = U_ZERO_ERROR; + int32_t len = utf16Text.extract(text.getRawData(), text.size(), utf8Conv, err); + if (len > (int32_t)text.size()+1) { + text.setSize(len+1); + utf16Text.extract(text.getRawData(), text.size(), utf8Conv, err); } - else if (c == 0xE) // SQU - { +#else + // If ICU is unavailable, decode using Czyborra's decoder + SWBuf utf8Buf = ""; + int len = text.length(); + const char* scsuString = text.c_str(); + + for (int i = 0; i < len;) { + if (i >= len) break; - c = from[i++]; // SQU - - if (i >= len) break; - to = UTF8Output (c << 8 | from[i++], to); + c = scsuString[i++]; + + if (c >= 0x80) + { + UTF8Output(c - 0x80 + slide[active], &utf8Buf); } - else if (c == 0xF) // SCU - { - mode = 1; // change to Unicode mode - - while (mode) - { - if (i >= len) break; - c = from[i++]; - - if (c <= 0xDF || c >= 0xF3) + else if (c >= 0x20 && c <= 0x7F) { - if (i >= len) break; - to = UTF8Output (c << 8 | from[i++], to); + UTF8Output(c, &utf8Buf); } - else if (c == 0xF0) // UQU + else if (c == 0x0 || c == 0x9 || c == 0xA || c == 0xC || c == 0xD) { - if (i >= len) break; - c = from[i++]; - - if (i >= len) break; - to = UTF8Output (c << 8 | from[i++], to); + UTF8Output(c, &utf8Buf); } - else if (c >= 0xE0 && c <= 0xE7) // UCn + else if (c >= 0x1 && c <= 0x8) // SQn { - active = c - 0xE0; mode = 0; + if (i >= len) break; + d = scsuString[i++]; // single quote + + UTF8Output(d < 0x80 ? d + start[c - 0x1] : + d - 0x80 + slide[c - 0x1], &utf8Buf); } - else if (c >= 0xE8 && c <= 0xEF) // UDn + else if (c >= 0x10 && c <= 0x17) // SCn { - if (i >= len) break; - slide [active=c-0xE8] = win [from[i++]]; mode = 0; + active = c - 0x10; // change window } - else if (c == 0xF1) // UDX + else if (c >= 0x18 && c <= 0x1F) // SDn { - if (i >= len) break; - c = from[i++]; - - if (i >= len) break; - d = from[i++]; - - slide [active = c>>5] = - 0x10000 + (((c & 0x1F) << 8 | d) << 7); mode = 0; + active = c - 0x18; // define window + if (i >= len) break; + slide[active] = win[(unsigned char)scsuString[i++]]; + } + else if (c == 0xB) // SDX + { + if (i >= len) break; + c = scsuString[i++]; + + if (i >= len) break; + d = scsuString[i++]; + + slide[active = c>>5] = 0x10000 + (((c & 0x1F) << 8 | d) << 7); + } + else if (c == 0xE) // SQU + { + if (i >= len) break; + c = scsuString[i++]; // SQU + + if (i >= len) break; + UTF8Output(c << 8 | scsuString[i++], &utf8Buf); + } + else if (c == 0xF) // SCU + { + mode = 1; // change to Unicode mode + + while (mode) + { + if (i >= len) break; + c = scsuString[i++]; + + if (c <= 0xDF || c >= 0xF3) + { + if (i >= len) break; + UTF8Output(c << 8 | scsuString[i++], &utf8Buf); + } + else if (c == 0xF0) // UQU + { + if (i >= len) break; + c = scsuString[i++]; + + if (i >= len) break; + UTF8Output(c << 8 | scsuString[i++], &utf8Buf); + } + else if (c >= 0xE0 && c <= 0xE7) // UCn + { + active = c - 0xE0; + mode = 0; + } + else if (c >= 0xE8 && c <= 0xEF) // UDn + { + if (i >= len) break; + slide[active=c-0xE8] = win[(unsigned char)scsuString[i++]]; + mode = 0; + } + else if (c == 0xF1) // UDX + { + if (i >= len) break; + c = scsuString[i++]; + + if (i >= len) break; + d = scsuString[i++]; + + slide[active = c>>5] = + 0x10000 + (((c & 0x1F) << 8 | d) << 7); + mode = 0; + } + } } - } } - - - } - - *to++ = 0; - *to = 0; -*/ - return 0; +#endif + + return 0; } diff --git a/src/modules/filters/swbasicfilter.cpp b/src/modules/filters/swbasicfilter.cpp index e66017e..8e3ce0a 100644 --- a/src/modules/filters/swbasicfilter.cpp +++ b/src/modules/filters/swbasicfilter.cpp @@ -5,7 +5,7 @@ * many filters will need and can use as a starting * point. * - * $Id: swbasicfilter.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: swbasicfilter.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,7 @@ #include <stdarg.h> #include <utilstr.h> #include <stringmgr.h> +#include <versekey.h> #include <map> #include <set> @@ -54,6 +55,19 @@ const char SWBasicFilter::POSTCHAR = 4; const char SWBasicFilter::FINALIZE = 8; +BasicFilterUserData::BasicFilterUserData(const SWModule *module, const SWKey *key) { + this->module = module; + this->key = key; + suspendTextPassThru = false; + supressAdjacentWhitespace = false; + vkey = 0; + SWTRY { + vkey = SWDYNAMIC_CAST(VerseKey, key); + } + SWCATCH ( ... ) { } +} + + SWBasicFilter::SWBasicFilter() { p = new Private; @@ -383,6 +397,9 @@ char SWBasicFilter::processText(SWBuf &text, const SWKey *key, const SWModule *m } escEndPos = escStartPos = tokenEndPos = tokenStartPos = 0; lastTextNode = ""; + if (!userData->suspendTextPassThru) { + userData->lastSuspendSegment.size(0); + } continue; } } @@ -398,7 +415,6 @@ char SWBasicFilter::processText(SWBuf &text, const SWKey *key, const SWModule *m if ((!userData->supressAdjacentWhitespace) || (*from != ' ')) { if (!userData->suspendTextPassThru) { text.append(*from); - userData->lastSuspendSegment.size(0); } else userData->lastSuspendSegment.append(*from); lastTextNode.append(*from); diff --git a/src/modules/filters/teihtmlhref.cpp b/src/modules/filters/teihtmlhref.cpp index f08f994..443fd9c 100644 --- a/src/modules/filters/teihtmlhref.cpp +++ b/src/modules/filters/teihtmlhref.cpp @@ -2,7 +2,7 @@ * * teihtmlhref.cpp - TEI to HTML with hrefs filter * - * $Id: teihtmlhref.cpp 3160 2014-04-17 04:02:17Z greg.hellings $ + * $Id: teihtmlhref.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -33,10 +33,10 @@ SWORD_NAMESPACE_START TEIHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { - BiblicalText = false; + isBiblicalText = false; if (module) { version = module->getName(); - BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } } @@ -132,7 +132,7 @@ bool TEIHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData if (n != "") { buf += "<br /><b>"; buf += n; - buf += "</b>"; + buf += "</b> "; } } } @@ -221,7 +221,7 @@ bool TEIHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData // Compensate for starting : ref = the_ref + 1; - int size = target.size() - ref.size() - 1; + int size = (int)(target.size() - ref.size() - 1); work.setSize(size); strncpy(work.getRawData(), target, size); } @@ -275,6 +275,52 @@ bool TEIHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData u->suspendTextPassThru = false; } } + // <graphic> image tag + else if (!strcmp(tag.getName(), "graphic")) { + const char *url = tag.getAttribute("url"); + if (url) { // assert we have a url attribute + SWBuf filepath; + if (userData->module) { + filepath = userData->module->getConfigEntry("AbsoluteDataPath"); + if ((filepath.size()) && (filepath[filepath.size()-1] != '/') && (url[0] != '/')) + filepath += '/'; + } + filepath += url; + // images become clickable, if the UI supports showImage. + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showImage&value=%s&module=%s\"><img src=\"file:%s\" border=\"0\" /></a>", + URL::encode(filepath.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str(), + filepath.c_str()); + u->suspendTextPassThru = true; + } + } + // <table> <row> <cell> + else if (!strcmp(tag.getName(), "table")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "<table><tbody>\n"; + } + else if (tag.isEndTag()) { + buf += "</tbody></table>\n"; + u->supressAdjacentWhitespace = true; + } + + } + else if (!strcmp(tag.getName(), "row")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "\t<tr>"; + } + else if (tag.isEndTag()) { + buf += "</tr>\n"; + } + } + else if (!strcmp(tag.getName(), "cell")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "<td>"; + } + else if (tag.isEndTag()) { + buf += "</td>"; + } + } else { return false; // we still didn't handle token diff --git a/src/modules/filters/teilatex.cpp b/src/modules/filters/teilatex.cpp new file mode 100644 index 0000000..8b05107 --- /dev/null +++ b/src/modules/filters/teilatex.cpp @@ -0,0 +1,326 @@ +/*************************************************************************** + * + * teilatex.cpp - TEI to LATEX filter + * + * $Id: teilatex.cpp 3548 2017-12-10 05:11:38Z scribe $ + * + * Copyright 2012-2014 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 <stdlib.h> +#include <ctype.h> +#include <teilatex.h> +#include <utilxml.h> +#include <swmodule.h> +#include <url.h> +#include <iostream> + + +SWORD_NAMESPACE_START + + +TEILaTeX::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + isBiblicalText = false; + if (module) { + version = module->getName(); + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + } +} + + +TEILaTeX::TEILaTeX() { + setTokenStart("<"); + setTokenEnd(">"); + + setEscapeStart("&"); + setEscapeEnd(";"); + + setEscapeStringCaseSensitive(true); + + addAllowedEscapeString("quot"); + addAllowedEscapeString("apos"); + addAllowedEscapeString("amp"); + addAllowedEscapeString("lt"); + addAllowedEscapeString("gt"); + + setTokenCaseSensitive(true); + + renderNoteNumbers = false; +} + +bool TEILaTeX::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { + // manually process if it wasn't a simple substitution + if (!substituteToken(buf, token)) { + MyUserData *u = (MyUserData *)userData; + XMLTag tag(token); + + if (!strcmp(tag.getName(), "p")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { // non-empty start tag + buf += ""; + } + else if (tag.isEndTag()) { // end tag + buf += "//\n"; + //userData->supressAdjacentWhitespace = true; + } + else { // empty paragraph break marker + buf += "//\n"; + //userData->supressAdjacentWhitespace = true; + } + } + + // <hi> + else if (!strcmp(tag.getName(), "hi")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + SWBuf rend = tag.getAttribute("rend"); + + u->lastHi = rend; + if (rend == "italic" || rend == "ital") + buf += "\\it{"; + else if (rend == "bold") + buf += "\\bd{"; + else if (rend == "super" || rend == "sup") + buf += "^{"; + else if (rend == "sub") + buf += "_{"; + else if (rend == "overline") + buf += "\\overline{"; + + } + else if (tag.isEndTag()) { + buf += "}"; + } + } + + // <entryFree> + else if (!strcmp(tag.getName(), "entryFree")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + SWBuf n = tag.getAttribute("n"); + if (n != "") { + buf += "\\teiEntryFree{"; + buf += n; + buf += "}"; + } + } + } + + // <sense> + else if (!strcmp(tag.getName(), "sense")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + SWBuf n = tag.getAttribute("n"); + if (n != "") { + buf += "\n\\teiSense{"; + buf += n; + buf += "}"; + } + } + } + + // <div> + else if (!strcmp(tag.getName(), "div")) { + + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += ""; + } + else if (tag.isEndTag()) { + } + } + + // <lb.../> + else if (!strcmp(tag.getName(), "lb")) { + buf += "//\n"; + } + + // <pos>, <gen>, <case>, <gram>, <number>, <mood>, <pron>, <def> + else if (!strcmp(tag.getName(), "pos") || + !strcmp(tag.getName(), "gen") || + !strcmp(tag.getName(), "case") || + !strcmp(tag.getName(), "gram") || + !strcmp(tag.getName(), "number") || + !strcmp(tag.getName(), "pron") || + !strcmp(tag.getName(), "tr") || + !strcmp(tag.getName(), "orth") || + !strcmp(tag.getName(), "etym") || + !strcmp(tag.getName(), "usg") || + + + !strcmp(tag.getName(), "def")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "\\tei"; + buf += tag.getName(); + buf += "{"; + } + else if (tag.isEndTag()) { + buf += "}"; + } + } + + else if (!strcmp(tag.getName(), "ref")) { + if (!tag.isEndTag()) { + u->suspendTextPassThru = true; + SWBuf target; + SWBuf work; + SWBuf ref; + + int was_osisref = false; + if(tag.getAttribute("osisRef")) + { + target += tag.getAttribute("osisRef"); + was_osisref=true; + } + else if(tag.getAttribute("target")) + target += tag.getAttribute("target"); + + if(target.size()) + { + const char* the_ref = strchr(target, ':'); + + if(!the_ref) { + // No work + ref = target; + } + else { + // Compensate for starting : + ref = the_ref + 1; + + int size = target.size() - ref.size() - 1; + work.setSize(size); + strncpy(work.getRawData(), target, size); + } + + if(was_osisref) + { + buf.appendFormatted("\\swordref{%s}{%s}{", + (ref) ? ref.c_str() : "", + (work.size()) ? work.c_str() : "" ); + } + else + { + // Dictionary link, or something + buf.appendFormatted("\\sworddictref{%s}{%s}{", + (work.size()) ? work.c_str() : u->version.c_str(), + (ref) ? ref.c_str() : "" + ); + } + } + else + { + //std::cout << "TARGET WASN'T\n"; + } + + } + else { + buf += u->lastTextNode.c_str(); + buf += "}"; + + u->suspendTextPassThru = false; + } + } + + // <note> tag + else if (!strcmp(tag.getName(), "note")) { + if (!tag.isEndTag()) { + if (!tag.isEmpty()) { + u->suspendTextPassThru = true; + } + } + if (tag.isEndTag()) { + SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); + SWBuf footnoteBody = ""; + if (u->module){ + footnoteBody += u->module->getEntryAttributes()["Footnote"][footnoteNumber]["body"]; + } + + buf.appendFormatted("\\swordfootnote{%s}{%s}{%s}{%s}{", + footnoteNumber.c_str(), + u->version.c_str(), + u->key->getText(), + renderNoteNumbers ? noteName.c_str() : ""); + if (u->module) { + buf += u->module->renderText(footnoteBody).c_str(); + } + u->suspendTextPassThru = false; + } + } + + // <graphic> image tag + else if (!strcmp(tag.getName(), "graphic")) { + const char *url = tag.getAttribute("url"); + if (url) { // assert we have a url attribute + SWBuf filepath; + if (userData->module) { + filepath = userData->module->getConfigEntry("AbsoluteDataPath"); + if ((filepath.size()) && (filepath[filepath.size()-1] != '/') && (url[0] != '/')) + filepath += '/'; + } + filepath += url; + + buf.appendFormatted("\\figure{\\includegraphics{%s}}", + filepath.c_str()); + u->suspendTextPassThru = false; + + } + } + + // <table> <row> <cell> + else if (!strcmp(tag.getName(), "table")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "\n\\begin{tabular}"; + } + else if (tag.isEndTag()) { + buf += "\n\\end{tabular}"; + ++u->consecutiveNewlines; + u->supressAdjacentWhitespace = true; + } + + } + else if (!strcmp(tag.getName(), "row")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "\n"; + u->firstCell = true; + } + else if (tag.isEndTag()) { + buf += "//"; + u->firstCell = false; + } + + } + else if (!strcmp(tag.getName(), "cell")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + if (u->firstCell == false) { + buf += " & "; + } + else { + u->firstCell = false; + } + } + else if (tag.isEndTag()) { + buf += ""; + } + } + + + else { + return false; // we still didn't handle token + } + + } + return true; +} + + +SWORD_NAMESPACE_END + diff --git a/src/modules/filters/teirtf.cpp b/src/modules/filters/teirtf.cpp index 1213221..0871270 100644 --- a/src/modules/filters/teirtf.cpp +++ b/src/modules/filters/teirtf.cpp @@ -2,7 +2,7 @@ * * teirtf.cpp - TEI to RTF filter * - * $Id: teirtf.cpp 3160 2014-04-17 04:02:17Z greg.hellings $ + * $Id: teirtf.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -31,11 +31,11 @@ SWORD_NAMESPACE_START TEIRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { - BiblicalText = false; + isBiblicalText = false; inOsisRef = false; if (module) { version = module->getName(); - BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } } @@ -170,13 +170,7 @@ bool TEIRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *use SWBuf type = tag.getAttribute("type"); SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); - VerseKey *vkey = 0; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } - if (vkey) { + if (u->vkey) { buf.appendFormatted("{\\super <a href=\"\">*%s</a>} ", footnoteNumber.c_str()); } u->suspendTextPassThru = true; @@ -205,6 +199,22 @@ bool TEIRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *use } } + else if (!strcmp(tag.getName(), "graphic")) { + const char *src = tag.getAttribute("url"); + if (!src) // assert we have a src attribute + return false; + + char* filepath = new char[strlen(u->module->getConfigEntry("AbsoluteDataPath")) + strlen(token)]; + *filepath = 0; + strcpy(filepath, userData->module->getConfigEntry("AbsoluteDataPath")); + strcat(filepath, src); + +// we do this because BibleCS looks for this EXACT format for an image tag + buf += "<img src=\""; + buf += filepath; + buf += "\" />"; + delete [] filepath; + } else { return false; // we still didn't handle token diff --git a/src/modules/filters/teixhtml.cpp b/src/modules/filters/teixhtml.cpp index 4ae0d89..1eab978 100644 --- a/src/modules/filters/teixhtml.cpp +++ b/src/modules/filters/teixhtml.cpp @@ -2,7 +2,7 @@ * * teixhtml.cpp - TEI to XHTML filter * - * $Id: teixhtml.cpp 3161 2014-04-17 04:04:03Z greg.hellings $ + * $Id: teixhtml.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -32,11 +32,41 @@ SWORD_NAMESPACE_START +const char *TEIXHTML::getHeader() const { + // <pos>, <gen>, <case>, <gram>, <number>, <mood>, <pron>, <def> <tr> <orth> <etym> <usg> + const static char *header = "\n\ + .entryFree, .form, .etym, .def, .usg, .quote {display:block;}\n\ + .pron, .pos, .oVar, .ref, {display:inline}\n\ + [type=headword] {font-weight:bold; font-variant:small-caps; text-decoration:underline;}\n\ + [type=derivative] {font-weight:bold; font-variant:small-caps;}\n\ + [rend=italic] {font-style:italic;}\n\ + [rend=bold] {font-weight:bold;}\n\ + [rend=small-caps] {font-variant:small-caps}\n\ + .pos:before {content: \"Pos.: \"; font-weight:bold;}\n\ + .pron:before {content:\" \\\\ \";}\n\ + .pron:after {content:\" \\\\ \";}\n\ + .etym:before {content:\"Etym.:\"; display:block; font-weight:bold;}\n\ + .usg:before {content:\"Usg.:\"; display:block; font-weight:bold;}\n\ + .def:before {content:\"Def.:\" display:block; font-weight:bold;}\n\ + .quote {background-color:#cfcfdf; padding:0.3em; margin:0.5em; border-width:1px; border-style:solid;}\n\ + .cit:before {content:\"quote:\" ; display:block; margin-top:0.5em; font-size:small;}\n\ + .cit {align:center;}\n\ + .persName:before {content:\" (\"; font-size:small;}\n\ + .persName:after {content:\") \"; font-size:small;}\n\ + .persName {font-size:small;}\n\ + .number {font-style:bold;}\n\ + .def {font-style:bold;}\n\ + "; + return header; +} + + + TEIXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { - BiblicalText = false; + isBiblicalText = false; if (module) { version = module->getName(); - BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } } @@ -119,9 +149,9 @@ bool TEIXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *u if ((!tag.isEndTag()) && (!tag.isEmpty())) { SWBuf n = tag.getAttribute("n"); if (n != "") { - buf += "<b>"; + buf += "<span class=\"entryFree\">"; buf += n; - buf += "</b>"; + buf += "</span>"; } } } @@ -130,11 +160,17 @@ bool TEIXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *u else if (!strcmp(tag.getName(), "sense")) { if ((!tag.isEndTag()) && (!tag.isEmpty())) { SWBuf n = tag.getAttribute("n"); + buf += "<br/><span class=\"sense"; if (n != "") { - buf += "<br /><b>"; + buf += "\" n=\""; buf += n; - buf += "</b>"; + + } + buf += "\">"; + } + else if (tag.isEndTag()) { + buf += "</span> "; } } @@ -153,47 +189,41 @@ bool TEIXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *u buf += "<br />"; } - // <pos>, <gen>, <case>, <gram>, <number>, <mood>, <pron>, <def> + // <pos>, <gen>, <case>, <gram>, <number>, <mood>, <pron>, <def> <tr> <orth> <etym> <usg> else if (!strcmp(tag.getName(), "pos") || !strcmp(tag.getName(), "gen") || !strcmp(tag.getName(), "case") || !strcmp(tag.getName(), "gram") || !strcmp(tag.getName(), "number") || - !strcmp(tag.getName(), "pron") /*|| - !strcmp(tag.getName(), "def")*/) { - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf += "<i>"; - } - else if (tag.isEndTag()) { - buf += "</i>"; - } - } - - // <tr> - else if (!strcmp(tag.getName(), "tr")) { - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf += "<i>"; - } - else if (tag.isEndTag()) { - buf += "</i>"; - } - } - - // orth - else if (!strcmp(tag.getName(), "orth")) { + !strcmp(tag.getName(), "pron") || + !strcmp(tag.getName(), "def") || + !strcmp(tag.getName(), "tr") || + !strcmp(tag.getName(), "orth") || + !strcmp(tag.getName(), "etym") || + !strcmp(tag.getName(), "usg") || + !strcmp(tag.getName(), "quote")|| + !strcmp(tag.getName(), "cit")|| + !strcmp(tag.getName(), "persName")|| + !strcmp(tag.getName(), "oVar")) + { if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf += "<b>"; + buf += "<span class=\""; + buf += tag.getName(); + if (tag.getAttribute("type")) { + buf += "\" type =\""; + buf += tag.getAttribute("type"); + } + if (tag.getAttribute("rend")) { + buf += "\" rend =\""; + buf += tag.getAttribute("rend"); + } + buf += "\">"; } else if (tag.isEndTag()) { - buf += "</b>"; + buf += "</span>"; } } - // <etym>, <usg> - else if (!strcmp(tag.getName(), "etym") || - !strcmp(tag.getName(), "usg")) { - // do nothing here - } else if (!strcmp(tag.getName(), "ref")) { if (!tag.isEndTag()) { u->suspendTextPassThru = true; @@ -276,7 +306,50 @@ bool TEIXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *u u->suspendTextPassThru = false; } } - + // <graphic> image tag + else if (!strcmp(tag.getName(), "graphic")) { + const char *url = tag.getAttribute("url"); + if (url) { // assert we have a url attribute + SWBuf filepath; + if (userData->module) { + filepath = userData->module->getConfigEntry("AbsoluteDataPath"); + if ((filepath.size()) && (filepath[filepath.size()-1] != '/') && (url[0] != '/')) + filepath += '/'; + } + filepath += url; + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showImage&value=%s&module=%s\"><img src=\"file:%s\" border=\"0\" /></a>", + URL::encode(filepath.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str(), + filepath.c_str()); + u->suspendTextPassThru = false; + } + } + // <table> <row> <cell> + else if (!strcmp(tag.getName(), "table")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "<table><tbody>\n"; + } + else if (tag.isEndTag()) { + buf += "</tbody></table>\n"; + u->supressAdjacentWhitespace = true; + } + } + else if (!strcmp(tag.getName(), "row")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "\t<tr>"; + } + else if (tag.isEndTag()) { + buf += "</tr>\n"; + } + } + else if (!strcmp(tag.getName(), "cell")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "<td>"; + } + else if (tag.isEndTag()) { + buf += "</td>"; + } + } else { return false; // we still didn't handle token } diff --git a/src/modules/filters/thmlgbf.cpp b/src/modules/filters/thmlgbf.cpp index e85fdef..14e0203 100644 --- a/src/modules/filters/thmlgbf.cpp +++ b/src/modules/filters/thmlgbf.cpp @@ -2,7 +2,7 @@ * * thmlgbf.cpp - ThML to GBF filter * - * $Id: thmlgbf.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: thmlgbf.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -269,9 +269,11 @@ char ThMLGBF::processText(SWBuf &text, const SWKey *key, const SWModule *module) continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + // TODO: why is this + 2 ? token[tokpos+2] = 0; + } } else text += *from; } diff --git a/src/modules/filters/thmlheadings.cpp b/src/modules/filters/thmlheadings.cpp index 99bd12a..8dfcb4e 100644 --- a/src/modules/filters/thmlheadings.cpp +++ b/src/modules/filters/thmlheadings.cpp @@ -3,7 +3,7 @@ * thmlheadings.cpp - SWFilter descendant to hide or show headings * in a ThML module * - * $Id: thmlheadings.cpp 3195 2014-04-24 03:03:26Z greg.hellings $ + * $Id: thmlheadings.cpp 3191 2014-04-19 17:06:38Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/thmlhtml.cpp b/src/modules/filters/thmlhtml.cpp index b5f624e..30213f5 100644 --- a/src/modules/filters/thmlhtml.cpp +++ b/src/modules/filters/thmlhtml.cpp @@ -2,7 +2,7 @@ * * thmlhtml.cpp - ThML to HTML filter * - * $Id: thmlhtml.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: thmlhtml.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -185,17 +185,17 @@ bool ThMLHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *u } } else if (!strcmp(tag.getName(), "div")) { - if (tag.isEndTag() && (u->SecHead)) { + if (tag.isEndTag() && (u->inSecHead)) { buf += "</i></b><br />"; - u->SecHead = false; + u->inSecHead = false; } else if (tag.getAttribute("class")) { if (!strcmp(tag.getAttribute("class"), "sechead")) { - u->SecHead = true; + u->inSecHead = true; buf += "<br /><b><i>"; } else if (!strcmp(tag.getAttribute("class"), "title")) { - u->SecHead = true; + u->inSecHead = true; buf += "<br /><b><i>"; } } diff --git a/src/modules/filters/thmlhtmlhref.cpp b/src/modules/filters/thmlhtmlhref.cpp index f72a93e..6523aa3 100644 --- a/src/modules/filters/thmlhtmlhref.cpp +++ b/src/modules/filters/thmlhtmlhref.cpp @@ -2,7 +2,7 @@ * * thmlhtmlhref.cpp - ThML to HTML filter with hrefs * - * $Id: thmlhtmlhref.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: thmlhtmlhref.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -33,10 +33,11 @@ SWORD_NAMESPACE_START ThMLHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + isBiblicalText = false; + inSecHead = false; if (module) { version = module->getName(); - BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); - SecHead = false; + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } } @@ -209,20 +210,14 @@ bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat SWBuf type = tag.getAttribute("type"); SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); SWBuf noteName = tag.getAttribute("n"); - VerseKey *vkey = NULL; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } - if (vkey) { + if (u->vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", ch, URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey->getText()).c_str(), + URL::encode(u->vkey->getText()).c_str(), ch, ch, (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); @@ -256,7 +251,7 @@ bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat } } if (tag.isEndTag()) { // </scripRef> - if (!u->BiblicalText) { + if (!u->isBiblicalText) { SWBuf refList = u->startTag.getAttribute("passage"); if (!refList.length()) refList = u->lastTextNode; @@ -271,19 +266,13 @@ bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat else { SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote"); SWBuf noteName = tag.getAttribute("n"); - VerseKey *vkey = NULL; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) {} - if (vkey) { + if (u->vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. - //buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", vkey->getText(), footnoteNumber.c_str()); + //buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", u->vkey->getText(), footnoteNumber.c_str()); buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=x&value=%s&module=%s&passage=%s\"><small><sup class=\"x\">*x%s</sup></small></a>", URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey->getText()).c_str(), + URL::encode(u->vkey->getText()).c_str(), (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); } } @@ -293,17 +282,17 @@ bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat } } else if (tag.getName() && !strcmp(tag.getName(), "div")) { - if (tag.isEndTag() && u->SecHead) { + if (tag.isEndTag() && u->inSecHead) { buf += "</i></b><br />"; - u->SecHead = false; + u->inSecHead = false; } else if (tag.getAttribute("class")) { if (!stricmp(tag.getAttribute("class"), "sechead")) { - u->SecHead = true; + u->inSecHead = true; buf += "<br /><b><i>"; } else if (!stricmp(tag.getAttribute("class"), "title")) { - u->SecHead = true; + u->inSecHead = true; buf += "<br /><b><i>"; } else { diff --git a/src/modules/filters/thmllatex.cpp b/src/modules/filters/thmllatex.cpp new file mode 100644 index 0000000..7213249 --- /dev/null +++ b/src/modules/filters/thmllatex.cpp @@ -0,0 +1,396 @@ +/****************************************************************************** + * + * thmllatex.cpp - ThML to classed LaTeX + * + * $Id: thmllatex.cpp 3548 2017-12-10 05:11:38Z scribe $ + * + * Copyright 2011-2014 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 <stdlib.h> +#include <thmllatex.h> +#include <swmodule.h> +#include <utilxml.h> +#include <utilstr.h> +#include <versekey.h> +#include <url.h> + +SWORD_NAMESPACE_START + + +const char *ThMLLaTeX::getHeader() const { + return "\ + "; +} + + +ThMLLaTeX::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + isBiblicalText = false; + inSecHead = false; + if (module) { + version = module->getName(); + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + } +} + + +ThMLLaTeX::ThMLLaTeX() { + setTokenStart("<"); + setTokenEnd(">"); + + setEscapeStart("&"); + setEscapeEnd(";"); + + setEscapeStringCaseSensitive(true); + setPassThruNumericEscapeString(true); + + addAllowedEscapeString("quot"); + addAllowedEscapeString("amp"); + addAllowedEscapeString("lt"); + addAllowedEscapeString("gt"); + + addAllowedEscapeString("nbsp"); + addAllowedEscapeString("brvbar"); // "Š" + addAllowedEscapeString("sect"); // "§" + addAllowedEscapeString("copy"); // "©" + addAllowedEscapeString("laquo"); // "«" + addAllowedEscapeString("reg"); // "®" + addAllowedEscapeString("acute"); // "Ž" + addAllowedEscapeString("para"); // "¶" + addAllowedEscapeString("raquo"); // "»" + + addAllowedEscapeString("Aacute"); // "Á" + addAllowedEscapeString("Agrave"); // "À" + addAllowedEscapeString("Acirc"); // "Â" + addAllowedEscapeString("Auml"); // "Ä" + addAllowedEscapeString("Atilde"); // "Ã" + addAllowedEscapeString("Aring"); // "Å" + addAllowedEscapeString("aacute"); // "á" + addAllowedEscapeString("agrave"); // "à" + addAllowedEscapeString("acirc"); // "â" + addAllowedEscapeString("auml"); // "ä" + addAllowedEscapeString("atilde"); // "ã" + addAllowedEscapeString("aring"); // "å" + addAllowedEscapeString("Eacute"); // "É" + addAllowedEscapeString("Egrave"); // "È" + addAllowedEscapeString("Ecirc"); // "Ê" + addAllowedEscapeString("Euml"); // "Ë" + addAllowedEscapeString("eacute"); // "é" + addAllowedEscapeString("egrave"); // "è" + addAllowedEscapeString("ecirc"); // "ê" + addAllowedEscapeString("euml"); // "ë" + addAllowedEscapeString("Iacute"); // "Í" + addAllowedEscapeString("Igrave"); // "Ì" + addAllowedEscapeString("Icirc"); // "Î" + addAllowedEscapeString("Iuml"); // "Ï" + addAllowedEscapeString("iacute"); // "í" + addAllowedEscapeString("igrave"); // "ì" + addAllowedEscapeString("icirc"); // "î" + addAllowedEscapeString("iuml"); // "ï" + addAllowedEscapeString("Oacute"); // "Ó" + addAllowedEscapeString("Ograve"); // "Ò" + addAllowedEscapeString("Ocirc"); // "Ô" + addAllowedEscapeString("Ouml"); // "Ö" + addAllowedEscapeString("Otilde"); // "Õ" + addAllowedEscapeString("oacute"); // "ó" + addAllowedEscapeString("ograve"); // "ò" + addAllowedEscapeString("ocirc"); // "ô" + addAllowedEscapeString("ouml"); // "ö" + addAllowedEscapeString("otilde"); // "õ" + addAllowedEscapeString("Uacute"); // "Ú" + addAllowedEscapeString("Ugrave"); // "Ù" + addAllowedEscapeString("Ucirc"); // "Û" + addAllowedEscapeString("Uuml"); // "Ü" + addAllowedEscapeString("uacute"); // "ú" + addAllowedEscapeString("ugrave"); // "ù" + addAllowedEscapeString("ucirc"); // "û" + addAllowedEscapeString("uuml"); // "ü" + addAllowedEscapeString("Yacute"); // "Ý" + addAllowedEscapeString("yacute"); // "ý" + addAllowedEscapeString("yuml"); // "ÿ" + + addAllowedEscapeString("deg"); // "°" + addAllowedEscapeString("plusmn"); // "±" + addAllowedEscapeString("sup2"); // "²" + addAllowedEscapeString("sup3"); // "³" + addAllowedEscapeString("sup1"); // "¹" + addAllowedEscapeString("nbsp"); // "º" + addAllowedEscapeString("pound"); // "£" + addAllowedEscapeString("cent"); // "¢" + addAllowedEscapeString("frac14"); // "Œ" + addAllowedEscapeString("frac12"); // "œ" + addAllowedEscapeString("frac34"); // "Ÿ" + addAllowedEscapeString("iquest"); // "¿" + addAllowedEscapeString("iexcl"); // "¡" + addAllowedEscapeString("ETH"); // "Ð" + addAllowedEscapeString("eth"); // "ð" + addAllowedEscapeString("THORN"); // "Þ" + addAllowedEscapeString("thorn"); // "þ" + addAllowedEscapeString("AElig"); // "Æ" + addAllowedEscapeString("aelig"); // "æ" + addAllowedEscapeString("Oslash"); // "Ø" + addAllowedEscapeString("curren"); // "€" + addAllowedEscapeString("Ccedil"); // "Ç" + addAllowedEscapeString("ccedil"); // "ç" + addAllowedEscapeString("szlig"); // "ß" + addAllowedEscapeString("Ntilde"); // "Ñ" + addAllowedEscapeString("ntilde"); // "ñ" + addAllowedEscapeString("yen"); // "¥" + addAllowedEscapeString("not"); // "¬" + addAllowedEscapeString("ordf"); // "ª" + addAllowedEscapeString("uml"); // "š" + addAllowedEscapeString("shy"); // "" + addAllowedEscapeString("macr"); // "¯" + + addAllowedEscapeString("micro"); // "µ" + addAllowedEscapeString("middot"); // "·" + addAllowedEscapeString("cedil"); // "ž" + addAllowedEscapeString("ordm"); // "º" + addAllowedEscapeString("times"); // "×" + addAllowedEscapeString("divide"); // "÷" + addAllowedEscapeString("oslash"); // "ø" + + setTokenCaseSensitive(true); + addTokenSubstitute("scripture", " \\swordquote{ "); + addTokenSubstitute("/scripture", "}"); + + renderNoteNumbers = false; +} + + +bool ThMLLaTeX::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { + if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution + MyUserData *u = (MyUserData *)userData; + + XMLTag tag(token); + if ((!tag.isEndTag()) && (!tag.isEmpty())) + u->startTag = tag; + + if (tag.getName() && !strcmp(tag.getName(), "sync")) { + SWBuf value = tag.getAttribute("value"); + if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")) { //> + if (value.length()) + buf.appendFormatted("\\swordmorph[Greek]{%s}", + value.c_str()); + } + else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "lemma")) { //> + if (value.length()) + // empty "type=" is deliberate. + buf.appendFormatted("\\swordmorph[lemma]{%s}", + value.c_str()); + } + else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Strongs")) { + if (!tag.isEndTag()) { + char ch = *value; + value<<1; + buf.appendFormatted("\\swordstrong[%s]{%s}{", + ((ch == 'H') ? "Hebrew" : "Greek"), + value.c_str()); + } + else { buf += "}"; } + } + + else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Dict")) { + if (!tag.isEndTag()) { + buf.appendFormatted("\\sworddict{%s}{", + value.c_str()); + } + else { buf += "}"; } + } + + } + // <note> tag + else if (!strcmp(tag.getName(), "note")) { + if (!tag.isEndTag()) { + if (!tag.isEmpty()) { + SWBuf type = tag.getAttribute("type"); + SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); + SWBuf footnoteBody = ""; + if (u->module){ + footnoteBody += u->module->getEntryAttributes()["Footnote"][footnoteNumber]["body"]; + } + if (u->vkey) { + // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. + char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); + buf.appendFormatted("\\swordfootnote[%c]{%s}{%s}{%s}{%s}{", + ch, + footnoteNumber.c_str(), + u->version.c_str(), + u->vkey->getText(), + noteName.c_str()); + } + else { + char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); + buf.appendFormatted("\\swordfootnote[%c]{%s}{%s}{%s}{%s}{", + ch, + footnoteNumber.c_str(), + u->version.c_str(), + u->key->getText(), + noteName.c_str()); + } + u->suspendTextPassThru = true; + if (u->module) { + buf += u->module->renderText(footnoteBody).c_str(); + } + } + } + if (tag.isEndTag()) { + buf += "}"; + u->suspendTextPassThru = false; + } + } + else if (!strcmp(tag.getName(), "scripture")) { + buf += (tag.isEndTag() ? "\\swordquote" : "}"); + } + // <scripRef> tag + else if (!strcmp(tag.getName(), "scripRef")) { + if (!tag.isEndTag()) { + if (!tag.isEmpty()) { + u->suspendTextPassThru = true; + } + } + if (!tag.isEndTag()) { // </scripRef> + if (!u->isBiblicalText) { + SWBuf refList = u->startTag.getAttribute("passage"); + if (!refList.length()) + refList = u->lastTextNode; + SWBuf version = tag.getAttribute("version"); + + buf.appendFormatted("\\swordxref{%s}{%s}{", + (refList.length()) ? refList.c_str() : "", + (version.length()) ? version.c_str() : ""); + buf += u->lastTextNode.c_str(); + buf += "}"; + } + else { + SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); + SWBuf footnoteBody = ""; + if (u->module){ + footnoteBody += u->module->getEntryAttributes()["Footnote"][footnoteNumber]["body"]; + } + if (u->vkey) { + // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. + //buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", u->vkey->getText(), footnoteNumber.c_str()); + // char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); + char ch = 'x'; + buf.appendFormatted("\\swordfootnote[%c]{%s}{%s}{%s}{%s}{", + ch, + footnoteNumber.c_str(), + u->version.c_str(), + u->vkey->getText(), + (renderNoteNumbers ? noteName.c_str() : "")); + if (u->module) { + buf += u->module->renderText(footnoteBody).c_str(); + } + } + } + + + } + else if (tag.isEndTag()){ + buf +="}"; + // let's let text resume to output again + u->suspendTextPassThru = false; + } + } + else if (tag.getName() && !strcmp(tag.getName(), "div")) { + + //if (!tag.isEndTag() && u->vkey && !u->vkey->getChapter()) + // buf += "\\swordsection{book}{"; + //} + + + if (!tag.isEndTag() && u->inSecHead) { + buf += "\\swordsection{sechead}{"; + u->inSecHead = false; + } + + else if (!tag.isEndTag() && tag.getAttribute("class")) { + buf += "\\swordsection{"; + buf += tag.getAttribute("class"); + buf += "}{"; + + } + else if (!tag.isEndTag()) { + buf += "\\swordsection{}{"; + } + + else if (tag.isEndTag()) { + buf += "}"; + } + } + else if (tag.getName() && (!strcmp(tag.getName(), "img") || !strcmp(tag.getName(), "image"))) { + const char *src = strstr(token, "src"); + if (!src) // assert we have a src attribute + return false; + + const char *c, *d; + if (((c = strchr(src+3, '"')) == NULL) || + ((d = strchr( ++c , '"')) == NULL)) // identify endpoints. + return false; // abandon hope. + + + // images become clickable, if the UI supports showImage. + buf +="\\figure{"; + + for (c = token; *c; c++) { + if ((*c == '/') && (*(c+1) == '\0')) + continue; + if (c == src) { + for (;((*c) && (*c != '"')); c++) + buf += *c; + + if (!*c) { c--; continue; } + + buf += '"'; + if (*(c+1) == '/') { + buf += "\\includegraphics{"; + buf += userData->module->getConfigEntry("AbsoluteDataPath"); + if (buf[buf.length()-2] == '/') + c++; // skip '/' + } + continue; + } + buf += *c; + } + buf += "}}"; + } + else if (tag.getName() && (!strcmp(tag.getName(), "i"))){ + if (!tag.isEndTag()) { + buf += "\\emph{"; + } + else { buf += "}"; } + } + else if (tag.getName() && (!strcmp(tag.getName(), "br"))){ + buf += "\\\\"; + + } + else { + buf += '<'; + /*for (const char *tok = token; *tok; tok++) + buf += *tok;*/ + buf += token; + buf += '>'; + //return false; // we still didn't handle token + } + } + return true; +} + + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlplain.cpp b/src/modules/filters/thmlplain.cpp index b9b9839..b30173b 100644 --- a/src/modules/filters/thmlplain.cpp +++ b/src/modules/filters/thmlplain.cpp @@ -3,7 +3,7 @@ * thmlplain.cpp - SWFilter descendant to strip out all ThML tags or * convert to ASCII rendered symbols * - * $Id: thmlplain.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: thmlplain.cpp 3427 2016-07-03 14:30:33Z scribe $ * * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -206,9 +206,15 @@ char ThMLPlain::processText(SWBuf &text, const SWKey *key, const SWModule *modul continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + //TODO: why is this + 2? Are we trying to keep 2 or 3 nulls after the last valid char? + // tokpos has been incremented past the last valid token. it should be pointing to null + // +1 should give us 2 nulls, but we're +2 here, which actually keeps 3 nulls after the + // last valid char. Why are we doing any of this? These were written before SWBuf and should + // probably be switched to SWBuf, but perf tests before and after the switch should be run token[tokpos+2] = 0; + } } else text += *from; } diff --git a/src/modules/filters/thmlrtf.cpp b/src/modules/filters/thmlrtf.cpp index dc50ae9..7852fd7 100644 --- a/src/modules/filters/thmlrtf.cpp +++ b/src/modules/filters/thmlrtf.cpp @@ -2,7 +2,7 @@ * * thmlrtf.cpp - ThML to RTF filter * - * $Id: thmlrtf.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: thmlrtf.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -211,11 +211,12 @@ char ThMLRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module) ThMLRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { - this->SecHead = false; + isBiblicalText = false; + inSecHead = false; XMLTag startTag = ""; if (module) { version = module->getName(); - BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } } @@ -253,16 +254,10 @@ bool ThMLRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us if (!tag.isEmpty()) { SWBuf type = tag.getAttribute("type"); SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); - VerseKey *vkey = NULL; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } - if (vkey) { + if (u->vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); - buf.appendFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->getVerse(), footnoteNumber.c_str()); + buf.appendFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, u->vkey->getVerse(), footnoteNumber.c_str()); } u->suspendTextPassThru = true; } @@ -280,7 +275,7 @@ bool ThMLRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us } } if (tag.isEndTag()) { // </scripRef> - if (!u->BiblicalText) { + if (!u->isBiblicalText) { SWBuf refList = u->startTag.getAttribute("passage"); if (!refList.length()) refList = u->lastTextNode; @@ -292,15 +287,9 @@ bool ThMLRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us } else { SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote"); - VerseKey *vkey = NULL; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) {} - if (vkey) { + if (u->vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. - buf.appendFormatted("{\\super <a href=\"\">*x%i.%s</a>} ", vkey->getVerse(), footnoteNumber.c_str()); + buf.appendFormatted("{\\super <a href=\"\">*x%i.%s</a>} ", u->vkey->getVerse(), footnoteNumber.c_str()); } } @@ -310,17 +299,17 @@ bool ThMLRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us } else if (tag.getName() && !strcmp(tag.getName(), "div")) { - if (tag.isEndTag() && u->SecHead) { + if (tag.isEndTag() && u->inSecHead) { buf += "\\par}"; - u->SecHead = false; + u->inSecHead = false; } else if (tag.getAttribute("class")) { if (!stricmp(tag.getAttribute("class"), "sechead")) { - u->SecHead = true; + u->inSecHead = true; buf += "{\\par\\i1\\b1 "; } else if (!stricmp(tag.getAttribute("class"), "title")) { - u->SecHead = true; + u->inSecHead = true; buf += "{\\par\\i1\\b1 "; } } diff --git a/src/modules/filters/thmlscripref.cpp b/src/modules/filters/thmlscripref.cpp index 3a8b12a..7bc84ef 100644 --- a/src/modules/filters/thmlscripref.cpp +++ b/src/modules/filters/thmlscripref.cpp @@ -3,7 +3,7 @@ * thmlscripref.cpp - SWFilter descendant to hide or show scripture * referebces in a ThML module * - * $Id: thmlscripref.cpp 3156 2014-04-17 03:50:37Z greg.hellings $ + * $Id: thmlscripref.cpp 3045 2014-03-02 07:53:52Z chrislit $ * * Copyright 2001-2014 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/thmlstrongs.cpp b/src/modules/filters/thmlstrongs.cpp index 09658a9..a43c7aa 100644 --- a/src/modules/filters/thmlstrongs.cpp +++ b/src/modules/filters/thmlstrongs.cpp @@ -3,7 +3,7 @@ * thmlstrongs.cpp - SWFilter descendant to hide or show Strong's number * in a ThML module * - * $Id: thmlstrongs.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: thmlstrongs.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -60,7 +60,7 @@ char ThMLStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod bool lastspace = false; int word = 1; char val[128]; - char wordstr[5]; + char wordstr[11]; char *valto; char *ch; unsigned int textStart = 0, textEnd = 0; @@ -77,7 +77,7 @@ char ThMLStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod token[0] = 0; token[1] = 0; token[2] = 0; - textEnd = text.length(); + textEnd = (unsigned int)text.length(); continue; } if (*from == '>') { // process tokens @@ -116,7 +116,7 @@ char ThMLStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod if (lastspace) text--; } - if (newText) {textStart = text.length(); newText = false; } + if (newText) {textStart = (unsigned int)text.length(); newText = false; } continue; } } @@ -150,15 +150,17 @@ char ThMLStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod text += '<'; text += token; text += '>'; - if (newText) {textStart = text.length(); newText = false; } + if (newText) {textStart = (unsigned int)text.length(); newText = false; } continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + // TODO: why is this + 2 ? token[tokpos+2] = 0; + } } - else { + else { text += *from; lastspace = (*from == ' '); } diff --git a/src/modules/filters/thmlwordjs.cpp b/src/modules/filters/thmlwordjs.cpp index 7d80a00..2042453 100644 --- a/src/modules/filters/thmlwordjs.cpp +++ b/src/modules/filters/thmlwordjs.cpp @@ -2,7 +2,7 @@ * * thmlwordjs.cpp - SWFilter descendant to ??? * - * $Id: thmlwordjs.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: thmlwordjs.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -68,7 +68,7 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu char val[128]; char *valto; char *ch; - char wordstr[5]; + char wordstr[11]; unsigned int textStart = 0, lastAppendLen = 0, textEnd = 0; SWBuf tmp; bool newText = false; @@ -91,7 +91,7 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu token[0] = 0; token[1] = 0; token[2] = 0; - textEnd = text.length(); + textEnd = (unsigned int)text.length(); continue; } if (*from == '>') { // process tokens @@ -151,7 +151,7 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu text += token; text += '>'; if (needWordOut) { - char wstr[10]; + char wstr[11]; sprintf(wstr, "%03d", word-2); AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]); needWordOut = false; @@ -226,27 +226,29 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu else m = morph.c_str(); spanStart.appendFormatted("<span class=\"clk\" onclick=\"p('%s','%s','%s','%s','','%s');\" >", lexName.c_str(), strong.c_str(), wordID.c_str(), m, modName.c_str()); text.insert(textStr, spanStart); - lastAppendLen = spanStart.length(); + lastAppendLen = (unsigned int)spanStart.length(); } } } if (newText) { - textStart = text.length(); newText = false; + textStart = (unsigned int)text.length(); newText = false; } continue; } if (intoken) { - if (tokpos < 2045) + if (tokpos < 2045) { token[tokpos++] = *from; + // TODO: why is this + 2 ? token[tokpos+2] = 0; + } } else { text += *from; } } - char wstr[10]; + char wstr[11]; sprintf(wstr, "%03d", word-1); AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]); needWordOut = false; diff --git a/src/modules/filters/thmlxhtml.cpp b/src/modules/filters/thmlxhtml.cpp index eb9c40a..af47c72 100644 --- a/src/modules/filters/thmlxhtml.cpp +++ b/src/modules/filters/thmlxhtml.cpp @@ -2,7 +2,7 @@ * * thmlxhtml.cpp - ThML to classed XHTML * - * $Id: thmlxhtml.cpp 3205 2014-05-01 02:31:28Z greg.hellings $ + * $Id: thmlxhtml.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -38,10 +38,11 @@ const char *ThMLXHTML::getHeader() const { ThMLXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + isBiblicalText = false; + secHeadLevel = 0; if (module) { version = module->getName(); - BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); - SecHead = false; + isBiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } } @@ -214,20 +215,14 @@ bool ThMLXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * SWBuf type = tag.getAttribute("type"); SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); SWBuf noteName = tag.getAttribute("n"); - VerseKey *vkey = NULL; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } - if (vkey) { + if (u->vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", ch, URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey->getText()).c_str(), + URL::encode(u->vkey->getText()).c_str(), ch, ch, (renderNoteNumbers ? noteName.c_str() : "")); @@ -261,7 +256,7 @@ bool ThMLXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * } } if (tag.isEndTag()) { // </scripRef> - if (!u->BiblicalText) { + if (!u->isBiblicalText) { SWBuf refList = u->startTag.getAttribute("passage"); if (!refList.length()) refList = u->lastTextNode; @@ -276,19 +271,13 @@ bool ThMLXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * else { SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote"); SWBuf noteName = tag.getAttribute("n"); - VerseKey *vkey = NULL; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) {} - if (vkey) { + if (u->vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. - //buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", vkey->getText(), footnoteNumber.c_str()); + //buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", u->vkey->getText(), footnoteNumber.c_str()); buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=x&value=%s&module=%s&passage=%s\"><small><sup class=\"x\">*x%s</sup></small></a>", URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey->getText()).c_str(), + URL::encode(u->vkey->getText()).c_str(), (renderNoteNumbers ? noteName.c_str() : "")); } } @@ -298,19 +287,19 @@ bool ThMLXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * } } else if (tag.getName() && !strcmp(tag.getName(), "div")) { - if (tag.isEndTag() && u->SecHead) { + if (tag.isEndTag() && u->secHeadLevel) { buf += "</h"; - buf += u->SecHead; + buf += u->secHeadLevel; buf += ">"; - u->SecHead = false; + u->secHeadLevel = 0; } else if (tag.getAttribute("class")) { if (!stricmp(tag.getAttribute("class"), "sechead")) { - u->SecHead = '3'; + u->secHeadLevel = '3'; buf += "<h3>"; } else if (!stricmp(tag.getAttribute("class"), "title")) { - u->SecHead = '2'; + u->secHeadLevel = '2'; buf += "<h2>"; } else { diff --git a/src/modules/filters/unicodertf.cpp b/src/modules/filters/unicodertf.cpp index 1cde086..bdd2ae1 100644 --- a/src/modules/filters/unicodertf.cpp +++ b/src/modules/filters/unicodertf.cpp @@ -2,7 +2,7 @@ * * unicodertf.cpp - SWFilter descendant to convert UTF-8 to RTF tags * - * $Id: unicodertf.cpp 3157 2014-04-17 03:56:12Z greg.hellings $ + * $Id: unicodertf.cpp 3081 2014-03-05 19:52:08Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/utf16utf8.cpp b/src/modules/filters/utf16utf8.cpp index d224db2..3929471 100644 --- a/src/modules/filters/utf16utf8.cpp +++ b/src/modules/filters/utf16utf8.cpp @@ -2,7 +2,7 @@ * * utf16utf8.cpp - SWFilter descendant to convert UTF-16 to UTF-8 * - * $Id: utf16utf8.cpp 3157 2014-04-17 03:56:12Z greg.hellings $ + * $Id: utf16utf8.cpp 3081 2014-03-05 19:52:08Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/utf8arabicpoints.cpp b/src/modules/filters/utf8arabicpoints.cpp index 42bfaa5..932fc64 100644 --- a/src/modules/filters/utf8arabicpoints.cpp +++ b/src/modules/filters/utf8arabicpoints.cpp @@ -3,7 +3,7 @@ * utf8arabicpoints.cpp - SWFilter descendant to remove UTF-8 * Arabic vowel points * - * $Id: utf8arabicpoints.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: utf8arabicpoints.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -163,7 +163,7 @@ char UTF8ArabicPoints::processText(SWBuf &text, const SWKey *, const SWModule *) // "start_of_input" is either mark_pos or any text between the // end of any previous mark and the current mark_pos. // This text is now ready to be moved into the output. - int ready_size = mark_pos - start_of_input; + int ready_size = (int)(mark_pos - start_of_input); if (ready_size > 0) { // Append the input text before the current mark to the // output. diff --git a/src/modules/filters/utf8greekaccents.cpp b/src/modules/filters/utf8greekaccents.cpp index 039f9a4..cd98f96 100644 --- a/src/modules/filters/utf8greekaccents.cpp +++ b/src/modules/filters/utf8greekaccents.cpp @@ -3,7 +3,7 @@ * utf8greekaccents.cpp - SWFilter descendant to remove UTF-8 Greek * accents * - * $Id: utf8greekaccents.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: utf8greekaccents.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -22,8 +22,10 @@ */ #include <stdlib.h> +#include <map> #include <stdio.h> #include <utf8greekaccents.h> +#include <utilstr.h> #ifdef _ICU_ @@ -31,6 +33,7 @@ sword::UTF8NFKD decompose; #endif +using std::map; SWORD_NAMESPACE_START @@ -44,6 +47,297 @@ namespace { static const StringList oVals(&choices[0], &choices[2]); return &oVals; } + + std::map<__u32, SWBuf> converters; + class converters_init { + public: + converters_init() { + SWBuf myBuf = ""; + //first just remove combining characters + converters[0x2019] = ""; // RIGHT SINGLE QUOTATION MARK + converters[0x1FBF] = ""; // GREEK PSILI + converters[0x2CFF] = ""; // COPTIC MORPHOLOGICAL DIVIDER + converters[0xFE24] = ""; // COMBINING MACRON LEFT HALF + converters[0xFE25] = ""; // COMBINING MACRON RIGHT HALF + converters[0xFE26] = ""; // COMBINING CONJOINING MACRON + converters[0x0300] = ""; // COMBINING GRAVE ACCENT + converters[0x0301] = ""; // COMBINING ACUTE ACCENT + converters[0x0302] = ""; // COMBINING CIRCUMFLEX ACCENT + converters[0x0308] = ""; // COMBINING DIAERESIS + converters[0x0313] = ""; // COMBINING COMMA ABOVE + converters[0x0314] = ""; // COMBINING REVERSED COMMA ABOVE + converters[0x037A] = ""; // GREEK YPOGEGRAMMENI + converters[0x0342] = ""; // COMBINING GREEK PERISPOMENI + // Now converted pre-composed characters to their alphabetic bases, discarding the accents + // Greek + // UPPER case + converters[0x0386] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH TONOS + converters[0x0388] = *getUTF8FromUniChar(0x0395, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER EPSILON WITH TONOS + converters[0x0389] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH TONOS + converters[0x038A] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH TONOS + converters[0x03AA] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH DIALYTIKA + converters[0x038C] = *getUTF8FromUniChar(0x039F, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMICRON WITH TONOS + converters[0x038E] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH TONOS + converters[0x03AB] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA + converters[0x038F] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH TONOS + + // lower case + converters[0x03AC] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH TONOS + converters[0x03AD] = *getUTF8FromUniChar(0x03B5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER EPSILON WITH TONOS + converters[0x03AE] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH TONOS + converters[0x03AF] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH TONOS + converters[0x03CA] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH DIALYTIKA + converters[0x03CC] = *getUTF8FromUniChar(0x03BF, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMICRON WITH TONOS + converters[0x03CD] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH TONOS + converters[0x03CB] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH DIALYTIKA + converters[0x03CE] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH TONOS + + // Extended Greek + // UPPER case + converters[0x1F08] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH PSILI + converters[0x1F09] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH DASIA + converters[0x1F0A] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA + converters[0x1F0B] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA + converters[0x1F0C] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA + converters[0x1F0D] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA + converters[0x1F0E] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI + converters[0x1F0F] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI + converters[0x1F88] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI + converters[0x1F89] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI + converters[0x1F8A] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI + converters[0x1F8B] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI + converters[0x1F8C] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI + converters[0x1F8D] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI + converters[0x1F8E] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI + converters[0x1F8F] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI + converters[0x1FB8] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH VRACHY + converters[0x1FB9] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH MACRON + converters[0x1FBA] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH VARIA + converters[0x1FBB] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH OXIA + converters[0x1FBC] = *getUTF8FromUniChar(0x0391, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI + + converters[0x1F18] = *getUTF8FromUniChar(0x0395, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER EPSILON WITH PSILI + converters[0x1F19] = *getUTF8FromUniChar(0x0395, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER EPSILON WITH DASIA + converters[0x1F1A] = *getUTF8FromUniChar(0x0395, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA + converters[0x1F1B] = *getUTF8FromUniChar(0x0395, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA + converters[0x1F1C] = *getUTF8FromUniChar(0x0395, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA + converters[0x1F1D] = *getUTF8FromUniChar(0x0395, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA + converters[0x1FC8] = *getUTF8FromUniChar(0x0395, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER EPSILON WITH VARIA + converters[0x1FC9] = *getUTF8FromUniChar(0x0395, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER EPSILON WITH OXIA + + converters[0x1F28] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH PSILI + converters[0x1F29] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH DASIA + converters[0x1F2A] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA + converters[0x1F2B] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA + converters[0x1F2C] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA + converters[0x1F2D] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA + converters[0x1F2E] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI + converters[0x1F2F] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI + converters[0x1F98] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI + converters[0x1F99] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI + converters[0x1F9A] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI + converters[0x1F9B] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI + converters[0x1F9C] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI + converters[0x1F9D] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI + converters[0x1F9E] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI + converters[0x1F9F] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI + converters[0x1FCA] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH VARIA + converters[0x1FCB] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH OXIA + converters[0x1FCC] = *getUTF8FromUniChar(0x0397, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI + + converters[0x1F38] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH PSILI + converters[0x1F39] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH DASIA + converters[0x1F3A] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA + converters[0x1F3B] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA + converters[0x1F3C] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA + converters[0x1F3D] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA + converters[0x1F3E] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI + converters[0x1F3F] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI + converters[0x1FD8] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH VRACHY + converters[0x1FD9] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH MACRON + converters[0x1FDA] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH VARIA + converters[0x1FDB] = *getUTF8FromUniChar(0x0399, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER IOTA WITH OXIA + + converters[0x1F48] = *getUTF8FromUniChar(0x039F, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMICRON WITH PSILI + converters[0x1F49] = *getUTF8FromUniChar(0x039F, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMICRON WITH DASIA + converters[0x1F4A] = *getUTF8FromUniChar(0x039F, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA + converters[0x1F4B] = *getUTF8FromUniChar(0x039F, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA + converters[0x1F4C] = *getUTF8FromUniChar(0x039F, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA + converters[0x1F4D] = *getUTF8FromUniChar(0x039F, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA + converters[0x1FF8] = *getUTF8FromUniChar(0x039F, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMICRON WITH VARIA + converters[0x1FF9] = *getUTF8FromUniChar(0x039F, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMICRON WITH OXIA + + converters[0x1F59] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH DASIA + converters[0x1F5A] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH PSILI AND VARIA + converters[0x1F5B] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA + converters[0x1F5C] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH PSILI AND OXIA + converters[0x1F5D] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA + converters[0x1F5E] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH PSILI AND PERISPOMENI + converters[0x1F5F] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI + converters[0x1FE8] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH VRACHY + converters[0x1FE9] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH MACRON + converters[0x1FEA] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH VARIA + converters[0x1FEB] = *getUTF8FromUniChar(0x03A5, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER UPSILON WITH OXIA + + converters[0x1F68] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH PSILI + converters[0x1F69] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH DASIA + converters[0x1F6A] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA + converters[0x1F6B] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA + converters[0x1F6C] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA + converters[0x1F6D] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA + converters[0x1F6E] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI + converters[0x1F6F] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI + converters[0x1FA8] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI + converters[0x1FA9] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI + converters[0x1FAA] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI + converters[0x1FAB] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI + converters[0x1FAC] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI + converters[0x1FAD] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI + converters[0x1FAE] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI + converters[0x1FAF] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI + converters[0x1FFA] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH VARIA + converters[0x1FFB] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH OXIA + converters[0x1FFC] = *getUTF8FromUniChar(0x03A9, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI + + converters[0x1FEC] = *getUTF8FromUniChar(0x03A1, &myBuf); myBuf.setSize(0); // GREEK CAPITAL LETTER RHO WITH DASIA + + // lower case + //alpha + converters[0x1F00] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH PSILI + converters[0x1F01] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH DASIA + converters[0x1F02] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA + converters[0x1F03] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA + converters[0x1F04] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA + converters[0x1F05] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA + converters[0x1F06] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI + converters[0x1F07] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI + converters[0x1F80] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI + converters[0x1F81] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI + converters[0x1F82] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI + converters[0x1F83] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI + converters[0x1F84] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI + converters[0x1F85] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI + converters[0x1F86] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI + converters[0x1F87] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI + converters[0x1F70] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH VARIA + converters[0x1F71] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH OXIA + converters[0x1FB0] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH VRACHY + converters[0x1FB1] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH MACRON + converters[0x1FB2] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI + converters[0x1FB3] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI + converters[0x1FB4] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI + converters[0x1FB5] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // unused? + converters[0x1FB6] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH PERISPOMENI + converters[0x1FB7] = *getUTF8FromUniChar(0x03B1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI + + converters[0x1F10] = *getUTF8FromUniChar(0x03B5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER EPSILON WITH PSILI + converters[0x1F11] = *getUTF8FromUniChar(0x03B5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER EPSILON WITH DASIA + converters[0x1F12] = *getUTF8FromUniChar(0x03B5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA + converters[0x1F13] = *getUTF8FromUniChar(0x03B5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA + converters[0x1F14] = *getUTF8FromUniChar(0x03B5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA + converters[0x1F15] = *getUTF8FromUniChar(0x03B5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA + converters[0x1F72] = *getUTF8FromUniChar(0x03B5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER EPSILON WITH VARIA + converters[0x1F73] = *getUTF8FromUniChar(0x03B5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER EPSILON WITH OXIA + + converters[0x1F90] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI + converters[0x1F91] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI + converters[0x1F92] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI + converters[0x1F93] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI + converters[0x1F94] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI + converters[0x1F95] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI + converters[0x1F96] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI + converters[0x1F97] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI + converters[0x1F20] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH PSILI + converters[0x1F21] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH DASIA + converters[0x1F22] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH PSILI AND VARIA + converters[0x1F23] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH DASIA AND VARIA + converters[0x1F24] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH PSILI AND OXIA + converters[0x1F25] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH DASIA AND OXIA + converters[0x1F26] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI + converters[0x1F27] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI + converters[0x1FC2] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI + converters[0x1FC3] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI + converters[0x1FC4] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI + converters[0x1FC5] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // unused? + converters[0x1FC6] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH PERISPOMENI + converters[0x1FC7] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI + converters[0x1F74] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH VARIA + converters[0x1F75] = *getUTF8FromUniChar(0x03B7, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER ETA WITH OXIA + + converters[0x1F30] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH PSILI + converters[0x1F31] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH DASIA + converters[0x1F32] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH PSILI AND VARIA + converters[0x1F33] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH DASIA AND VARIA + converters[0x1F34] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH PSILI AND OXIA + converters[0x1F35] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH DASIA AND OXIA + converters[0x1F36] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI + converters[0x1F37] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI + converters[0x1F76] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH VARIA + converters[0x1F77] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH OXIA + converters[0x1FD0] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH VRACHY + converters[0x1FD1] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH MACRON + converters[0x1FD2] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA + converters[0x1FD3] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA + converters[0x1FD4] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // unused? + converters[0x1FD5] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // unused? + converters[0x1FD6] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH PERISPOMENI + converters[0x1FD7] = *getUTF8FromUniChar(0x03B9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI + + converters[0x1F40] = *getUTF8FromUniChar(0x03BF, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMICRON WITH PSILI + converters[0x1F41] = *getUTF8FromUniChar(0x03BF, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMICRON WITH DASIA + converters[0x1F42] = *getUTF8FromUniChar(0x03BF, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA + converters[0x1F43] = *getUTF8FromUniChar(0x03BF, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA + converters[0x1F44] = *getUTF8FromUniChar(0x03BF, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA + converters[0x1F45] = *getUTF8FromUniChar(0x03BF, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA + converters[0x1F78] = *getUTF8FromUniChar(0x03BF, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMICRON WITH VARIA + converters[0x1F79] = *getUTF8FromUniChar(0x03BF, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMICRON WITH OXIA + + converters[0x1F50] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH PSILI + converters[0x1F51] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH DASIA + converters[0x1F52] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA + converters[0x1F53] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA + converters[0x1F54] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA + converters[0x1F55] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA + converters[0x1F56] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI + converters[0x1F57] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI + converters[0x1F7A] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH VARIA + converters[0x1F7B] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH OXIA + converters[0x1FE0] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH VRACHY + converters[0x1FE1] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH MACRON + converters[0x1FE2] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA + converters[0x1FE3] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA + converters[0x1FE6] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH PERISPOMENI + converters[0x1FE7] = *getUTF8FromUniChar(0x03C5, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI + + converters[0x1F60] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH PSILI + converters[0x1F61] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH DASIA + converters[0x1F62] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA + converters[0x1F63] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA + converters[0x1F64] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA + converters[0x1F65] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA + converters[0x1F66] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI + converters[0x1F67] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI + converters[0x1F7C] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH VARIA + converters[0x1F7D] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH OXIA + converters[0x1FA0] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI + converters[0x1FA1] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI + converters[0x1FA2] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI + converters[0x1FA3] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI + converters[0x1FA4] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI + converters[0x1FA5] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI + converters[0x1FA6] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI + converters[0x1FA7] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI + converters[0x1FF2] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI + converters[0x1FF3] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI + converters[0x1FF4] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI + converters[0x1FF5] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // unused? + converters[0x1FF6] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH PERISPOMENI + converters[0x1FF7] = *getUTF8FromUniChar(0x03C9, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI + + converters[0x1FE4] = *getUTF8FromUniChar(0x03C1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER RHO WITH PSILI + converters[0x1FE5] = *getUTF8FromUniChar(0x03C1, &myBuf); myBuf.setSize(0); // GREEK SMALL LETTER RHO WITH DASIA + } + } __converters_init; } @@ -57,229 +351,24 @@ UTF8GreekAccents::~UTF8GreekAccents() {}; char UTF8GreekAccents::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { //we don't want greek accents - //unsigned char *to, *from; - //to = (unsigned char*)text; - //for (from = (unsigned char*)text; *from; from++) { -#ifdef _ICU_ - decompose.processText(text, (SWKey *)2); // note the hack of 2 to mimic a real key. TODO: remove all hacks -#endif - SWBuf orig = text; const unsigned char* from = (unsigned char*)orig.c_str(); - for (text = ""; *from; from++) { - //first just remove combining characters - if (*from == 0xE2 && *(from + 1) == 0x80 && *(from + 2) == 0x99) { - from += 2; - } - else if (*from == 0xCC && *(from + 1)) { - if (*(from + 1) == 0x80 || *(from + 1) == 0x81 || *(from + 1) == 0x82 || *(from + 1) == 0x88 || *(from + 1) == 0x93 || *(from + 1) == 0x94) { - from++; - } - } - else if (*from == 0xCD && (*(from + 1) == 0xBA || *(from + 1) == 0x82)) { - from++; - } - //now converted pre-composed characters to their alphabetic bases, discarding the accents - - //Greek - //capital alpha - else if ((*from == 0xCE && *(from + 1) == 0x86)) { - text += 0xCE; - text += 0x91; - from++; - } - //capital epsilon - else if ((*from == 0xCE && *(from + 1) == 0x88)) { - text += 0xCE; - text += 0x95; - from++; - } - //capital eta - else if ((*from == 0xCE && *(from + 1) == 0x89)) { - text += 0xCE; - text += 0x97; - from++; - } - //capital iota - else if ((*from == 0xCE && (*(from + 1) == 0x8A || *(from + 1) == 0xAA))) { - text += 0xCE; - text += 0x99; - from++; - } - //capital omicron - else if ((*from == 0xCE && *(from + 1) == 0x8C)) { - text += 0xCE; - text += 0x9F; - from++; - } - //capital upsilon - else if ((*from == 0xCE && (*(from + 1) == 0x8E || *(from + 1) == 0xAB))) { - text += 0xCE; - text += 0xA5; - from++; - } - //capital omega - else if ((*from == 0xCE && *(from + 1) == 0x8F)) { - text += 0xCE; - text += 0xA9; - from++; - } - - //alpha - else if ((*from == 0xCE && *(from + 1) == 0xAC)) { - text += 0xCE; - text += 0xB1; - from++; - } - //epsilon - else if ((*from == 0xCE && *(from + 1) == 0xAD)) { - text += 0xCE; - text += 0xB5; - from++; - } - //eta - else if ((*from == 0xCE && *(from + 1) == 0xAE)) { - text += 0xCE; - text += 0xB7; - from++; - } - //iota - else if ((*from == 0xCE && *(from + 1) == 0xAF) || (*from == 0xCF && *(from + 1) == 0x8A)) { - text += 0xCE; - text += 0xB9; - from++; - } - //omicron - else if ((*from == 0xCF && *(from + 1) == 0x8C)) { - text += 0xCE; - text += 0xBF; - from++; - } - //upsilon - else if ((*from == 0xCE && *(from + 1) == 0x88) || (*from == 0xCF && (*(from + 1) == 0x8B || *(from + 1) == 0x8D))) { - text += 0xCF; - text += 0x85; - from++; - } - //omega - else if ((*from == 0xCF && *(from + 1) == 0x8E)) { - text += 0xCF; - text += 0x89; - from++; - } - - //Extended Greek - //capital alpha - else if (*from == 0xE1 && (((*(from + 1) == 0xBC || *(from + 1) == 0xBE) && *(from + 2) >= 0x88 && *(from + 2) <= 0x8F) || (*(from + 1) == 0xBE && *(from + 2) >= 0xB8 && *(from + 2) <= 0xBC))) { - text += 0xCE; - text += 0x91; - from+=2; - } - //capital epsilon - else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0x98 && *(from + 2) <= 0x9D) || (*(from + 1) == 0xBF && (*(from + 2) == 0x88 || *(from + 2) == 0x89)))) { - text += 0xCE; - text += 0x95; - from+=2; - } - //capital eta - else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0xA8 && *(from + 2) <= 0xAF) || (*(from + 1) == 0xBE && *(from + 2) >= 0x98 && *(from + 2) <= 0x9F) || (*(from + 1) == 0xBF && *(from + 2) >= 0x8A && *(from + 2) <= 0x8C))) { - text += 0xCE; - text += 0x97; - from+=2; - } - //capital iota - else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0xB8 && *(from + 2) <= 0xBF) || (*(from + 1) == 0xBF && *(from + 2) >= 0x98 && *(from + 2) <= 0x9B))) { - text += 0xCE; - text += 0x99; - from+=2; - } - //capital omicron - else if (*from == 0xE1 && (((*(from + 1) == 0xBD && *(from + 2) >= 0x88 && *(from + 2) <= 0x8D)) || ((*(from + 1) == 0xBF && (*(from + 2) == 0xB8 || *(from + 2) == 0xB9))))) { - text += 0xCE; - text += 0x9F; - from+=2; - } - //capital upsilon - else if (*from == 0xE1 && ((*(from + 1) == 0xBD && *(from + 2) >= 0x99 && *(from + 2) <= 0x9F) || (*(from + 1) == 0xBF && *(from + 2) >= 0xA8 && *(from + 2) <= 0xAB))) { - text += 0xCE; - text += 0xA5; - from+=2; - } - //capital omega - else if (*from == 0xE1 && (((*(from + 1) == 0xBD || *(from + 1) == 0xBE) && *(from + 2) >= 0xA8 && *(from + 2) <= 0xAF) || (*(from + 1) == 0xBF && *(from + 2) >= 0xBA && *(from + 2) <= 0xBC))) { - text += 0xCE; - text += 0xA9; - from+=2; - } - //capital rho - else if (*from == 0xE1 && *(from + 1) == 0xBF && *(from + 2) == 0xAC) { - text += 0xCE; - text += 0xA1; - from+=2; - } + text = ""; + map<__u32, SWBuf>::const_iterator it = converters.end(); + while (*from) { + __u32 ch = getUniCharFromUTF8(&from, true); + // if ch is bad, then convert to replacement char + if (!ch) ch = 0xFFFD; - //alpha - else if (*from == 0xE1 && ( - ((*(from + 1) == 0xBC || *(from + 1) == 0xBE) && *(from + 2) >= 0x80 && *(from + 2) <= 0x87) - || (*(from + 1) == 0xBD && (*(from + 2) == 0xB0 || *(from + 2) == 0xB1)) - || (*(from + 1) == 0xBE && *(from + 2) >= 0xB0 && *(from + 2) <= 0xB7))) { - text += 0xCE; - text += 0xB1; - from+=2; - } - //epsilon - else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0x90 && *(from + 2) <= 0x95) || (*(from + 1) == 0xBD && (*(from + 2) == 0xB2 || *(from + 2) == 0xB3)))) { - text += 0xCE; - text += 0xB5; - from+=2; - } - //eta - else if (*from == 0xE1 && ((*(from + 1) == 0xBE && *(from + 2) >= 0x90 && *(from + 2) <= 0x97) || (*(from + 1) == 0xBC && *(from + 2) >= 0xA0 && *(from + 2) <= 0xA7) || (*(from + 1) == 0xBF && *(from + 2) >= 0x82 && *(from + 2) <= 0x87) || (*(from + 1) == 0xBD && (*(from + 2) == 0xB4 || *(from + 2) == 0xB5)))) { - text += 0xCE; - text += 0xB7; - from+=2; - } - //iota - else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0xB0 && *(from + 2) <= 0xB7) || (*(from + 1) == 0xBD && (*(from + 2) == 0xB6 || *(from + 2) == 0xB7)) || (*(from + 1) == 0xBF && *(from + 2) >= 0x90 && *(from + 2) <= 0x97))) { - text += 0xCE; - text += 0xB9; - from+=2; - } - //omicron - else if (*from == 0xE1 && (*(from + 1) == 0xBD && ((*(from + 2) >= 0x80 && *(from + 2) <= 0x85) || (*(from + 2) == 0xB8 || *(from + 2) == 0xB9)))) { - text += 0xCE; - text += 0xBF; - from+=2; - } - //upsilon - else if (*from == 0xE1 && ((*(from + 1) == 0xBD && ((*(from + 2) >= 0x90 && *(from + 2) <= 0x97) || *(from + 2) == 0xBA || *(from + 2) == 0xBB)) || (*(from + 1) == 0xBF && ((*(from + 2) >= 0xA0 && *(from + 2) <= 0xA3) || *(from + 2) == 0xA6 || *(from + 2) == 0xA7)))) { - text += 0xCF; - text += 0x85; - from+=2; - } - //omega - else if (*from == 0xE1 && ((*(from + 1) == 0xBD && ((*(from + 2) >= 0xA0 && *(from + 2) <= 0xA7) || (*(from + 2) == 0xBC || *(from + 2) == 0xBD))) || (*(from + 1) == 0xBE && (*(from + 2) >= 0xA0 && *(from + 2) <= 0xA7)) || (*(from + 1) == 0xBF && *(from + 2) >= 0xB2 && *(from + 2) <= 0xB7))) { - text += 0xCF; - text += 0x89; - from+=2; - } - //rho - else if (*from == 0xE1 && *(from + 1) == 0xBF && (*(from + 2) == 0xA4 && *(from + 2) == 0xA5)) { - text += 0xCF; - text += 0x81; - from+=2; - } - else { //no characters we filter - text += *from; + it = converters.find(ch); + if (it == converters.end()) { + getUTF8FromUniChar(ch, &text); } + else text.append((const char *)it->second, it->second.size()); // save a strlen, since we know our size } } return 0; } - - - - SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf8html.cpp b/src/modules/filters/utf8html.cpp index d504418..0a9eeb8 100644 --- a/src/modules/filters/utf8html.cpp +++ b/src/modules/filters/utf8html.cpp @@ -3,7 +3,7 @@ * utf8html.cpp - SWFilter descendant to convert a UTF-8 stream to * HTML escapes * - * $Id: utf8html.cpp 3157 2014-04-17 03:56:12Z greg.hellings $ + * $Id: utf8html.cpp 3081 2014-03-05 19:52:08Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/utf8latin1.cpp b/src/modules/filters/utf8latin1.cpp index db5237c..6408e10 100644 --- a/src/modules/filters/utf8latin1.cpp +++ b/src/modules/filters/utf8latin1.cpp @@ -2,7 +2,7 @@ * * utf8latin1.cpp - SWFilter descendant to convert UTF-8 to Latin-1 * - * $Id: utf8latin1.cpp 3157 2014-04-17 03:56:12Z greg.hellings $ + * $Id: utf8latin1.cpp 3081 2014-03-05 19:52:08Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/utf8nfc.cpp b/src/modules/filters/utf8nfc.cpp index 06bd76f..16a5c54 100644 --- a/src/modules/filters/utf8nfc.cpp +++ b/src/modules/filters/utf8nfc.cpp @@ -3,7 +3,7 @@ * utf8nfc.cpp - SWFilter descendant to perform NFC (canonical * composition normalization) on UTF-8 text * - * $Id: utf8nfc.cpp 3157 2014-04-17 03:56:12Z greg.hellings $ + * $Id: utf8nfc.cpp 3081 2014-03-05 19:52:08Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/utf8nfkd.cpp b/src/modules/filters/utf8nfkd.cpp index 3a782ab..047422a 100644 --- a/src/modules/filters/utf8nfkd.cpp +++ b/src/modules/filters/utf8nfkd.cpp @@ -3,7 +3,7 @@ * utf8nfkd.cpp - SWFilter descendant to perform NFKD (compatability * decomposition normalization) on UTF-8 text * - * $Id: utf8nfkd.cpp 3157 2014-04-17 03:56:12Z greg.hellings $ + * $Id: utf8nfkd.cpp 3081 2014-03-05 19:52:08Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/filters/utf8scsu.cpp b/src/modules/filters/utf8scsu.cpp new file mode 100644 index 0000000..bf5bd41 --- /dev/null +++ b/src/modules/filters/utf8scsu.cpp @@ -0,0 +1,61 @@ +/****************************************************************************** + * + * utf8scsu.cpp - SWFilter descendant to convert UTF-8 to SCSU + * + * $Id: utf8scsu.cpp 3100 2014-03-12 04:34:32Z chrislit $ + * + * Copyright 2001-2014 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 _ICU_ + +#include <utf8scsu.h> +#include <swbuf.h> + +SWORD_NAMESPACE_START + + +UTF8SCSU::UTF8SCSU() { + // initialize SCSU converter + scsuConv = ucnv_open("SCSU", &err); + + // initialize UTF-8 converter + utf8Conv = ucnv_open("UTF-8", &err); +} + +UTF8SCSU::~UTF8SCSU() { + ucnv_close(scsuConv); + ucnv_close(utf8Conv); +} + +char UTF8SCSU::processText(SWBuf &text, const SWKey *key, const SWModule *module) { + if ((unsigned long)key < 2) // hack, we're en(1)/de(0)ciphering + return -1; + + err = U_ZERO_ERROR; + UnicodeString utf16Text(text.getRawData(), text.length(), utf8Conv, err); + err = U_ZERO_ERROR; + int32_t len = utf16Text.extract(text.getRawData(), text.size(), scsuConv, err); + if (len > (int32_t)text.size()+1) { + text.setSize(len+1); + utf16Text.extract(text.getRawData(), text.size(), scsuConv, err); + } + + return 0; +} + +SWORD_NAMESPACE_END +#endif diff --git a/src/modules/filters/utf8utf16.cpp b/src/modules/filters/utf8utf16.cpp index 958f1d9..d969dba 100644 --- a/src/modules/filters/utf8utf16.cpp +++ b/src/modules/filters/utf8utf16.cpp @@ -2,7 +2,7 @@ * * utf8utf16.cpp - SWFilter descendant to convert UTF-8 to UTF-16 * - * $Id: utf8utf16.cpp 3157 2014-04-17 03:56:12Z greg.hellings $ + * $Id: utf8utf16.cpp 3081 2014-03-05 19:52:08Z chrislit $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/src/modules/genbook/rawgenbook/rawgenbook.cpp b/src/modules/genbook/rawgenbook/rawgenbook.cpp index 6101241..41cd6e4 100644 --- a/src/modules/genbook/rawgenbook/rawgenbook.cpp +++ b/src/modules/genbook/rawgenbook/rawgenbook.cpp @@ -3,7 +3,7 @@ * rawgenbook.cpp - code for class 'RawGenBook'- a module that reads raw * text files: ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawgenbook.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: rawgenbook.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -133,7 +133,7 @@ SWBuf &RawGenBook::getRawEntryBuf() const { void RawGenBook::setEntry(const char *inbuf, long len) { - __u32 offset = archtosword32(bdtfd->seek(0, SEEK_END)); + __u32 offset = (__u32)archtosword32(bdtfd->seek(0, SEEK_END)); __u32 size = 0; TreeKeyIdx *key = ((TreeKeyIdx *)&(getTreeKey())); @@ -144,7 +144,7 @@ void RawGenBook::setEntry(const char *inbuf, long len) { bdtfd->write(inbuf, len); - size = archtosword32(len); + size = (__u32)archtosword32(len); memcpy(userData, &offset, 4); memcpy(userData+4, &size, 4); key->setUserData(userData, 8); diff --git a/src/modules/lexdict/rawld/rawld.cpp b/src/modules/lexdict/rawld/rawld.cpp index 7446c10..719db56 100644 --- a/src/modules/lexdict/rawld/rawld.cpp +++ b/src/modules/lexdict/rawld/rawld.cpp @@ -3,7 +3,7 @@ * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and * dictionary files: *.dat *.idx * - * $Id: rawld.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: rawld.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -147,12 +147,26 @@ void RawLD::increment(int steps) { void RawLD::setEntry(const char *inbuf, long len) { - doSetText(*key, inbuf, len); + char *buf = new char [ strlen(*key) + 6 ]; + strcpy(buf, *key); + + if (strongsPadding) strongsPad(buf); + + doSetText(buf, inbuf, len); + + delete [] buf; } void RawLD::linkEntry(const SWKey *inkey) { - doLinkEntry(*key, *inkey); + char *buf = new char [ strlen(*key) + 6 ]; + strcpy(buf, *key); + + if (strongsPadding) strongsPad(buf); + + doLinkEntry(buf, *inkey); + + delete [] buf; } @@ -163,12 +177,19 @@ void RawLD::linkEntry(const SWKey *inkey) { */ void RawLD::deleteEntry() { - doSetText(*key, ""); + char *buf = new char [ strlen(*key) + 6 ]; + strcpy(buf, *key); + + if (strongsPadding) strongsPad(buf); + + doSetText(buf, ""); + + delete [] buf; } long RawLD::getEntryCount() const { - if (idxfd < 0) return 0; + if (!idxfd || idxfd->getFd() < 0) return 0; return idxfd->seek(0, SEEK_END) / IDXENTRYSIZE; } diff --git a/src/modules/lexdict/rawld4/rawld4.cpp b/src/modules/lexdict/rawld4/rawld4.cpp index 1f81d83..e8ec811 100644 --- a/src/modules/lexdict/rawld4/rawld4.cpp +++ b/src/modules/lexdict/rawld4/rawld4.cpp @@ -3,7 +3,7 @@ * rawld4.cpp - code for class 'RawLD'- a module that reads raw * lexicon and dictionary files: *.dat *.idx * - * $Id: rawld4.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: rawld4.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -81,7 +81,7 @@ char RawLD4::getEntry(long away) const char *buf = new char [ strlen(*key) + 6 ]; strcpy(buf, *key); - strongsPad(buf); + if (strongsPadding) strongsPad(buf); entryBuf = ""; if (!(retval = findOffset(buf, &start, &size, away))) { @@ -145,12 +145,26 @@ void RawLD4::increment(int steps) { void RawLD4::setEntry(const char *inbuf, long len) { - doSetText(*key, inbuf, len); + char *buf = new char [ strlen(*key) + 6 ]; + strcpy(buf, *key); + + if (strongsPadding) strongsPad(buf); + + doSetText(buf, inbuf, len); + + delete [] buf; } void RawLD4::linkEntry(const SWKey *inkey) { - doLinkEntry(*key, *inkey); + char *buf = new char [ strlen(*key) + 6 ]; + strcpy(buf, *key); + + if (strongsPadding) strongsPad(buf); + + doLinkEntry(buf, *inkey); + + delete [] buf; } @@ -161,12 +175,19 @@ void RawLD4::linkEntry(const SWKey *inkey) { */ void RawLD4::deleteEntry() { - doSetText(*key, ""); + char *buf = new char [ strlen(*key) + 6 ]; + strcpy(buf, *key); + + if (strongsPadding) strongsPad(buf); + + doSetText(buf, ""); + + delete [] buf; } long RawLD4::getEntryCount() const { - if (idxfd < 0) return 0; + if (!idxfd || idxfd->getFd() < 0) return 0; return idxfd->seek(0, SEEK_END) / IDXENTRYSIZE; } @@ -178,7 +199,7 @@ long RawLD4::getEntryForKey(const char *key) const { char *buf = new char [ strlen(key) + 6 ]; strcpy(buf, key); - strongsPad(buf); + if (strongsPadding) strongsPad(buf); findOffset(buf, &start, &size, 0, &offset); diff --git a/src/modules/lexdict/swld.cpp b/src/modules/lexdict/swld.cpp index 5e1909b..7d724bc 100644 --- a/src/modules/lexdict/swld.cpp +++ b/src/modules/lexdict/swld.cpp @@ -3,7 +3,7 @@ * swld.cpp - code for base class 'SWLD'. SWLD is the basis for all * types of Lexicon and Dictionary modules (hence the 'LD'). * - * $Id: swld.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: swld.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -108,7 +108,7 @@ bool SWLD::hasEntry(const SWKey *key) const { if (strongsPadding) strongsPad(buf); bool retVal = !strcmp(buf, getKeyForEntry(getEntryForKey(buf))); - delete buf; + delete [] buf; return retVal; } @@ -125,7 +125,7 @@ void SWLD::strongsPad(char *buf) { char *check; int size = 0; - int len = strlen(buf); + int len = (int)strlen(buf); char subLet = 0; bool bang = false, prefix=false; if ((len < 9) && (len > 0)) { diff --git a/src/modules/lexdict/zld/zld.cpp b/src/modules/lexdict/zld/zld.cpp index 71919d4..5bc0852 100644 --- a/src/modules/lexdict/zld/zld.cpp +++ b/src/modules/lexdict/zld/zld.cpp @@ -3,7 +3,7 @@ * zld.cpp - code for class 'zLD'- a module that reads zlib compressed * lexicon and dictionary files * - * $Id: zld.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: zld.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -90,7 +90,7 @@ char zLD::getEntry(long away) const { rawFilter(entryBuf, key); - entrySize = size; // support getEntrySize call + entrySize = (int)size; // support getEntrySize call if (!key->isPersist()) // If we have our own key *key = idxbuf; // reset it to entry index buffer @@ -144,12 +144,26 @@ void zLD::increment(int steps) { void zLD::setEntry(const char *inbuf, long len) { - setText(*key, inbuf, len); + char *buf = new char [ strlen(*key) + 6 ]; + strcpy(buf, *key); + + if (strongsPadding) strongsPad(buf); + + setText(buf, inbuf, len); + + delete [] buf; } void zLD::linkEntry(const SWKey *inkey) { - zStr::linkEntry(*key, *inkey); + char *buf = new char [ strlen(*key) + 6 ]; + strcpy(buf, *key); + + if (strongsPadding) strongsPad(buf); + + zStr::linkEntry(buf, *inkey); + + delete [] buf; } @@ -160,13 +174,20 @@ void zLD::linkEntry(const SWKey *inkey) { */ void zLD::deleteEntry() { - setText(*key, ""); + char *buf = new char [ strlen(*key) + 6 ]; + strcpy(buf, *key); + + if (strongsPadding) strongsPad(buf); + + setText(buf, ""); + + delete [] buf; } long zLD::getEntryCount() const { - if (idxfd < 0) return 0; + if (!idxfd || idxfd->getFd() < 0) return 0; return idxfd->seek(0, SEEK_END) / IDXENTRYSIZE; } diff --git a/src/modules/swmodule.cpp b/src/modules/swmodule.cpp index a2d7873..e6ceeda 100644 --- a/src/modules/swmodule.cpp +++ b/src/modules/swmodule.cpp @@ -4,7 +4,7 @@ * for all types of modules (e.g. texts, commentaries, * maps, lexicons, etc.) * - * $Id: swmodule.cpp 3282 2014-12-03 06:09:06Z greg.hellings $ + * $Id: swmodule.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -39,16 +39,23 @@ #include <iostream> #endif -#ifdef USECXX11REGEX +#if defined(USECXX11REGEX) #include <regex> #ifndef REG_ICASE #define REG_ICASE std::regex::icase #endif +#elif defined(USEICUREGEX) +#include <unicode/regex.h> +#ifndef REG_ICASE +#define REG_ICASE UREGEX_CASE_INSENSITIVE +#endif #else #include <regex.h> // GNU #endif -#ifdef USELUCENE +#if defined USEXAPIAN +#include <xapian.h> +#elif defined USELUCENE #include <CLucene.h> //Lucence includes @@ -171,6 +178,7 @@ char SWModule::popError() char retval = error; error = 0; + if (!retval) retval = key->popError(); return retval; } @@ -295,7 +303,7 @@ char SWModule::setKey(const SWKey *ikey) { if (oldKey) delete oldKey; - return error = key->popError(); + return error = key->getError(); } @@ -313,13 +321,13 @@ void SWModule::setPosition(SW_POSITION p) { switch (p) { case POS_TOP: - (*this)++; - (*this)--; + this->increment(); + this->decrement(); break; case POS_BOTTOM: - (*this)--; - (*this)++; + this->decrement(); + this->increment(); break; } @@ -360,7 +368,7 @@ void SWModule::decrement(int steps) { * * ENT: istr - string for which to search * searchType - type of search to perform - * >=0 - regex + * >=0 - regex; (for backward compat, if > 0 then used as additional REGEX FLAGS) * -1 - phrase * -2 - multiword * -3 - entryAttrib (eg. Word//Lemma./G1234/) (Lemma with dot means check components (Lemma.[1-9]) also) @@ -379,16 +387,22 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc SWBuf term = istr; bool includeComponents = false; // for entryAttrib e.g., /Lemma.1/ -#ifdef USELUCENE SWBuf target = getConfigEntry("AbsoluteDataPath"); if (!target.endsWith("/") && !target.endsWith("\\")) { target.append('/'); } +#if defined USEXAPIAN + target.append("xapian"); +#elif defined USELUCENE target.append("lucene"); #endif if (justCheckIfSupported) { *justCheckIfSupported = (searchType >= -3); -#ifdef USELUCENE +#if defined USEXAPIAN + if ((searchType == -4) && (FileMgr::existsDir(target))) { + *justCheckIfSupported = true; + } +#elif defined USELUCENE if ((searchType == -4) && (IndexReader::indexExists(target.c_str()))) { *justCheckIfSupported = true; } @@ -407,6 +421,8 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc std::locale::global(std::locale("en_US.UTF-8")); std::regex preg; +#elif defined(USEICUREGEX) + RegexMatcher *matcher = 0; #else regex_t preg; #endif @@ -449,18 +465,48 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc *this = TOP; if (searchType >= 0) { #ifdef USECXX11REGEX - preg = std::regex((SWBuf(".*")+istr+".*").c_str(), std::regex_constants::extended & flags); + preg = std::regex((SWBuf(".*")+istr+".*").c_str(), std::regex_constants::extended | searchType | flags); +#elif defined(USEICUREGEX) + UErrorCode status = U_ZERO_ERROR; + matcher = new RegexMatcher(istr, searchType | flags, status); + if (U_FAILURE(status)) { + SWLog::getSystemLog()->logError("Error compiling Regex: %d", status); + return listKey; + } + #else flags |=searchType|REG_NOSUB|REG_EXTENDED; - regcomp(&preg, istr, flags); + int err = regcomp(&preg, istr, flags); + if (err) { + SWLog::getSystemLog()->logError("Error compiling Regex: %d", err); + return listKey; + } #endif } (*percent)(++perc, percentUserData); -#ifdef USELUCENE - if (searchType == -4) { // lucene +#if defined USEXAPIAN || defined USELUCENE + (*percent)(10, percentUserData); + if (searchType == -4) { // indexed search +#if defined USEXAPIAN + SWTRY { + Xapian::Database database(target.c_str()); + Xapian::QueryParser queryParser; + queryParser.set_default_op(Xapian::Query::OP_AND); + SWTRY { + queryParser.set_stemmer(Xapian::Stem(getLanguage())); + } SWCATCH(...) {} + queryParser.set_stemming_strategy(queryParser.STEM_SOME); + queryParser.add_prefix("content", "C"); + queryParser.add_prefix("lemma", "L"); + queryParser.add_prefix("morph", "M"); + queryParser.add_prefix("prox", "P"); + queryParser.add_prefix("proxlem", "PL"); + queryParser.add_prefix("proxmorph", "PM"); + +#elif defined USELUCENE lucene::index::IndexReader *ir = 0; lucene::search::IndexSearcher *is = 0; @@ -469,22 +515,44 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc SWTRY { ir = IndexReader::open(target); is = new IndexSearcher(ir); - (*percent)(10, percentUserData); - const TCHAR *stopWords[] = { 0 }; standard::StandardAnalyzer analyzer(stopWords); +#endif + + // parse the query +#if defined USEXAPIAN + Xapian::Query q = queryParser.parse_query(istr); + Xapian::Enquire enquire = Xapian::Enquire(database); +#elif defined USELUCENE q = QueryParser::parse((wchar_t *)utf8ToWChar(istr).getRawData(), _T("content"), &analyzer); +#endif (*percent)(20, percentUserData); + + // perform the search +#if defined USEXAPIAN + enquire.set_query(q); + Xapian::MSet h = enquire.get_mset(0, 99999); +#elif defined USELUCENE h = is->search(q); +#endif (*percent)(80, percentUserData); // iterate thru each good module position that meets the search bool checkBounds = getKey()->isBoundSet(); +#if defined USEXAPIAN + Xapian::MSetIterator i; + for (i = h.begin(); i != h.end(); ++i) { +// cout << "Document ID " << *i << "\t"; + __u64 score = i.get_percent(); + Xapian::Document doc = i.get_document(); + *resultKey = doc.get_data().c_str(); +#elif defined USELUCENE for (unsigned long i = 0; i < (unsigned long)h->length(); i++) { Document &doc = h->doc(i); - // set a temporary verse key to this module position *resultKey = wcharToUTF8(doc.get(_T("key"))); //TODO Does a key always accept utf8? + __u64 score = (__u64)((__u32)(h->score(i)*100)); +#endif // check to see if it sets ok (within our bounds) and if not, skip if (checkBounds) { @@ -494,14 +562,19 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc } } listKey << *resultKey; - listKey.getElement()->userData = (__u64)((__u32)(h->score(i)*100)); + listKey.getElement()->userData = score; } (*percent)(98, percentUserData); } SWCATCH (...) { +#if defined USEXAPIAN +#elif defined USELUCENE q = 0; +#endif // invalid clucene query } +#if defined USEXAPIAN +#elif defined USELUCENE delete h; delete q; @@ -509,6 +582,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc if (ir) { ir->close(); } +#endif } #endif @@ -587,6 +661,11 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc SWBuf textBuf = stripText(); #ifdef USECXX11REGEX if (std::regex_match(std::string(textBuf.c_str()), preg)) { +#elif defined(USEICUREGEX) + UnicodeString stringToTest = textBuf.c_str(); + matcher->reset(stringToTest); + + if (matcher->find()) { #else if (!regexec(&preg, textBuf, 0, 0, 0)) { #endif @@ -597,6 +676,12 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc } #ifdef USECXX11REGEX else if (std::regex_match(std::string((lastBuf + ' ' + textBuf).c_str()), preg)) { +#elif defined(USEICUREGEX) + else { + stringToTest = (lastBuf + ' ' + textBuf).c_str(); + matcher->reset(stringToTest); + + if (matcher->find()) { #else else if (!regexec(&preg, lastBuf + ' ' + textBuf, 0, 0, 0)) { #endif @@ -607,6 +692,9 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc else { lastBuf = textBuf; } +#if defined(USEICUREGEX) + } +#endif } // phrase @@ -731,6 +819,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc } break; } + // NOT DONE case -5: AttributeList &words = getEntryAttributes()["Word"]; SWBuf kjvWord = ""; @@ -789,6 +878,8 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc if (searchType >= 0) { #ifdef USECXX11REGEX std::locale::global(oldLocale); +#elif defined(USEICUREGEX) + delete matcher; #else regfree(&preg); #endif @@ -846,14 +937,33 @@ const char *SWModule::getRenderHeader() const { /****************************************************************************** - * SWModule::renderText - calls all renderfilters on current text + * SWModule::renderText - calls all renderfilters on current module + * position + * + * RET: this module's text at current key location massaged by renderText filters + */ +SWBuf SWModule::renderText() { + return renderText((const char *)0); +} + +/****************************************************************************** + * SWModule::renderText - calls all renderfilters on provided text + * or current module position provided text null * - * ENT: buf - buffer to Render instead of current module position + * ENT: buf - buffer to render * * RET: this module's text at current key location massaged by renderText filters + * + * NOTES: This method is only truly const if called with a provided text; using + * module's current position may produce a new entry attributes map which + * logically violates the const semantic, which is why the above method + * which takes no params is not const, i.e., don't call this method with + * null as text param, but instead use non-const method above. The public + * interface for this method expects a value for the text param. We use it + * internally sometimes calling with null to save duplication of code. */ - SWBuf SWModule::renderText(const char *buf, int len, bool render) { +SWBuf SWModule::renderText(const char *buf, int len, bool render) const { bool savePEA = isProcessEntryAttributes(); if (!buf) { entryAttributes.clear(); @@ -873,7 +983,7 @@ const char *SWModule::getRenderHeader() const { if (tmpbuf) { unsigned long size = (len < 0) ? ((getEntrySize()<0) ? strlen(tmpbuf) : getEntrySize()) : len; if (size > 0) { - key = (SWKey *)*this; + key = this->getKey(); optionFilter(tmpbuf, key); @@ -1010,12 +1120,17 @@ void SWModule::deleteSearchFramework() { signed char SWModule::createSearchFramework(void (*percent)(char, void *), void *percentUserData) { -#ifdef USELUCENE +#if defined USELUCENE || defined USEXAPIAN SWBuf target = getConfigEntry("AbsoluteDataPath"); if (!target.endsWith("/") && !target.endsWith("\\")) { target.append('/'); } +#if defined USEXAPIAN + target.append("xapian"); +#elif defined USELUCENE + const int MAX_CONV_SIZE = 1024 * 1024; target.append("lucene"); +#endif int status = FileMgr::createParent(target+"/dummy"); if (status) return -1; @@ -1024,7 +1139,6 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void SWKey textkey; SWBuf c; - const int MAX_CONV_SIZE = 1024 * 1024; // turn all filters to default values StringList filterSettings; @@ -1058,6 +1172,17 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void setKey(*searchKey); } + bool includeKeyInSearch = getConfig().has("SearchOption", "IncludeKeyInSearch"); + + // lets create or open our search index +#if defined USEXAPIAN + Xapian::WritableDatabase database(target.c_str(), Xapian::DB_CREATE_OR_OPEN); + Xapian::TermGenerator termGenerator; + SWTRY { + termGenerator.set_stemmer(Xapian::Stem(getLanguage())); + } SWCATCH(...) {} + +#elif defined USELUCENE RAMDirectory *ramDir = 0; IndexWriter *coreWriter = 0; IndexWriter *fsWriter = 0; @@ -1065,11 +1190,11 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void const TCHAR *stopWords[] = { 0 }; standard::StandardAnalyzer *an = new standard::StandardAnalyzer(stopWords); - bool includeKeyInSearch = getConfig().has("SearchOption", "IncludeKeyInSearch"); ramDir = new RAMDirectory(); coreWriter = new IndexWriter(ramDir, an, true); coreWriter->setMaxFieldLength(MAX_CONV_SIZE); +#endif @@ -1126,7 +1251,12 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void bool good = false; // start out entry +#if defined USEXAPIAN + Xapian::Document doc; + termGenerator.set_document(doc); +#elif defined USELUCENE Document *doc = new Document(); +#endif // get "key" field SWBuf keyText = (vkcheck) ? vkcheck->getOSISRef() : getKeyText(); if (content && *content) { @@ -1172,7 +1302,11 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void } } +#if defined USEXAPIAN + doc.set_data(keyText.c_str()); +#elif defined USELUCENE doc->add(*_CLNEW Field(_T("key"), (wchar_t *)utf8ToWChar(keyText).getRawData(), Field::STORE_YES | Field::INDEX_UNTOKENIZED)); +#endif if (includeKeyInSearch) { c = keyText; @@ -1181,11 +1315,21 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void content = c.c_str(); } +#if defined USEXAPIAN + termGenerator.index_text(content); + termGenerator.index_text(content, 1, "C"); +#elif defined USELUCENE doc->add(*_CLNEW Field(_T("content"), (wchar_t *)utf8ToWChar(content).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED)); +#endif if (strong.length() > 0) { +#if defined USEXAPIAN + termGenerator.index_text(strong.c_str(), 1, "L"); + termGenerator.index_text(morph.c_str(), 1, "M"); +#elif defined USELUCENE doc->add(*_CLNEW Field(_T("lemma"), (wchar_t *)utf8ToWChar(strong).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED)); doc->add(*_CLNEW Field(_T("morph"), (wchar_t *)utf8ToWChar(morph).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED)); +#endif //printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str()); } @@ -1330,20 +1474,39 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void if (proxBuf.length() > 0) { +#if defined USEXAPIAN + termGenerator.index_text(proxBuf.c_str(), 1, "P"); +#elif defined USELUCENE doc->add(*_CLNEW Field(_T("prox"), (wchar_t *)utf8ToWChar(proxBuf).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED)); +#endif good = true; } if (proxLem.length() > 0) { +#if defined USEXAPIAN + termGenerator.index_text(proxLem.c_str(), 1, "PL"); + termGenerator.index_text(proxMorph.c_str(), 1, "PM"); +#elif defined USELUCENE doc->add(*_CLNEW Field(_T("proxlem"), (wchar_t *)utf8ToWChar(proxLem).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED) ); doc->add(*_CLNEW Field(_T("proxmorph"), (wchar_t *)utf8ToWChar(proxMorph).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED) ); +#endif good = true; } if (good) { //printf("writing (%s).\n", (const char *)*key); //fflush(stdout); +#if defined USEXAPIAN + SWBuf idTerm; + idTerm.setFormatted("Q%ld", key->getIndex()); + doc.add_boolean_term(idTerm.c_str()); + database.replace_document(idTerm.c_str(), doc); +#elif defined USELUCENE coreWriter->addDocument(doc); +#endif } +#if defined USEXAPIAN +#elif defined USELUCENE delete doc; +#endif (*this)++; err = popError(); @@ -1351,6 +1514,8 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void // Optimizing automatically happens with the call to addIndexes //coreWriter->optimize(); +#if defined USEXAPIAN +#elif defined USELUCENE coreWriter->close(); #ifdef CLUCENE2 @@ -1385,6 +1550,7 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void delete coreWriter; delete fsWriter; delete an; +#endif // reposition module back to where it was before we were called setKey(*saveKey); diff --git a/src/modules/texts/Makefile.am b/src/modules/texts/Makefile.am index f5d81b4..2da70fe 100644 --- a/src/modules/texts/Makefile.am +++ b/src/modules/texts/Makefile.am @@ -5,3 +5,4 @@ libsword_la_SOURCES += $(textsdir)/swtext.cpp include ../src/modules/texts/rawtext/Makefile.am include ../src/modules/texts/rawtext4/Makefile.am include ../src/modules/texts/ztext/Makefile.am +include ../src/modules/texts/ztext4/Makefile.am diff --git a/src/modules/texts/rawtext4/Makefile b/src/modules/texts/rawtext4/Makefile index a08e07e..35d6648 100644 --- a/src/modules/texts/rawtext4/Makefile +++ b/src/modules/texts/rawtext4/Makefile @@ -1,5 +1,5 @@ -
-root := ../../../..
-
-all:
- make -C ${root}
+ +root := ../../../.. + +all: + make -C ${root} diff --git a/src/modules/texts/rawtext4/rawtext4.cpp b/src/modules/texts/rawtext4/rawtext4.cpp index 5980801..caae680 100644 --- a/src/modules/texts/rawtext4/rawtext4.cpp +++ b/src/modules/texts/rawtext4/rawtext4.cpp @@ -3,7 +3,7 @@ * rawtext4.cpp - code for class 'RawText4'- a module that reads raw text * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawtext4.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: rawtext4.cpp 3456 2017-04-24 09:26:34Z scribe $ * * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -75,7 +75,7 @@ SWBuf &RawText4::getRawEntryBuf() const { VerseKey &key = getVerseKey(); findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size); - entrySize = size; // support getEntrySize call + entrySize = (int)size; // support getEntrySize call entryBuf = ""; readText(key.getTestament(), start, size, entryBuf); @@ -164,6 +164,7 @@ bool RawText4::isLinked(const SWKey *k1, const SWKey *k2) const { findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1); findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2); + if (!size1 || !size2) return false; return start1 == start2; } diff --git a/src/modules/texts/ztext4/Makefile b/src/modules/texts/ztext4/Makefile new file mode 100644 index 0000000..35d6648 --- /dev/null +++ b/src/modules/texts/ztext4/Makefile @@ -0,0 +1,5 @@ + +root := ../../../.. + +all: + make -C ${root} diff --git a/src/modules/texts/ztext4/Makefile.am b/src/modules/texts/ztext4/Makefile.am new file mode 100644 index 0000000..ae7e544 --- /dev/null +++ b/src/modules/texts/ztext4/Makefile.am @@ -0,0 +1,2 @@ +ztext4dir = $(top_srcdir)/src/modules/texts/ztext4 +libsword_la_SOURCES += $(ztext4dir)/ztext4.cpp diff --git a/src/modules/texts/ztext4/ztext4.cpp b/src/modules/texts/ztext4/ztext4.cpp new file mode 100644 index 0000000..79665c9 --- /dev/null +++ b/src/modules/texts/ztext4/ztext4.cpp @@ -0,0 +1,223 @@ +/****************************************************************************** + * + * ztext4.cpp - code for class 'zText4'- a module that reads compressed + * text files + * + * $Id: ztext4.cpp 3439 2016-10-23 08:32:02Z scribe $ + * + * Copyright 1996-2014 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 <ctype.h> +#include <stdio.h> +#include <fcntl.h> +#include <sysdata.h> +#include <versekey.h> +#include <filemgr.h> + +#include <ztext4.h> + +SWORD_NAMESPACE_START + +/****************************************************************************** + * zText4 Constructor - Initializes data for instance of zText4 + * + * ENT: ipath - path to data files + * iname - Internal name for module + * idesc - Name to display to user for module + * iblockType - verse, chapter, book, etc. of index chunks + * icomp - Compressor object + * idisp - Display object to use for displaying + */ + +zText4::zText4(const char *ipath, const char *iname, const char *idesc, int iblockType, SWCompress *icomp, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char *ilang, const char *versification) + : zVerse4(ipath, FileMgr::RDWR, iblockType, icomp), SWText(iname, idesc, idisp, enc, dir, mark, ilang, versification) { + blockType = iblockType; + lastWriteKey = 0; +} + + +/****************************************************************************** + * zText4 Destructor - Cleans up instance of zText4 + */ + +zText4::~zText4() +{ + flushCache(); + + if (lastWriteKey) + delete lastWriteKey; + +} + + +bool zText4::isWritable() const { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); } + + +/****************************************************************************** + * zText4::getRawEntry - Returns the current verse buffer + * + * RET: buffer with verse + */ + +SWBuf &zText4::getRawEntryBuf() const { + long start = 0; + unsigned long size = 0; + unsigned long buffnum = 0; + VerseKey &key = getVerseKey(); + + findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size, &buffnum); + entrySize = (int)size; // support getEntrySize call + + entryBuf = ""; + + zReadText(key.getTestament(), start, size, buffnum, entryBuf); + rawFilter(entryBuf, &key); + +// if (!isUnicode()) + prepText(entryBuf); + + return entryBuf; +} + + +bool zText4::sameBlock(VerseKey *k1, VerseKey *k2) { + if (k1->getTestament() != k2->getTestament()) + return false; + + switch (blockType) { + case VERSEBLOCKS: + if (k1->getVerse() != k2->getVerse()) + return false; + case CHAPTERBLOCKS: + if (k1->getChapter() != k2->getChapter()) + return false; + case BOOKBLOCKS: + if (k1->getBook() != k2->getBook()) + return false; + } + return true; +} + + +void zText4::setEntry(const char *inbuf, long len) { + VerseKey &key = getVerseKey(); + + // see if we've jumped across blocks since last write + if (lastWriteKey) { + if (!sameBlock(lastWriteKey, &key)) { + flushCache(); + } + delete lastWriteKey; + } + + doSetText(key.getTestament(), key.getTestamentIndex(), inbuf, len); + + lastWriteKey = (VerseKey *)key.clone(); // must delete +} + + +void zText4::linkEntry(const SWKey *inkey) { + VerseKey &destkey = getVerseKey(); + const VerseKey *srckey = &getVerseKey(inkey); + doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex()); +} + + +/****************************************************************************** + * zFiles::deleteEntry - deletes this entry + * + */ + +void zText4::deleteEntry() { + + VerseKey &key = getVerseKey(); + + doSetText(key.getTestament(), key.getTestamentIndex(), ""); +} + + +/****************************************************************************** + * zText4::increment - Increments module key a number of entries + * + * ENT: increment - Number of entries to jump forward + * + */ + +void zText4::increment(int steps) { + long start; + unsigned long size; + unsigned long buffnum; + VerseKey *tmpkey = &getVerseKey(); + + findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size, &buffnum); + + SWKey lastgood = *tmpkey; + while (steps) { + long laststart = start; + unsigned long lastsize = size; + SWKey lasttry = *tmpkey; + (steps > 0) ? ++(*key) : --(*key); + tmpkey = &getVerseKey(); + + if ((error = key->popError())) { + *key = lastgood; + break; + } + long index = tmpkey->getTestamentIndex(); + findOffset(tmpkey->getTestament(), index, &start, &size, &buffnum); + + if ( + ( + ((laststart != start) || (lastsize != size)) // we're a different entry +// && (start > 0) + && (size) // and we actually have a size + ) + || !skipConsecutiveLinks + ) { // or we don't want to skip consecutive links + steps += (steps < 0) ? 1 : -1; + lastgood = *tmpkey; + } + } + error = (error) ? KEYERR_OUTOFBOUNDS : 0; +} + + +bool zText4::isLinked(const SWKey *k1, const SWKey *k2) const { + long start1, start2; + unsigned long size1, size2; + unsigned long buffnum1, buffnum2; + VerseKey *vk1 = &getVerseKey(k1); + VerseKey *vk2 = &getVerseKey(k2); + if (vk1->getTestament() != vk2->getTestament()) return false; + + findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1, &buffnum1); + findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2, &buffnum2); + return start1 == start2 && buffnum1 == buffnum2; +} + +bool zText4::hasEntry(const SWKey *k) const { + long start; + unsigned long size; + unsigned long buffnum; + VerseKey *vk = &getVerseKey(k); + + findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size, &buffnum); + return size; +} + + +SWORD_NAMESPACE_END diff --git a/src/utilfuns/ftplib.c b/src/utilfuns/ftplib.c index a211973..cbafb01 100644 --- a/src/utilfuns/ftplib.c +++ b/src/utilfuns/ftplib.c @@ -249,7 +249,7 @@ static int readline(char *buf,int max,netbuf *ctl) x = (max >= ctl->cavail) ? ctl->cavail : max-1; end = mymemccpy(bp,ctl->cget,'\n',x); if (end != NULL) { - x = end - bp; + x = (int)(end - bp); } retval += x; bp += x; @@ -288,7 +288,7 @@ static int readline(char *buf,int max,netbuf *ctl) } if (!socket_wait(ctl)) return retval; - if ((x = net_read(ctl->handle,ctl->cput,ctl->cleft)) == -1) + if ((x = (int)net_read(ctl->handle,ctl->cput,ctl->cleft)) == -1) { perror("read"); retval = -1; @@ -326,7 +326,7 @@ static int writeline(char *buf, int len, netbuf *nData) { if (!socket_wait(nData)) return x; - w = net_write(nData->handle, nbp, FTPLIB_BUFSIZ); + w = (int)net_write(nData->handle, nbp, FTPLIB_BUFSIZ); if (w != FTPLIB_BUFSIZ) { if (ftplib_debug > 1) @@ -341,7 +341,7 @@ static int writeline(char *buf, int len, netbuf *nData) { if (!socket_wait(nData)) return x; - w = net_write(nData->handle, nbp, FTPLIB_BUFSIZ); + w = (int)net_write(nData->handle, nbp, FTPLIB_BUFSIZ); if (w != FTPLIB_BUFSIZ) { if (ftplib_debug > 1) @@ -356,7 +356,7 @@ static int writeline(char *buf, int len, netbuf *nData) { if (!socket_wait(nData)) return x; - w = net_write(nData->handle, nbp, nb); + w = (int)net_write(nData->handle, nbp, nb); if (w != nb) { if (ftplib_debug > 1) @@ -951,7 +951,7 @@ GLOBALDEF int FtpAccess(const char *path, int typ, int mode, netbuf *nControl, } if (path != NULL) { - int i = strlen(buf); + int i = (int)strlen(buf); buf[i++] = ' '; if ((strlen(path) + i) >= sizeof(buf)) return 0; @@ -995,7 +995,7 @@ GLOBALDEF int FtpRead(void *buf, int max, netbuf *nData) i = socket_wait(nData); if (i != 1) return 0; - i = net_read(nData->handle, buf, max); + i = (int)net_read(nData->handle, buf, max); } if (i == -1) return 0; @@ -1026,7 +1026,7 @@ GLOBALDEF int FtpWrite(void *buf, int len, netbuf *nData) else { socket_wait(nData); - i = net_write(nData->handle, buf, len); + i = (int)net_write(nData->handle, buf, len); } if (i == -1) return 0; @@ -1243,7 +1243,7 @@ static int FtpXfer(const char *localfile, const char *path, dbuf = malloc(FTPLIB_BUFSIZ); if (typ == FTPLIB_FILE_WRITE) { - while ((l = fread(dbuf, 1, FTPLIB_BUFSIZ, local)) > 0) + while ((l = (int)fread(dbuf, 1, FTPLIB_BUFSIZ, local)) > 0) if ((c = FtpWrite(dbuf, l, nData)) < l) { if (ftplib_debug > 1) @@ -1255,7 +1255,7 @@ static int FtpXfer(const char *localfile, const char *path, else { while ((l = FtpRead(dbuf, FTPLIB_BUFSIZ, nData)) > 0) { - writeResult = (nData->writercb) ? nData->writercb(nData, dbuf, l, nData->writerarg) : fwrite(dbuf, 1, l, local); + writeResult = (int)((nData->writercb) ? nData->writercb(nData, dbuf, l, nData->writerarg) : fwrite(dbuf, 1, l, local)); if (writeResult <= 0) { perror("localstore write"); diff --git a/src/utilfuns/roman.cpp b/src/utilfuns/roman.cpp index d436b19..031d58a 100644 --- a/src/utilfuns/roman.cpp +++ b/src/utilfuns/roman.cpp @@ -2,7 +2,7 @@ * * roman.cpp - * - * $Id: roman.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: roman.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -37,7 +37,7 @@ char isroman (const char *str, int maxchars) { } int from_rom(const char* str) { - int i, n = strlen(str); + int i, n = (int)strlen(str); short * num= (short *) calloc(n, sizeof(short)); for (i = 0; str[i]; i++) { switch(str[i]) { diff --git a/src/utilfuns/swbuf.cpp b/src/utilfuns/swbuf.cpp index 9c4908b..e9a8109 100644 --- a/src/utilfuns/swbuf.cpp +++ b/src/utilfuns/swbuf.cpp @@ -2,7 +2,7 @@ * * swbuf.cpp - used as a transport and utility for data buffers * - * $Id: swbuf.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: swbuf.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -32,38 +32,6 @@ SWORD_NAMESPACE_START char *SWBuf::nullStr = (char *)""; -/****************************************************************************** -* SWBuf Constructor - Creates an empty SWBuf object or an SWBuf initialized -* to a value from a const char * -* -*/ -SWBuf::SWBuf(const char *initVal, unsigned long initSize) { - init(initSize); - if (initVal) - set(initVal); -} - -/****************************************************************************** -* SWBuf Constructor - Creates an SWBuf initialized -* to a value from another SWBuf -* -*/ -SWBuf::SWBuf(const SWBuf &other, unsigned long initSize) { - init(initSize); - set(other); -} - -/****************************************************************************** -* SWBuf Constructor - Creates an SWBuf initialized -* to a value from a char -* -*/ -SWBuf::SWBuf(char initVal, unsigned long initSize) { - init(initSize+1); - *buf = initVal; - end = buf+1; - *end = 0; -} /* SWBuf::SWBuf(unsigned long initSize) { @@ -97,33 +65,6 @@ SWBuf &SWBuf::setFormatted(const char *format, ...) { } /****************************************************************************** -* SWBuf::append - appends a value to the current value of this SWBuf -* -*/ -SWBuf &SWBuf::append(const char *str, long max) { -// if (!str) //A null string was passed -// return; - if (max < 0) - max = strlen(str); - assureMore(max+1); - for (;((max)&&(*str));max--) - *end++ = *str++; - *end = 0; - return *this; -} - -/****************************************************************************** -* SWBuf::setSize - Size this buffer to a specific length -*/ -void SWBuf::setSize(unsigned long len) { - assureSize(len+1); - if ((unsigned)(end - buf) < len) - memset(end, fillByte, len - (end-buf)); - end = buf + len; - *end = 0; -} - -/****************************************************************************** * SWBuf::appendFormatted - appends formatted strings to the current value of this SWBuf * WARNING: This function can only write at most * JUNKBUFSIZE to the string per call. @@ -151,7 +92,7 @@ void SWBuf::insert(unsigned long pos, const char* str, unsigned long start, sign // return; str += start; - int len = (max > -1) ? max : strlen(str); + int len = (int)((max > -1) ? max : strlen(str)); if (!len || (pos > length())) //nothing to do, return return; diff --git a/src/utilfuns/url.cpp b/src/utilfuns/url.cpp index a909a04..89cea7f 100644 --- a/src/utilfuns/url.cpp +++ b/src/utilfuns/url.cpp @@ -2,7 +2,7 @@ * * url.cpp - code for an URL parser utility class * - * $Id: url.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: url.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -233,8 +233,8 @@ const SWBuf URL::encode(const char *urlText) { url = urlText; SWBuf buf; - const int length = url.length(); - for (int i = 0; i < length; i++) { //fill "buf" + const long length = url.length(); + for (long i = 0; i < length; i++) { //fill "buf" const char& c = url[i]; buf.append( ((m[c].length()) ? m[c] : SWBuf(c)) ); } @@ -249,7 +249,7 @@ const SWBuf URL::decode(const char *encoded) { text = encoded; SWBuf decoded; - const int length = text.length(); + const long length = text.length(); int i = 0; while (i < length) { diff --git a/src/utilfuns/utilstr.cpp b/src/utilfuns/utilstr.cpp index cabd455..0f71c33 100644 --- a/src/utilfuns/utilstr.cpp +++ b/src/utilfuns/utilstr.cpp @@ -2,7 +2,7 @@ * * utilstr.cpp - String utility functions * - * $Id: utilstr.cpp 2982 2013-09-15 13:33:03Z scribe $ + * $Id: utilstr.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -67,28 +67,6 @@ const unsigned char SW_toupper_array[256] = { }; -/****************************************************************************** - * stdstr - clones a string - * - * ENT: ipstr - pointer to a string pointer to set if necessary - * istr - string to set to *ipstr - * 0 - only get - * - * RET: *ipstr - */ - -char *stdstr(char **ipstr, const char *istr, unsigned int memPadFactor) { - if (*ipstr) - delete [] *ipstr; - if (istr) { - int len = strlen(istr) + 1; - *ipstr = new char [ len * memPadFactor ]; - memcpy(*ipstr, istr, len); - } - else *ipstr = 0; - return *ipstr; -} - /****************************************************************************** * strstrip - Removes leading and trailing spaces from a string @@ -102,7 +80,7 @@ char *strstrip(char *istr) { char *tmp = istr; char *rtmp; - int len = strlen(istr); + int len = (int)strlen(istr); if (len < 1) return istr; rtmp = istr + (len - 1); @@ -126,8 +104,8 @@ char *strstrip(char *istr) { */ const char *stristr(const char *s1, const char *s2) { - int tLen = strlen(s2); - int cLen = strlen(s1); + int tLen = (int)strlen(s2); + int cLen = (int)strlen(s1); char *target = new char [ tLen + 1 ]; int i, j; const char *retVal = 0; @@ -161,8 +139,8 @@ const char *stristr(const char *s1, const char *s2) { */ int strnicmp(const char *s1, const char *s2, int len) { - int tLen = strlen(s2); - int cLen = strlen(s1); + int tLen = (int)strlen(s2); + int cLen = (int)strlen(s1); char diff; int i; for (i = 0; ((i < len) && (i < tLen) && (i < cLen)); i++) { @@ -187,163 +165,6 @@ int stricmp(const char *s1, const char *s2) { } -/****************************************************************************** - * getUniCharFromUTF8 - retrieves the next Unicode codepoint from a UTF8 string - * and increments buf to start of next codepoint - * - * ENT: buf - address of a utf8 buffer - * - * RET: buf - incremented past last byte used in computing the current codepoint - * unicode codepoint value (0 with buf incremented is invalid UTF8 byte - */ - -__u32 getUniCharFromUTF8(const unsigned char **buf) { - __u32 ch = 0; - unsigned char multibuf[7]; - - //case: We're at the end - if (!(**buf)) { - return ch; - } - - //case: ANSI - if (!(**buf & 128)) { - ch = **buf; - (*buf)++; - return ch; - } - - //case: Invalid UTF-8 (illegal continuing byte in initial position) - if ((**buf & 128) && (!(**buf & 64))) { - (*buf)++; - return ch; - } - - //case: 2+ byte codepoint - multibuf[0] = **buf; - multibuf[0] <<= 1; - int subsequent; - for (subsequent = 1; (multibuf[0] & 128) && (subsequent < 7); subsequent++) { - multibuf[0] <<= 1; - multibuf[subsequent] = (*buf)[subsequent]; - multibuf[subsequent] &= 63; - // subsequent byte did not begin with 10XXXXXX - // move our buffer to here and error out - if (((*buf)[subsequent] - multibuf[subsequent]) != 128) { - *buf += subsequent; - return 0; - } - ch <<= 6; - ch |= multibuf[subsequent]; - } - subsequent--; - multibuf[0] <<= 1; - char significantFirstBits = 8 - (2+subsequent); - - ch |= (((__s16)multibuf[0]) << (((6*subsequent)+significantFirstBits)-8)); - *buf += (subsequent+1); - return ch; -} - - -SWBuf getUTF8FromUniChar(__u32 uchar) { - SWBuf retVal("", 7); - unsigned int i; - - if (uchar < 0x80) { - retVal.append((unsigned char)uchar); - retVal.setSize(1); - } - else if (uchar < 0x800) { - retVal.setSize(2); - i = uchar & 0x3f; - retVal[1] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x1f; - retVal[0] = (unsigned char)(0xc0 | i); - } - else if (uchar < 0x10000) { - retVal.setSize(3); - i = uchar & 0x3f; - retVal[2] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x3f; - retVal[1] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x0f; - retVal[0] = (unsigned char)(0xe0 | i); - } - else if (uchar < 0x200000) { - retVal.setSize(4); - i = uchar & 0x3f; - retVal[3] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x3f; - retVal[2] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x3f; - retVal[1] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x07; - retVal[0] = (unsigned char)(0xf0 | i); - } - else if (uchar < 0x4000000) { - retVal.setSize(5); - i = uchar & 0x3f; - retVal[4] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x3f; - retVal[3] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x3f; - retVal[2] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x3f; - retVal[1] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x03; - retVal[0] = (unsigned char)(0xf8 | i); - } - else if (uchar < 0x80000000) { - retVal.setSize(6); - i = uchar & 0x3f; - retVal[5] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x3f; - retVal[4] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x3f; - retVal[3] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x3f; - retVal[2] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x3f; - retVal[1] = (unsigned char)(0x80 | i); - uchar >>= 6; - - i = uchar & 0x01; - retVal[0] = (unsigned char)(0xfc | i); - } - - return retVal; -} - - SWBuf assureValidUTF8(const char *buf) { SWBuf myCopy = buf; @@ -404,7 +225,7 @@ SWBuf wcharToUTF8(const wchar_t *buf) { SWBuf utf8Buf; while (*buf) { - utf8Buf.append(getUTF8FromUniChar(*buf++)); + getUTF8FromUniChar(*buf++, &utf8Buf); } return utf8Buf; } diff --git a/src/utilfuns/utilxml.cpp b/src/utilfuns/utilxml.cpp index 1537499..a4eeb2a 100644 --- a/src/utilfuns/utilxml.cpp +++ b/src/utilfuns/utilxml.cpp @@ -3,7 +3,7 @@ * utilxml.cpp - Implementaion of utility classes to handle * XML processing * - * $Id: utilxml.cpp 2980 2013-09-14 21:51:47Z scribe $ + * $Id: utilxml.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -85,16 +85,14 @@ void XMLTag::parse() const { for (; ((buf[i]) && (buf[i] != quoteChar)); i++); // Allow for empty quotes - //if (i-start) { - if (value) - delete [] value; - value = new char [ (i-start) + 1 ]; - if (i-start) { - strncpy(value, buf+start, i-start); - } - value[i-start] = 0; - attributes[name] = value; - //} + if (value) + delete [] value; + value = new char [ (i-start) + 1 ]; + if (i-start) { + strncpy(value, buf+start, i-start); + } + value[i-start] = 0; + attributes[name] = value; } } } @@ -130,12 +128,12 @@ XMLTag::XMLTag(const XMLTag& t) : attributes(t.attributes) { empty = t.empty; endTag = t.endTag; if (t.buf) { - int len = strlen(t.buf); + int len = (int)strlen(t.buf); buf = new char[len + 1]; memcpy(buf, t.buf, len + 1); } if (t.name) { - int len = strlen(t.name); + int len = (int)strlen(t.name); name = new char[len + 1]; memcpy(name, t.name, len + 1); } diff --git a/src/utilfuns/zlib/gzlib.c b/src/utilfuns/zlib/gzlib.c index fae202e..a089787 100644 --- a/src/utilfuns/zlib/gzlib.c +++ b/src/utilfuns/zlib/gzlib.c @@ -15,6 +15,14 @@ #endif #endif +#if !defined(__GNUC__) && !defined(_WIN32_WCE) +#include <io.h> +#include <direct.h> +#else +#include <unistd.h> +#endif + + /* Local functions */ local void gz_reset OF((gz_statep)); local gzFile gz_open OF((const void *, int, const char *)); diff --git a/src/utilfuns/zlib/gzread.c b/src/utilfuns/zlib/gzread.c index bf4538e..b6c99cd 100644 --- a/src/utilfuns/zlib/gzread.c +++ b/src/utilfuns/zlib/gzread.c @@ -5,6 +5,13 @@ #include "gzguts.h" +#if !defined(__GNUC__) && !defined(_WIN32_WCE) +#include <io.h> +#include <direct.h> +#else +#include <unistd.h> +#endif + /* Local functions */ local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); local int gz_avail OF((gz_statep)); @@ -27,7 +34,7 @@ local int gz_load(state, buf, len, have) *have = 0; do { - ret = read(state->fd, buf + *have, len - *have); + ret = (int)read(state->fd, buf + *have, len - *have); if (ret <= 0) break; *have += ret; diff --git a/src/utilfuns/zlib/gzwrite.c b/src/utilfuns/zlib/gzwrite.c index aa767fb..5b4c677 100644 --- a/src/utilfuns/zlib/gzwrite.c +++ b/src/utilfuns/zlib/gzwrite.c @@ -4,7 +4,12 @@ */ #include "gzguts.h" - +#if !defined(__GNUC__) && !defined(_WIN32_WCE) +#include <io.h> +#include <direct.h> +#else +#include <unistd.h> +#endif /* Local functions */ local int gz_init OF((gz_statep)); local int gz_comp OF((gz_statep, int)); @@ -81,7 +86,7 @@ local int gz_comp(state, flush) /* write directly if requested */ if (state->direct) { - got = write(state->fd, strm->next_in, strm->avail_in); + got = (int)write(state->fd, strm->next_in, strm->avail_in); if (got < 0 || (unsigned)got != strm->avail_in) { gz_error(state, Z_ERRNO, zstrerror()); return -1; @@ -98,7 +103,7 @@ local int gz_comp(state, flush) if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && (flush != Z_FINISH || ret == Z_STREAM_END))) { have = (unsigned)(strm->next_out - state->x.next); - if (have && ((got = write(state->fd, state->x.next, have)) < 0 || + if (have && ((got = (int)write(state->fd, state->x.next, have)) < 0 || (unsigned)got != have)) { gz_error(state, Z_ERRNO, zstrerror()); return -1; diff --git a/src/utilfuns/zlib/untgz.c b/src/utilfuns/zlib/untgz.c index a7b7164..5c95a90 100644 --- a/src/utilfuns/zlib/untgz.c +++ b/src/utilfuns/zlib/untgz.c @@ -201,7 +201,7 @@ int makedir (char *newdir) { char *buffer = strdup(newdir); char *p; - int len = strlen(buffer); + int len = (int)strlen(buffer); if (len <= 0) { free(buffer); diff --git a/sword.pc.in b/sword.pc.in index 17c18f4..54f63d7 100644 --- a/sword.pc.in +++ b/sword.pc.in @@ -8,7 +8,7 @@ Name: SWORD Description: Biblical Text Research Engine Version: @VERSION@ @SHAREDLIB_TRUE@Libs: -L${libdir} -lsword -@SHAREDLIB_FALSE@Libs: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@ -Libs.private: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@ +@SHAREDLIB_FALSE@Libs: -L${libdir} -lsword @LIBS@ +Libs.private: -L${libdir} -lsword @LIBS@ Cflags: -I${includedir}/sword diff --git a/test-driver b/test-driver index d306056..32bf39e 100755 --- a/test-driver +++ b/test-driver @@ -1,7 +1,7 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2012-06-27.10; # UTC # Copyright (C) 2011-2013 Free Software Foundation, Inc. # @@ -44,12 +44,13 @@ print_usage () Usage: test-driver --test-name=NAME --log-file=PATH --trs-file=PATH [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] - TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] + [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT The '--test-name', '--log-file' and '--trs-file' options are mandatory. END } +# TODO: better error handling in option parsing (in particular, ensure +# TODO: $log_file, $trs_file and $test_name are defined). test_name= # Used for reporting. log_file= # Where to save the output of the test script. trs_file= # Where to save the metadata of the test run. @@ -68,23 +69,10 @@ while test $# -gt 0; do --enable-hard-errors) enable_hard_errors=$2; shift;; --) shift; break;; -*) usage_error "invalid option: '$1'";; - *) break;; esac shift done -missing_opts= -test x"$test_name" = x && missing_opts="$missing_opts --test-name" -test x"$log_file" = x && missing_opts="$missing_opts --log-file" -test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" -if test x"$missing_opts" != x; then - usage_error "the following mandatory options are missing:$missing_opts" -fi - -if test $# -eq 0; then - usage_error "missing argument" -fi - if test $color_tests = yes; then # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. red='[0;31m' # Red. diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 130af8a..30818a8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -31,6 +31,8 @@ SET(test_PROGRAMS localetest mgrtest modtest + osistest + ldtest parsekey rawldidxtest romantest diff --git a/tests/Makefile.am b/tests/Makefile.am index ad09283..1be04d4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,14 +5,14 @@ AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex endif LDADD = $(top_builddir)/lib/libsword.la -SUBDIRS = cppunit +SUBDIRS = cppunit testsuite noinst_PROGRAMS = utf8norm ciphertest keytest mgrtest parsekey versekeytest \ vtreekeytest versemgrtest listtest casttest modtest \ compnone complzss localetest introtest indextest \ configtest keycast romantest testblocks filtertest \ rawldidxtest lextest swaptest swbuftest xmltest \ - webiftest striptest osistest bibliotest + webiftest striptest ldtest osistest bibliotest if HAVE_ICU ICUPROG = icutest translittest tlitmgrtest @@ -68,10 +68,7 @@ swbuftest_SOURCES = swbuftest.cpp webiftest_SOURCES = webiftest.cpp striptest_SOURCES = striptest.cpp xmltest_SOURCES = xmltest.cpp +ldtest_SOURCES = ldtest.cpp osistest_SOURCES = osistest.cpp bibliotest_SOURCES = bibliotest.cpp -EXTRA_DIST = -include bcppmake/Makefile.am -include testsuite/Makefile.am -include tmp/Makefile.am diff --git a/tests/Makefile.in b/tests/Makefile.in index c228d64..884969d 100644 --- a/tests/Makefile.in +++ b/tests/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. @@ -90,13 +90,11 @@ noinst_PROGRAMS = utf8norm$(EXEEXT) ciphertest$(EXEEXT) \ testblocks$(EXEEXT) filtertest$(EXEEXT) rawldidxtest$(EXEEXT) \ lextest$(EXEEXT) swaptest$(EXEEXT) swbuftest$(EXEEXT) \ xmltest$(EXEEXT) webiftest$(EXEEXT) striptest$(EXEEXT) \ - osistest$(EXEEXT) bibliotest$(EXEEXT) $(am__EXEEXT_1) \ - $(am__EXEEXT_2) -DIST_COMMON = $(srcdir)/bcppmake/Makefile.am \ - $(srcdir)/testsuite/Makefile.am $(srcdir)/tmp/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp + ldtest$(EXEEXT) osistest$(EXEEXT) bibliotest$(EXEEXT) \ + $(am__EXEEXT_1) $(am__EXEEXT_2) subdir = tests +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -171,6 +169,10 @@ am_keytest_OBJECTS = keytest.$(OBJEXT) keytest_OBJECTS = $(am_keytest_OBJECTS) keytest_LDADD = $(LDADD) keytest_DEPENDENCIES = $(top_builddir)/lib/libsword.la +am_ldtest_OBJECTS = ldtest.$(OBJEXT) +ldtest_OBJECTS = $(am_ldtest_OBJECTS) +ldtest_LDADD = $(LDADD) +ldtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la am_lextest_OBJECTS = lextest.$(OBJEXT) lextest_OBJECTS = $(am_lextest_OBJECTS) lextest_LDADD = $(LDADD) @@ -295,24 +297,24 @@ SOURCES = $(bibliotest_SOURCES) $(casttest_SOURCES) \ $(ciphertest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) \ $(compzip_SOURCES) $(configtest_SOURCES) $(filtertest_SOURCES) \ $(icutest_SOURCES) $(indextest_SOURCES) $(introtest_SOURCES) \ - $(keycast_SOURCES) $(keytest_SOURCES) $(lextest_SOURCES) \ - $(listtest_SOURCES) $(localetest_SOURCES) $(mgrtest_SOURCES) \ - $(modtest_SOURCES) $(osistest_SOURCES) $(parsekey_SOURCES) \ - $(rawldidxtest_SOURCES) $(romantest_SOURCES) \ - $(striptest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) \ - $(testblocks_SOURCES) $(tlitmgrtest_SOURCES) \ - $(translittest_SOURCES) $(utf8norm_SOURCES) \ - $(versekeytest_SOURCES) $(versemgrtest_SOURCES) \ - $(vtreekeytest_SOURCES) $(webiftest_SOURCES) \ - $(xmltest_SOURCES) + $(keycast_SOURCES) $(keytest_SOURCES) $(ldtest_SOURCES) \ + $(lextest_SOURCES) $(listtest_SOURCES) $(localetest_SOURCES) \ + $(mgrtest_SOURCES) $(modtest_SOURCES) $(osistest_SOURCES) \ + $(parsekey_SOURCES) $(rawldidxtest_SOURCES) \ + $(romantest_SOURCES) $(striptest_SOURCES) $(swaptest_SOURCES) \ + $(swbuftest_SOURCES) $(testblocks_SOURCES) \ + $(tlitmgrtest_SOURCES) $(translittest_SOURCES) \ + $(utf8norm_SOURCES) $(versekeytest_SOURCES) \ + $(versemgrtest_SOURCES) $(vtreekeytest_SOURCES) \ + $(webiftest_SOURCES) $(xmltest_SOURCES) DIST_SOURCES = $(bibliotest_SOURCES) $(casttest_SOURCES) \ $(ciphertest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) \ $(am__compzip_SOURCES_DIST) $(configtest_SOURCES) \ $(filtertest_SOURCES) $(am__icutest_SOURCES_DIST) \ $(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) \ - $(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) \ - $(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) \ - $(osistest_SOURCES) $(parsekey_SOURCES) \ + $(keytest_SOURCES) $(ldtest_SOURCES) $(lextest_SOURCES) \ + $(listtest_SOURCES) $(localetest_SOURCES) $(mgrtest_SOURCES) \ + $(modtest_SOURCES) $(osistest_SOURCES) $(parsekey_SOURCES) \ $(rawldidxtest_SOURCES) $(romantest_SOURCES) \ $(striptest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) \ $(testblocks_SOURCES) $(am__tlitmgrtest_SOURCES_DIST) \ @@ -540,14 +542,16 @@ 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 AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1) LDADD = $(top_builddir)/lib/libsword.la -SUBDIRS = cppunit +SUBDIRS = cppunit testsuite @HAVE_ICU_FALSE@ICUPROG = @HAVE_ICU_TRUE@ICUPROG = icutest translittest tlitmgrtest @HAVE_ICU_TRUE@icutest_SOURCES = icutest.cpp @@ -584,23 +588,14 @@ swbuftest_SOURCES = swbuftest.cpp webiftest_SOURCES = webiftest.cpp striptest_SOURCES = striptest.cpp xmltest_SOURCES = xmltest.cpp +ldtest_SOURCES = ldtest.cpp osistest_SOURCES = osistest.cpp bibliotest_SOURCES = bibliotest.cpp -EXTRA_DIST = $(swbcppdir)/filtertest.bpf $(swbcppdir)/filtertest.bpr \ - $(swbcppdir)/libsword.bpf $(swbcppdir)/libsword.bpr \ - $(swbcppdir)/mgrtest.bpf $(swbcppdir)/mgrtest.bpr \ - $(swbcppdir)/parsekey.bpf $(swbcppdir)/parsekey.bpr \ - $(swbcppdir)/tests.bpg $(swtspdir)/runall.sh \ - $(swtspdir)/runtest.sh $(swtspdir)/verseparsing.good \ - $(swtspdir)/verseparsing.sh $(swtesttmpdir)/README -swbcppdir = $(top_srcdir)/tests/bcppmake -swtspdir = $(top_srcdir)/tests/testsuite -swtesttmpdir = $(top_srcdir)/tests/tmp all: all-recursive .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/bcppmake/Makefile.am $(srcdir)/testsuite/Makefile.am $(srcdir)/tmp/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -621,7 +616,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/bcppmake/Makefile.am $(srcdir)/testsuite/Makefile.am $(srcdir)/tmp/Makefile.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -693,6 +687,10 @@ keytest$(EXEEXT): $(keytest_OBJECTS) $(keytest_DEPENDENCIES) $(EXTRA_keytest_DEP @rm -f keytest$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(keytest_OBJECTS) $(keytest_LDADD) $(LIBS) +ldtest$(EXEEXT): $(ldtest_OBJECTS) $(ldtest_DEPENDENCIES) $(EXTRA_ldtest_DEPENDENCIES) + @rm -f ldtest$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(ldtest_OBJECTS) $(ldtest_LDADD) $(LIBS) + lextest$(EXEEXT): $(lextest_OBJECTS) $(lextest_DEPENDENCIES) $(EXTRA_lextest_DEPENDENCIES) @rm -f lextest$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(lextest_OBJECTS) $(lextest_LDADD) $(LIBS) @@ -796,6 +794,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/introtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keycast.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keytest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lextest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localetest.Po@am__quote@ diff --git a/tests/configtest.cpp b/tests/configtest.cpp index d196f07..9e28355 100644 --- a/tests/configtest.cpp +++ b/tests/configtest.cpp @@ -2,7 +2,7 @@ * * configtest.cpp - * - * $Id: configtest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: configtest.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -31,7 +31,7 @@ int main(int argc, char **argv) { config["Section1"]["Entry1"] = "Value1"; config["Section1"]["Entry2"] = "oops"; config["Section1"]["Entry2"] = "Value2"; - config.Save(); + config.save(); SWConfig config2("./test1.conf"); std::cout << "Should be Value2: " << config2["Section1"]["Entry2"] << std::endl; return 0; diff --git a/tests/cppunit/Makefile.in b/tests/cppunit/Makefile.in index f5c8bfa..e4e285d 100644 --- a/tests/cppunit/Makefile.in +++ b/tests/cppunit/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. @@ -528,9 +528,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@ LDADD = $(top_builddir)/lib/libsword.la LibSword_SOURCES = main.cpp stringmgr_test.cpp swbuf_test.cpp url_test.cpp versekey_test.cpp diff --git a/tests/ldtest.cpp b/tests/ldtest.cpp new file mode 100644 index 0000000..369984f --- /dev/null +++ b/tests/ldtest.cpp @@ -0,0 +1,32 @@ +#include <swmodule.h> +#include <swmgr.h> +#include <iostream> +#include <stdio.h> + +using namespace sword; +using namespace std; + +int main(int argc, char **argv) { + + if (argc < 2) { + fprintf(stderr, "usage: %s <lexdict_name>\n", *argv); + exit(-1); + } + + SWMgr library; + SWModule *module = library.getModule(argv[1]); + if (!module) { + cerr << "\nCouldn't find module: " << argv[1] << "\n" << endl; + exit(-2); + } + int i = 0; + for ((*module) = TOP; !module->popError(); module->increment()) { + cout << module->getKeyText() << ": " << module->stripText() << "\n"; + if (++i > 10) { + cout << "ERROR: more than 10 iterations. stopping.\n"; + break; + } + + } + return 0; +} diff --git a/tests/localetest.cpp b/tests/localetest.cpp index 26f6b28..8f222b8 100644 --- a/tests/localetest.cpp +++ b/tests/localetest.cpp @@ -2,7 +2,7 @@ * * localetest.cpp - * - * $Id: localetest.cpp 3005 2014-01-09 04:06:11Z greg.hellings $ + * $Id: localetest.cpp 3001 2014-01-03 19:23:42Z scribe $ * * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society diff --git a/tests/osistest.cpp b/tests/osistest.cpp index cfc09bb..77fda1a 100644 --- a/tests/osistest.cpp +++ b/tests/osistest.cpp @@ -2,7 +2,7 @@ * * osistest.cpp - * - * $Id: osistest.cpp 3185 2014-04-17 04:32:00Z greg.hellings $ + * $Id: osistest.cpp 3548 2017-12-10 05:11:38Z scribe $ * * Copyright 20122013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -76,6 +76,9 @@ int main(int argc, char **argv) { module->setKey("Ps.3.1"); outputCurrentVerse(module); + module->setKey("Matt.2.6"); + outputCurrentVerse(module); + module->setKey("Mark.1.14"); outputCurrentVerse(module); diff --git a/tests/testsuite/CMakeLists.txt b/tests/testsuite/CMakeLists.txt index 48dc01a..c695236 100644 --- a/tests/testsuite/CMakeLists.txt +++ b/tests/testsuite/CMakeLists.txt @@ -1,12 +1,12 @@ ############################################################################# # This file will actually be responsible for running the tests -# +# + +FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sword.conf" "[Install]\nLocalePath=${CMAKE_CURRENT_SOURCE_DIR}/../../") ADD_CUSTOM_TARGET( tests_configure - COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_BINARY_DIR} - COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.good ${CMAKE_CURRENT_BINARY_DIR} - COMMAND echo \"[Install]\\nLocalePath=${CMAKE_CURRENT_SOURCE_DIR}/../../\" > ${CMAKE_CURRENT_BINARY_DIR}/sword.conf + COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/*.{sh,good,imp,txt,xml}" "${CMAKE_CURRENT_BINARY_DIR}" DEPENDS ${test_PROGRAMS} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/tests/testsuite/Makefile.am b/tests/testsuite/Makefile.am index db26c79..33e0b22 100644 --- a/tests/testsuite/Makefile.am +++ b/tests/testsuite/Makefile.am @@ -1,6 +1,12 @@ -swtspdir = $(top_srcdir)/tests/testsuite +all: + @echo + @echo to run tests type: ./runall.sh + @echo or make run + @echo -EXTRA_DIST += $(swtspdir)/runall.sh -EXTRA_DIST += $(swtspdir)/runtest.sh -EXTRA_DIST += $(swtspdir)/verseparsing.good -EXTRA_DIST += $(swtspdir)/verseparsing.sh +run: + ./runall.sh + +clean-local: + -rm -rf tmp + -rm -rf *.try diff --git a/tests/testsuite/Makefile.in b/tests/testsuite/Makefile.in new file mode 100644 index 0000000..aa8d9a1 --- /dev/null +++ b/tests/testsuite/Makefile.in @@ -0,0 +1,480 @@ +# Makefile.in generated by automake 1.13.4 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = tests/testsuite +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ + $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/include/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_CXXFLAGS = @AM_CXXFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@ +CLUCENE2_LIBS = @CLUCENE2_LIBS@ +CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@ +CLUCENE_LIBS = @CLUCENE_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ +CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ +CPPUNIT_LIBS = @CPPUNIT_LIBS@ +CURL_CONFIG = @CURL_CONFIG@ +CURL_LIBS = @CURL_LIBS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +ICU_CONFIG = @ICU_CONFIG@ +ICU_IOLIBS = @ICU_IOLIBS@ +ICU_LIBS = @ICU_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@ +SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@ +SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@ +SWORD_VERSION_NANO = @SWORD_VERSION_NANO@ +SWORD_VERSION_NUM = @SWORD_VERSION_NUM@ +SWORD_VERSION_STR = @SWORD_VERSION_STR@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +dir_confdef = @dir_confdef@ +docdir = @docdir@ +dvidir = @dvidir@ +enable_debug = @enable_debug@ +enable_profile = @enable_profile@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_mingw32 = @target_mingw32@ +target_os = @target_os@ +target_system = @target_system@ +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@ +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/testsuite/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign tests/testsuite/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +all: + @echo + @echo to run tests type: ./runall.sh + @echo or make run + @echo + +run: + ./runall.sh + +clean-local: + -rm -rf tmp + -rm -rf *.try + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/tests/testsuite/README b/tests/testsuite/README new file mode 100644 index 0000000..a07a0c9 --- /dev/null +++ b/tests/testsuite/README @@ -0,0 +1,24 @@ +All tests are represented by a <test>.sh / <test>.good file pair. + +To run a test: + +./runtest.sh test + +This will run test.sh > test.try and compare test.try to test.good and report any differences (failures) + +To run all tests: + +./runall.sh + +=================================== + +To create a new test, do whatever you want in your new mytest.sh file, +call, executables, do anything you'd like and output results which +matter for a good test. + +When all is running fine, output your .good file with: + +./mytest.sh > mytest.good + +That's it. Simple right? :) So make more unit tests! + diff --git a/tests/testsuite/UTF-8-test.txt b/tests/testsuite/UTF-8-test.txt new file mode 100644 index 0000000..78c859c --- /dev/null +++ b/tests/testsuite/UTF-8-test.txt @@ -0,0 +1,300 @@ +UTF-8 decoder capability and stress test +---------------------------------------- + +Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> - 2015-08-28 - CC BY 4.0 + +This test file can help you examine, how your UTF-8 decoder handles +various types of correct, malformed, or otherwise interesting UTF-8 +sequences. This file is not meant to be a conformance test. It does +not prescribe any particular outcome. Therefore, there is no way to +"pass" or "fail" this test file, even though the text does suggest a +preferable decoder behaviour at some places. Its aim is, instead, to +help you think about, and test, the behaviour of your UTF-8 decoder on a +systematic collection of unusual inputs. Experience so far suggests +that most first-time authors of UTF-8 decoders find at least one +serious problem in their decoder using this file. + +The test lines below cover boundary conditions, malformed UTF-8 +sequences, as well as correctly encoded UTF-8 sequences of Unicode code +points that should never occur in a correct UTF-8 file. + +According to ISO 10646-1:2000, sections D.7 and 2.3c, a device +receiving UTF-8 shall interpret a "malformed sequence in the same way +that it interprets a character that is outside the adopted subset" and +"characters that are not within the adopted subset shall be indicated +to the user" by a receiving device. One commonly used approach in +UTF-8 decoders is to replace any malformed UTF-8 sequence by a +replacement character (U+FFFD), which looks a bit like an inverted +question mark, or a similar symbol. It might be a good idea to +visually distinguish a malformed UTF-8 sequence from a correctly +encoded Unicode character that is just not available in the current +font but otherwise fully legal, even though ISO 10646-1 doesn't +mandate this. In any case, just ignoring malformed sequences or +unavailable characters does not conform to ISO 10646, will make +debugging more difficult, and can lead to user confusion. + +Please check, whether a malformed UTF-8 sequence is (1) represented at +all, (2) represented by exactly one single replacement character (or +equivalent signal), and (3) the following quotation mark after an +illegal UTF-8 sequence is correctly displayed, i.e. proper +resynchronization takes place immediately after any malformed +sequence. This file says "THE END" in the last line, so if you don't +see that, your decoder crashed somehow before, which should always be +cause for concern. + +All lines in this file are exactly 79 characters long (plus the line +feed). In addition, all lines end with "|", except for the two test +lines 2.1.1 and 2.2.1, which contain non-printable ASCII controls +U+0000 and U+007F. If you display this file with a fixed-width font, +these "|" characters should all line up in column 79 (right margin). +This allows you to test quickly, whether your UTF-8 decoder finds the +correct number of characters in every line, that is whether each +malformed sequences is replaced by a single replacement character. + +Note that, as an alternative to the notion of malformed sequence used +here, it is also a perfectly acceptable (and in some situations even +preferable) solution to represent each individual byte of a malformed +sequence with a replacement character. If you follow this strategy in +your decoder, then please ignore the "|" column. + + +Here come the tests: | + | +1 Some correct UTF-8 text | + | +You should see the Greek word 'kosme': "κόσμε" | + | +2 Boundary condition test cases | + | +2.1 First possible sequence of a certain length | + | +2.1.1 1 byte (U-00000000): "^@" // SWORD: removed. we don't support null mid-string, <- that's a literal <caret at> +2.1.2 2 bytes (U-00000080): "" | +2.1.3 3 bytes (U-00000800): "ࠀ" | +2.1.4 4 bytes (U-00010000): "𐀀" | +2.1.5 5 bytes (U-00200000): "" | +2.1.6 6 bytes (U-04000000): "" | + | +2.2 Last possible sequence of a certain length | + | +2.2.1 1 byte (U-0000007F): "" +2.2.2 2 bytes (U-000007FF): "߿" | +2.2.3 3 bytes (U-0000FFFF): "" | +2.2.4 4 bytes (U-001FFFFF): "" | +2.2.5 5 bytes (U-03FFFFFF): "" | +2.2.6 6 bytes (U-7FFFFFFF): "" | + | +2.3 Other boundary conditions | + | +2.3.1 U-0000D7FF = ed 9f bf = "" | +2.3.2 U-0000E000 = ee 80 80 = "" | +2.3.3 U-0000FFFD = ef bf bd = "�" | +2.3.4 U-0010FFFF = f4 8f bf bf = "" | +2.3.5 U-00110000 = f4 90 80 80 = "" | + | +3 Malformed sequences | + | +3.1 Unexpected continuation bytes | + | +Each unexpected continuation byte should be separately signalled as a | +malformed sequence of its own. | + | +3.1.1 First continuation byte 0x80: "" | +3.1.2 Last continuation byte 0xbf: "" | + | +3.1.3 2 continuation bytes: "" | +3.1.4 3 continuation bytes: "" | +3.1.5 4 continuation bytes: "" | +3.1.6 5 continuation bytes: "" | +3.1.7 6 continuation bytes: "" | +3.1.8 7 continuation bytes: "" | + | +3.1.9 Sequence of all 64 possible continuation bytes (0x80-0xbf): | + | + " | + | + | + " | + | +3.2 Lonely start characters | + | +3.2.1 All 32 first bytes of 2-byte sequences (0xc0-0xdf), | + each followed by a space character: | + | + " | + " | + | +3.2.2 All 16 first bytes of 3-byte sequences (0xe0-0xef), | + each followed by a space character: | + | + " " | + | +3.2.3 All 8 first bytes of 4-byte sequences (0xf0-0xf7), | + each followed by a space character: | + | + " " | + | +3.2.4 All 4 first bytes of 5-byte sequences (0xf8-0xfb), | + each followed by a space character: | + | + " " | + | +3.2.5 All 2 first bytes of 6-byte sequences (0xfc-0xfd), | + each followed by a space character: | + | + " " | + | +3.3 Sequences with last continuation byte missing | + | +All bytes of an incomplete sequence should be signalled as a single | +malformed sequence, i.e., you should see only a single replacement | +character in each of the next 10 tests. (Characters as in section 2) | + | +3.3.1 2-byte sequence with last byte missing (U+0000): "" | +3.3.2 3-byte sequence with last byte missing (U+0000): "" | +3.3.3 4-byte sequence with last byte missing (U+0000): "" | +3.3.4 5-byte sequence with last byte missing (U+0000): "" | +3.3.5 6-byte sequence with last byte missing (U+0000): "" | +3.3.6 2-byte sequence with last byte missing (U-000007FF): "" | +3.3.7 3-byte sequence with last byte missing (U-0000FFFF): "" | +3.3.8 4-byte sequence with last byte missing (U-001FFFFF): "" | +3.3.9 5-byte sequence with last byte missing (U-03FFFFFF): "" | +3.3.10 6-byte sequence with last byte missing (U-7FFFFFFF): "" | + | +3.4 Concatenation of incomplete sequences | + | +All the 10 sequences of 3.3 concatenated, you should see 10 malformed | +sequences being signalled: | + | + "" | + | +3.5 Impossible bytes | + | +The following two bytes cannot appear in a correct UTF-8 string | + | +3.5.1 fe = "" | +3.5.2 ff = "" | +3.5.3 fe fe ff ff = "" | + | +4 Overlong sequences | + | +The following sequences are not malformed according to the letter of | +the Unicode 2.0 standard. However, they are longer then necessary and | +a correct UTF-8 encoder is not allowed to produce them. A "safe UTF-8 | +decoder" should reject them just like malformed sequences for two | +reasons: (1) It helps to debug applications if overlong sequences are | +not treated as valid representations of characters, because this helps | +to spot problems more quickly. (2) Overlong sequences provide | +alternative representations of characters, that could maliciously be | +used to bypass filters that check only for ASCII characters. For | +instance, a 2-byte encoded line feed (LF) would not be caught by a | +line counter that counts only 0x0a bytes, but it would still be | +processed as a line feed by an unsafe UTF-8 decoder later in the | +pipeline. From a security point of view, ASCII compatibility of UTF-8 | +sequences means also, that ASCII characters are *only* allowed to be | +represented by ASCII bytes in the range 0x00-0x7f. To ensure this | +aspect of ASCII compatibility, use only "safe UTF-8 decoders" that | +reject overlong UTF-8 sequences for which a shorter encoding exists. | + | +4.1 Examples of an overlong ASCII character | + | +With a safe UTF-8 decoder, all of the following five overlong | +representations of the ASCII character slash ("/") should be rejected | +like a malformed UTF-8 sequence, for instance by substituting it with | +a replacement character. If you see a slash below, you do not have a | +safe UTF-8 decoder! | + | +4.1.1 U+002F = c0 af = "" | +4.1.2 U+002F = e0 80 af = "" | +4.1.3 U+002F = f0 80 80 af = "" | +4.1.4 U+002F = f8 80 80 80 af = "" | +4.1.5 U+002F = fc 80 80 80 80 af = "" | + | +4.2 Maximum overlong sequences | + | +Below you see the highest Unicode value that is still resulting in an | +overlong sequence if represented with the given number of bytes. This | +is a boundary test for safe UTF-8 decoders. All five characters should | +be rejected like malformed UTF-8 sequences. | + | +4.2.1 U-0000007F = c1 bf = "" | +4.2.2 U-000007FF = e0 9f bf = "" | +4.2.3 U-0000FFFF = f0 8f bf bf = "" | +4.2.4 U-001FFFFF = f8 87 bf bf bf = "" | +4.2.5 U-03FFFFFF = fc 83 bf bf bf bf = "" | + | +4.3 Overlong representation of the NUL character | + | +The following five sequences should also be rejected like malformed | +UTF-8 sequences and should not be treated like the ASCII NUL | +character. | + | +4.3.1 U+0000 = c0 80 = "" | +4.3.2 U+0000 = e0 80 80 = "" | +4.3.3 U+0000 = f0 80 80 80 = "" | +4.3.4 U+0000 = f8 80 80 80 80 = "" | +4.3.5 U+0000 = fc 80 80 80 80 80 = "" | + | +5 Illegal code positions | + | +The following UTF-8 sequences should be rejected like malformed | +sequences, because they never represent valid ISO 10646 characters and | +a UTF-8 decoder that accepts them might introduce security problems | +comparable to overlong UTF-8 sequences. | + | +5.1 Single UTF-16 surrogates | + | +5.1.1 U+D800 = ed a0 80 = "" | +5.1.2 U+DB7F = ed ad bf = "" | +5.1.3 U+DB80 = ed ae 80 = "" | +5.1.4 U+DBFF = ed af bf = "" | +5.1.5 U+DC00 = ed b0 80 = "" | +5.1.6 U+DF80 = ed be 80 = "" | +5.1.7 U+DFFF = ed bf bf = "" | + | +5.2 Paired UTF-16 surrogates | + | +5.2.1 U+D800 U+DC00 = ed a0 80 ed b0 80 = "" | +5.2.2 U+D800 U+DFFF = ed a0 80 ed bf bf = "" | +5.2.3 U+DB7F U+DC00 = ed ad bf ed b0 80 = "" | +5.2.4 U+DB7F U+DFFF = ed ad bf ed bf bf = "" | +5.2.5 U+DB80 U+DC00 = ed ae 80 ed b0 80 = "" | +5.2.6 U+DB80 U+DFFF = ed ae 80 ed bf bf = "" | +5.2.7 U+DBFF U+DC00 = ed af bf ed b0 80 = "" | +5.2.8 U+DBFF U+DFFF = ed af bf ed bf bf = "" | + | +5.3 Noncharacter code positions | + | +The following "noncharacters" are "reserved for internal use" by | +applications, and according to older versions of the Unicode Standard | +"should never be interchanged". Unicode Corrigendum #9 dropped the | +latter restriction. Nevertheless, their presence in incoming UTF-8 data | +can remain a potential security risk, depending on what use is made of | +these codes subsequently. Examples of such internal use: | + | + - Some file APIs with 16-bit characters may use the integer value -1 | + = U+FFFF to signal an end-of-file (EOF) or error condition. | + | + - In some UTF-16 receivers, code point U+FFFE might trigger a | + byte-swap operation (to convert between UTF-16LE and UTF-16BE). | + | +With such internal use of noncharacters, it may be desirable and safer | +to block those code points in UTF-8 decoders, as they should never | +occur legitimately in incoming UTF-8 data, and could trigger unsafe | +behaviour in subsequent processing. | + | +Particularly problematic noncharacters in 16-bit applications: | + | +5.3.1 U+FFFE = ef bf be = "" | +5.3.2 U+FFFF = ef bf bf = "" | + | +Other noncharacters: | + | +5.3.3 U+FDD0 .. U+FDEF = ""| + | +5.3.4 U+nFFFE U+nFFFF (for n = 1..10) | + | + " | + " | + | +THE END | diff --git a/tests/testsuite/gbsReference.imp b/tests/testsuite/gbsReference.imp new file mode 100644 index 0000000..ab5bca1 --- /dev/null +++ b/tests/testsuite/gbsReference.imp @@ -0,0 +1,42 @@ +$$$Chapter 1 +Text of chapter 1. +$$$/Chapter 2 +Text +of chapter 2. +$$$/Chapter 3/ +Text +of +chapter +3. +$$$Chapter 4/ +Text of chapter 4. +$$$/Chapter 4/Section 1 +Text of section 1 in chapter 4. +$$$Chapter 5 +Text of chapter 5. +$$$/Chapter 5/Section 1/ +Text of section 1 in chapter 5. +$$$Chapter 5/Section 2/ +Text of section 2 in chapter 5. +$$$Chapter 6 +Text of chapter 6. +$$$Chapter 6/Section 1 +Text of section 1 in chapter 6. +$$$Chapter 6/Section 2 +Text of section 2 in chapter 6. +$$$Chapter 6/Section 3 +Text of section 3 in chapter 6. +$$$Chapter 7 +Text of chapter 7. +$$$Chapter 7/Section 1 +Text of section 1 in chapter 7. +$$$Chapter 7/Section 1/Subsection 1 +Text of subsection 1 in section 1 of chapter 7. +$$$Chapter 7/Section 1/Subsection 1/Paragraph 1 +Text of paragraph 1 in subsection 1 of section 1 in chapter 7. +$$$Chapter 7/Section 1/Subsection 1/Paragraph 1/Sentence 1 +Text of sentence 1 in paragraph 1 of subsection 1 in section 1 of chapter 7. +$$$Chapter 8 +Text of chapter 8. + + diff --git a/tests/testsuite/gbs_basic.good b/tests/testsuite/gbs_basic.good new file mode 100644 index 0000000..9b77976 --- /dev/null +++ b/tests/testsuite/gbs_basic.good @@ -0,0 +1,66 @@ +Chapter 1 +/Chapter 2 +/Chapter 3/ +Chapter 4/ +/Chapter 4/Section 1 +Chapter 5 +/Chapter 5/Section 1/ +Chapter 5/Section 2/ +Chapter 6 +Chapter 6/Section 1 +Chapter 6/Section 2 +Chapter 6/Section 3 +Chapter 7 +Chapter 7/Section 1 +Chapter 7/Section 1/Subsection 1 +Chapter 7/Section 1/Subsection 1/Paragraph 1 +Chapter 7/Section 1/Subsection 1/Paragraph 1/Sentence 1 +Chapter 8 + +-- Plain output +/Chapter 7: Text of chapter 7. + +-- RTF output +{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}/Chapter 8: {\f1 Text of chapter 8.}\par +} + +-- imp dump +$$$ + +$$$/Chapter 1 +Text of chapter 1. +$$$/Chapter 2 +Text of chapter 2. +$$$/Chapter 3 +Text of chapter 3. +$$$/Chapter 4 +Text of chapter 4. +$$$/Chapter 4/Section 1 +Text of section 1 in chapter 4. +$$$/Chapter 5 +Text of chapter 5. +$$$/Chapter 5/Section 1 +Text of section 1 in chapter 5. +$$$/Chapter 5/Section 2 +Text of section 2 in chapter 5. +$$$/Chapter 6 +Text of chapter 6. +$$$/Chapter 6/Section 1 +Text of section 1 in chapter 6. +$$$/Chapter 6/Section 2 +Text of section 2 in chapter 6. +$$$/Chapter 6/Section 3 +Text of section 3 in chapter 6. +$$$/Chapter 7 +Text of chapter 7. +$$$/Chapter 7/Section 1 +Text of section 1 in chapter 7. +$$$/Chapter 7/Section 1/Subsection 1 +Text of subsection 1 in section 1 of chapter 7. +$$$/Chapter 7/Section 1/Subsection 1/Paragraph 1 +Text of paragraph 1 in subsection 1 of section 1 in chapter 7. +$$$/Chapter 7/Section 1/Subsection 1/Paragraph 1/Sentence 1 +Text of sentence 1 in paragraph 1 of subsection 1 in section 1 of chapter 7. +$$$/Chapter 8 +Text of chapter 8. + diff --git a/tests/testsuite/gbs_basic.sh b/tests/testsuite/gbs_basic.sh new file mode 100755 index 0000000..689e87d --- /dev/null +++ b/tests/testsuite/gbs_basic.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +rm -rf tmp/gbs_basic/ +mkdir -p tmp/gbs_basic/mods.d +mkdir -p tmp/gbs_basic/modules + +cat > tmp/gbs_basic/mods.d/gbsreference.conf <<! +[GBSReference] +DataPath=./modules/gbsreference +ModDrv=RawGenBook +Encoding=UTF-8 +SourceType=OSIS +Lang=en +Feature=StrongsNumbers +! + +../../utilities/imp2gbs gbsReference.imp -o tmp/gbs_basic/modules/gbsreference 2>&1 | grep -v \$Rev + +cd tmp/gbs_basic +#../../../gbstest GBSReference + +echo +echo "-- Plain output" +../../../../utilities/diatheke/diatheke -b GBSReference -f plain -k "Chapter 7" | grep -v GBSReference +echo +echo "-- RTF output" +../../../../utilities/diatheke/diatheke -b GBSReference -f RTF -k "Chapter 8" | grep -v GBSReference +echo +echo "-- imp dump" +../../../../utilities/mod2imp GBSReference diff --git a/tests/testsuite/greekaccents.good b/tests/testsuite/greekaccents.good new file mode 100644 index 0000000..a39dc3b --- /dev/null +++ b/tests/testsuite/greekaccents.good @@ -0,0 +1,7 @@ +Και καθως Μωυσης υψωσεν τον οφιν εν τη ερημω, ουτως υψωθηναι δει τον υιον του ανθρωπου, +ινα πας ο πιστευων ⸂εν αυτω⸃ ⸆ εχη ζωην αιωνιον. +ουτως γαρ ηγαπησεν ο θεος τον κοσμον, ωστε τον υιον ⸆ τον μονογενη εδωκεν, ινα πας ο πιστευων εις αυτον μη αποληται αλλ εχη ζωην αιωνιον. +ου γαρ απεστειλεν ο θεος τον υιον ⸆ εις τον κοσμον ινα κρινη τον κοσμον, αλλ ινα σωθη ο κοσμος δι αυτου. +ο πιστευων εις αυτον ου κρινεται· ο °δε μη πιστευων ηδη κεκριται, οτι μη πεπιστευκεν εις το ονομα του μονογενους υιου του θεου. +αυτη δε εστιν η κρισις οτι °το φως εληλυθεν εις τον κοσμον και ⸉ηγαπησαν οι ανθρωποι μαλλον το σκοτος⸊ η το φως· ην γαρ ⸉¹αυτων πονηρα⸊ τα εργα. + diff --git a/tests/testsuite/greekaccents.sh b/tests/testsuite/greekaccents.sh new file mode 100755 index 0000000..f0def67 --- /dev/null +++ b/tests/testsuite/greekaccents.sh @@ -0,0 +1,8 @@ +#/bin/sh + +# there is an iteration value as the last parameter and can be used +# for testing speed. Set to 999999 my results on my Dell Precision 5510 +# real 0m8.952s +# user 0m8.939s +# sys 0m0.004s +../utf8norm -ga 999 < greekaccents.txt diff --git a/tests/testsuite/greekaccents.txt b/tests/testsuite/greekaccents.txt new file mode 100644 index 0000000..e8b3de8 --- /dev/null +++ b/tests/testsuite/greekaccents.txt @@ -0,0 +1,7 @@ +Καὶ καθὼς Μωϋσῆς ὕψωσεν τὸν ὄφιν ἐν τῇ ἐρήμῳ, οὕτως ὑψωθῆναι δεῖ τὸν υἱὸν τοῦ ἀνθρώπου, +ἵνα πᾶς ὁ πιστεύων ⸂ἐν αὐτῷ⸃ ⸆ ἔχῃ ζωὴν αἰώνιον. +οὕτως γὰρ ἠγάπησεν ὁ θεὸς τὸν κόσμον, ὥστε τὸν υἱὸν ⸆ τὸν μονογενῆ ἔδωκεν, ἵνα πᾶς ὁ πιστεύων εἰς αὐτὸν μὴ ἀπόληται ἀλλ᾿ ἔχῃ ζωὴν αἰώνιον. +οὐ γὰρ ἀπέστειλεν ὁ θεὸς τὸν υἱὸν ⸆ εἰς τὸν κόσμον ἵνα κρίνῃ τὸν κόσμον, ἀλλ᾿ ἵνα σωθῇ ὁ κόσμος δι᾿ αὐτοῦ. +ὁ πιστεύων εἰς αὐτὸν οὐ κρίνεται· ὁ °δὲ μὴ πιστεύων ἤδη κέκριται, ὅτι μὴ πεπίστευκεν εἰς τὸ ὄνομα τοῦ μονογενοῦς υἱοῦ τοῦ θεοῦ. +αὕτη δέ ἐστιν ἡ κρίσις ὅτι °τὸ φῶς ἐλήλυθεν εἰς τὸν κόσμον καὶ ⸉ἠγάπησαν οἱ ἄνθρωποι μᾶλλον τὸ σκότος⸊ ἢ τὸ φῶς· ἦν γὰρ ⸉¹αὐτῶν πονηρὰ⸊ τὰ ἔργα. + diff --git a/tests/testsuite/ldr12n.good b/tests/testsuite/ldr12n.good new file mode 100644 index 0000000..1906020 --- /dev/null +++ b/tests/testsuite/ldr12n.good @@ -0,0 +1,24 @@ +0001 +0002 +0003 +4 +0005 +0006 +0001 +0002 +0003 +4 +0005 +0006 +0001: Body of 1 +0002: Body of 2 +0003: Body of 3 +0005: Body of 5 +0006: Body of 6 +4: Body of 4 +00001: Body of 1 +00002: Body of 2 +00003: Body of 3 +00004: Body of 4 +00005: Body of 5 +00006: Body of 6 diff --git a/tests/testsuite/ldr12n.imp b/tests/testsuite/ldr12n.imp new file mode 100644 index 0000000..17cecfc --- /dev/null +++ b/tests/testsuite/ldr12n.imp @@ -0,0 +1,12 @@ +$$$0001 +Body of 1 +$$$0002 +Body of 2 +$$$0003 +Body of 3 +$$$4 +Body of 4 +$$$0005 +Body of 5 +$$$0006 +Body of 6 diff --git a/tests/testsuite/ldr12n.sh b/tests/testsuite/ldr12n.sh new file mode 100755 index 0000000..a406d0a --- /dev/null +++ b/tests/testsuite/ldr12n.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# Lexicon / Dictionary regularization tests to make sure we pad and lookup correctly + +rm -rf tmp/ldr12n/ +mkdir -p tmp/ldr12n/mods.d +mkdir -p tmp/ldr12n/modules + +cat > tmp/ldr12n/mods.d/ldr12n.conf <<! +[ldr12n] +DataPath=./modules/ldr12n +ModDrv=RawLD +Encoding=UTF-8 +SourceType=Plain +Lang=en +StrongsPadding=false +! + +cat > tmp/ldr12n/mods.d/ldr12np.conf <<! +[ldr12np] +DataPath=./modules/ldr12np +ModDrv=RawLD +Encoding=UTF-8 +SourceType=Plain +Lang=en +StrongsPadding=true +! + +../../utilities/imp2ld ldr12n.imp -P -o tmp/ldr12n/modules/ldr12n 2>&1 | grep -v \$Rev +../../utilities/imp2ld ldr12n.imp -o tmp/ldr12n/modules/ldr12np 2>&1 | grep -v \$Rev + +cd tmp/ldr12n && ../../../ldtest ldr12n && ../../../ldtest ldr12np diff --git a/tests/testsuite/listtest.sh b/tests/testsuite/listtest.sh index 855d161..0666979 100755 --- a/tests/testsuite/listtest.sh +++ b/tests/testsuite/listtest.sh @@ -1,7 +1,7 @@ #!/bin/sh #****************************************************************************** # -# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ +# $Id: listtest.sh 3063 2014-03-04 13:04:11Z chrislit $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society diff --git a/tests/testsuite/osis.good b/tests/testsuite/osis.good deleted file mode 100644 index 508e148..0000000 --- a/tests/testsuite/osis.good +++ /dev/null @@ -1,102 +0,0 @@ -SUCCESS: ../../utilities/osis2mod: has finished its work and will now rest -Key: -Psalms 3:1 -------- -Preverse Header 0: -Raw: -<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="x-p"/> <lg sID="gen14"/> -------- -Rendered Header: - <h3>A Psalm of David, when he fled from Absalom his son.</h3> - -<br /> - -------- -CSS: - .divineName { font-variant: small-caps; } - .wordsOfJesus { color: red; } - .transChangeSupplied { font-style: italic; } - .overline { text-decoration: overline; } - .indent1 { margin-left: 10px } - .indent2 { margin-left: 20px } - .indent3 { margin-left: 30px } - .indent4 { margin-left: 40px } - -------- -RenderText: - <span class="line indent0"><span class="divineName">Lord</span>, how are they increased that trouble me!</span><br /> -<span class="line indent0">many <span class="transChangeSupplied">are</span> they that rise up against me.</span><br /> - -------- -------- - -Key: -Mark 1:14 -------- -Preverse Header 0: -Raw: -<div sID="gen22" type="section"/> <title>The Beginning of the Ministry of Jesus</title> <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>) </title> <div sID="gen23" type="x-p"/> -------- -Rendered Header: - <h3>The Beginning of the Ministry of Jesus</h3> - -<h3>(<a href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3> - -<br /> - -------- -CSS: - .divineName { font-variant: small-caps; } - .wordsOfJesus { color: red; } - .transChangeSupplied { font-style: italic; } - .overline { text-decoration: overline; } - .indent1 { margin-left: 10px } - .indent2 { margin-left: 20px } - .indent3 { margin-left: 30px } - .indent4 { margin-left: 40px } - -------- -RenderText: - Now after that John was put in prison, Jesus came into Galilee, preaching the gospel of the kingdom of God, -------- -------- - - -Whitespace tests around headings: - - - <h1 class="bookHeader">Old Testament</h1> - - <h1 class="bookHeader">THE FIRST BOOK OF MOSES CALLED GENESIS</h1> - - <h1 class="bookHeader">Introduction and Outline</h1> - -<br /> -This is the <b>Book of Genesis</b>, the <i>first</i> book in the Bible. It may be outlined as follows: <br /> -<br /> -<ul> - <li><sup>1</i>Creation of Heaven and Earth, 1:1-2:4a</li> - <li><sup>2</i>Creation of Man and Woman, 2:4b-25</li> - <li><sub>3</sub>Fall, 3:1-24</li> - <li>...</li> -</ul> - <br /> -Tables work like this: <table><tbody> - <tr> <td><b>Column 1 Label</b></td> <td><b>Column 2 Label</b></td> </tr> - <tr> <td>Column 1, Row 1</td> <td>Column 2, Row 1</td> </tr> - <tr> <td>Column 1, Row 2</td> <td>Column 2, Row 2</td> </tr> - </tbody></table> -<br /> - - <h2 class="chapterHeader">From Creation to Abraham (1:1–11:9)</h2> - - - <h3>Creation of the Heavens and the Earth</h3> - -<br /> - -[ Genesis 1:1 ] In the beginning God created the heaven and the earth. <br /> - -<br /> - -[ Genesis 1:2 ] Text of verse 2. diff --git a/tests/testsuite/osis.sh b/tests/testsuite/osis.sh deleted file mode 100755 index 689e64d..0000000 --- a/tests/testsuite/osis.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -rm -rf osis/ -mkdir -p osis/mods.d -mkdir -p osis/modules - -cat > osis/mods.d/osisreference.conf <<! -[OSISReference] -DataPath=./modules/ -ModDrv=zText -Encoding=UTF-8 -BlockType=BOOK -CompressType=ZIP -SourceType=OSIS -Lang=en -GlobalOptionFilter=OSISStrongs -GlobalOptionFilter=OSISMorph -GlobalOptionFilter=OSISFootnotes -GlobalOptionFilter=OSISHeadings -GlobalOptionFilter=OSISRedLetterWords -Feature=StrongsNumbers -! - -../../utilities/osis2mod osis/modules/ osisReference.xml -z 2>&1 | grep -v \$Rev - -cd osis && ../../osistest OSISReference diff --git a/tests/testsuite/osisReference.xml b/tests/testsuite/osisReference.xml index d07f774..0ef86e5 100644 --- a/tests/testsuite/osisReference.xml +++ b/tests/testsuite/osisReference.xml @@ -141,6 +141,16 @@ </div> <div type="bookGroup"> <title>New Testament</title> + <div type="book" osisID="Matt"> + <chapter osisID="Matt.2"/> + <verse osisID="Matt.2.5"> + <w lemma="strong:G3004">They said</w> to him, <q level="1" marker="“" sID="q.5787"/><note n="A" osisID="Matt.2.5.xref.A" type="crossReference"><reference osisRef="John.7.42">John 7:42</reference></note><w lemma="strong:G965">In Bethlehem</w> <w lemma="strong:G2453">of Judea</w>; <w lemma="strong:G3779">for this</w> <w lemma="strong:G3704">is what</w> <w lemma="strong:G1125">has been written</w> <note n="1" osisID="Matt.2.5.note.1" type="explanation">Or <hi type="italic">through</hi></note><w lemma="strong:G4396">by the prophet</w>: + </verse> + <verse osisID="Matt.2.6"> + <lg sID="lg.300"/><l sID="l.20649"/><q level="2" marker="‘" sID="q.5788"/><note n="A" osisID="Matt.2.6.xref.A" type="crossReference"><reference osisRef="Mic.5.2">Mic 5:2</reference>; <reference osisRef="John.7.42">John 7:42</reference></note><hi type="small-caps"><w lemma="strong:G965">And you, Bethlehem</w>, <w lemma="strong:G1093">land</w> <w lemma="strong:G2455">of Judah</w></hi>, <l eID="l.20649"/><l sID="l.20650"/><hi type="small-caps"><w lemma="strong:G3760">Are by no</w> <w lemma="strong:G3760">means</w> <w lemma="strong:G1646">least</w> <w lemma="strong:G1722">among</w> <w lemma="strong:G2233">the leaders</w> <w lemma="strong:G2455">of Judah</w></hi>; <l eID="l.20650"/><l sID="l.20651"/><hi type="small-caps"><w lemma="strong:G1831">For out of you shall come</w> <w lemma="strong:G1831">forth</w> <w lemma="strong:G2233">a Ruler</w></hi> <l eID="l.20651"/><l sID="l.20652"/><hi type="small-caps"><w lemma="strong:G3748">Who</w> will</hi> <note n="B" osisID="Matt.2.6.xref.B" type="crossReference"><reference osisRef="John.21.16">John 21:16</reference></note><hi type="small-caps"><w lemma="strong:G4165">shepherd</w> <w lemma="strong:G2992">My people</w> <w lemma="strong:G2474">Israel</w></hi>.<q eID="q.5788" level="2" marker="’"/><q eID="q.5787" level="1" marker="”"/> <lb type="x-end-paragraph"/> + </verse> + </chapter> + </div> <div type="book" osisID="Mark"> <title type="main">THE GOSPEL ACCORDING TO <abbr expansion="Saint">ST.</abbr> MARK</title> <chapter sID="Mark.1" osisID="Mark.1"/> @@ -178,6 +188,11 @@ And He was in the wilderness forty days being tempted by Satan; and He was with </div> <chapter eID="Mark.1"/> </div> + <div type="book" osisID="Acts"> + <chapter sID="Acts.2" osisID="Acts.2"/> + <verse sID="Acts.2.19" osisID="Acts.2.19"/><l level="1">‘<hi type="small-caps"><w lemma="strong:G1325">And I will grant</w> <w lemma="strong:G5059">wonders</w> <w lemma="strong:G3772">in the sky</w> <w lemma="strong:G0507">above</w></hi></l><l level="1"> <hi type="small-caps"><w lemma="strong:G4592">And signs</w> <w lemma="strong:G1093">on the earth</w> <w lemma="strong:G2736">below</w></hi>,</l><l level="1"> <hi type="small-caps"><w lemma="strong:G0129">Blood</w>, <w lemma="strong:G4442">and fire</w>, <w lemma="strong:G0822">and vapor</w> <w lemma="strong:G2586">of smoke</w></hi>.</l><verse eID="Acts.2.19"/> + <verse sID="Acts.2.20" osisID="Acts.2.20"/><l level="1">‘<hi type="small-caps"><w lemma="strong:G2246">The sun</w> <w lemma="strong:G3344">will be turned</w> <w lemma="strong:G4655">into darkness</w></hi></l><l level="1"> <hi type="small-caps"><w lemma="strong:G4582">And the moon</w> <w lemma="strong:G0129">into blood</w></hi>,</l><l level="1"> <hi type="small-caps"><w lemma="strong:G4250">Before</w> <w lemma="strong:G3173">the great</w> <w lemma="strong:G2016">and glorious</w> <w lemma="strong:G2250">day</w> <w lemma="strong:G2962">of the Lord</w> <w lemma="strong:G2064">shall come</w></hi>.</l><verse eID="Acts.2.20"/> + <chapter eID="Acts.2"/> </div> </osisText> </osis> diff --git a/tests/testsuite/osis_basic.good b/tests/testsuite/osis_basic.good new file mode 100644 index 0000000..ab3123f --- /dev/null +++ b/tests/testsuite/osis_basic.good @@ -0,0 +1,186 @@ +SUCCESS: ../../utilities/osis2mod: has finished its work and will now rest +Key: +Psalms 3:1 +------- +Preverse Header 0: +Raw: +<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="x-p"/> <lg sID="gen14"/> +------- +Rendered Header: + <h3 class="title psalm canonical">A Psalm of David, when he fled from Absalom his son.</h3> + +<br /> + +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChange { font-style: italic; } + .transChange.transChange-supplied { font-style: italic; } + .transChange.transChange-added { font-style: italic; } + .transChange.transChange-tenseChange::before { content: '*'; } + .transChange.transChange-tenseChange { font-style: normal; } + .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; } + .overline { text-decoration: overline; } + .indent1 { margin-left: 1em; } + .indent2 { margin-left: 2em; } + .indent3 { margin-left: 3em; } + .indent4 { margin-left: 4em; } + abbr { &:hover{ &:before{ content: attr(title); } } } + .small-caps { font-variant: small-caps; } + .selah { text-align: right; width: 50%; margin: 0; padding: 0; } + .acrostic { text-align: center; } + .colophon {font-style: italic; font-size: small; display: block; } + .rdg { font-style: italic; } + .catchWord {font-style: bold; } + .x-p-indent {text-indent: 1em; } + +------- +RenderText: + <span class="line indent0"><span class="divineName">Lord</span>, how are they increased that trouble me!</span><br /> +<span class="line indent0">many <span class="transChange transChange-added">are</span> they that rise up against me.</span><br /> + +------- +------- + +Key: +Matthew 2:6 +------- +Preverse Header 0: +Raw: +<div></div> +------- +Rendered Header: +<div class=""></div> +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChange { font-style: italic; } + .transChange.transChange-supplied { font-style: italic; } + .transChange.transChange-added { font-style: italic; } + .transChange.transChange-tenseChange::before { content: '*'; } + .transChange.transChange-tenseChange { font-style: normal; } + .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; } + .overline { text-decoration: overline; } + .indent1 { margin-left: 1em; } + .indent2 { margin-left: 2em; } + .indent3 { margin-left: 3em; } + .indent4 { margin-left: 4em; } + abbr { &:hover{ &:before{ content: attr(title); } } } + .small-caps { font-variant: small-caps; } + .selah { text-align: right; width: 50%; margin: 0; padding: 0; } + .acrostic { text-align: center; } + .colophon {font-style: italic; font-size: small; display: block; } + .rdg { font-style: italic; } + .catchWord {font-style: bold; } + .x-p-indent {text-indent: 1em; } + +------- +RenderText: +<span class="line indent0">‘<a class=" crossReference" href="passagestudy.jsp?action=showNote&type=x&value=1&module=OSISReference&passage=Matthew+2%3A6"><small><sup class="x">*x</sup></small></a><span class="small-caps">And you, Bethlehem, land of Judah</span>, </span><br /> +<span class="line indent0"><span class="small-caps">Are by no means least among the leaders of Judah</span>; </span><br /> +<span class="line indent0"><span class="small-caps">For out of you shall come forth a Ruler</span> </span><br /> +<span class="line indent0"><span class="small-caps">Who will</span> <a class=" crossReference" href="passagestudy.jsp?action=showNote&type=x&value=2&module=OSISReference&passage=Matthew+2%3A6"><small><sup class="x">*x</sup></small></a><span class="small-caps">shepherd My people Israel</span>.’” <br /> + +------- +------- + +Key: +Mark 1:14 +------- +Preverse Header 0: +Raw: +<div sID="gen25" type="section"/> <title>The Beginning of the Ministry of Jesus</title> <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>) </title> <div sID="gen26" type="x-p"/> +------- +Rendered Header: + <h3 class="title">The Beginning of the Ministry of Jesus</h3> + +<h3 class="title parallel">(<a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3> + +<br /> + +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChange { font-style: italic; } + .transChange.transChange-supplied { font-style: italic; } + .transChange.transChange-added { font-style: italic; } + .transChange.transChange-tenseChange::before { content: '*'; } + .transChange.transChange-tenseChange { font-style: normal; } + .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; } + .overline { text-decoration: overline; } + .indent1 { margin-left: 1em; } + .indent2 { margin-left: 2em; } + .indent3 { margin-left: 3em; } + .indent4 { margin-left: 4em; } + abbr { &:hover{ &:before{ content: attr(title); } } } + .small-caps { font-variant: small-caps; } + .selah { text-align: right; width: 50%; margin: 0; padding: 0; } + .acrostic { text-align: center; } + .colophon {font-style: italic; font-size: small; display: block; } + .rdg { font-style: italic; } + .catchWord {font-style: bold; } + .x-p-indent {text-indent: 1em; } + +------- +RenderText: + Now after that John was put in prison, Jesus came into Galilee, preaching the gospel of the kingdom of God, +------- +------- + + +Whitespace tests around headings: + + + <h1 class="bookHeader">Old Testament</h1> + + <h1 class="bookHeader main">THE FIRST BOOK OF MOSES CALLED GENESIS</h1> + + <h1 class="bookHeader">Introduction and Outline</h1> + +<br /> +This is the <b>Book of Genesis</b>, the <i>first</i> book in the Bible. It may be outlined as follows: <br /> +<br /> +<ul> + <li><sup>1</sup>Creation of Heaven and Earth, 1:1-2:4a</li> + <li><sup>2</sup>Creation of Man and Woman, 2:4b-25</li> + <li><sub>3</sub>Fall, 3:1-24</li> + <li>...</li> +</ul> + <br /> +Tables work like this: <table><tbody> + <tr> <td><b>Column 1 Label</b></td> <td><b>Column 2 Label</b></td> </tr> + <tr> <td>Column 1, Row 1</td> <td>Column 2, Row 1</td> </tr> + <tr> <td>Column 1, Row 2</td> <td>Column 2, Row 2</td> </tr> + </tbody></table> +<br /> + + <h2 class="chapterHeader">From Creation to Abraham (1:1–11:9)</h2> + + + <h3 class="title">Creation of the Heavens and the Earth</h3> + +<br /> + +[ Genesis 1:1 ] In the beginning God created the heaven and the earth. <br /> + +<br /> + +[ Genesis 1:2 ] Text of verse 2. + +-- Plain output +Acts 2:19: ‘* And I will grant wonders in the sky above * +* And signs on the earth below *, +* Blood, and fire, and vapor of smoke *. + +Acts 2:20: ‘* The sun will be turned into darkness * +* And the moon into blood *, +* Before the great and glorious day of the Lord shall come *. + + +-- RTF output +{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par +Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par +} diff --git a/tests/testsuite/osis_basic.sh b/tests/testsuite/osis_basic.sh new file mode 100755 index 0000000..2a9066b --- /dev/null +++ b/tests/testsuite/osis_basic.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +rm -rf tmp/osis_basic/ +mkdir -p tmp/osis_basic/mods.d +mkdir -p tmp/osis_basic/modules + +cat > tmp/osis_basic/mods.d/osisreference.conf <<! +[OSISReference] +DataPath=./modules/ +ModDrv=zText +Encoding=UTF-8 +BlockType=BOOK +CompressType=ZIP +SourceType=OSIS +Lang=en +GlobalOptionFilter=OSISLemma +GlobalOptionFilter=OSISStrongs +GlobalOptionFilter=OSISMorph +GlobalOptionFilter=OSISFootnotes +GlobalOptionFilter=OSISHeadings +GlobalOptionFilter=OSISRedLetterWords +Feature=StrongsNumbers +! + +../../utilities/osis2mod tmp/osis_basic/modules/ osisReference.xml -z 2>&1 | grep -v \$Rev + +cd tmp/osis_basic +../../../osistest OSISReference + +echo +echo "-- Plain output" +../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-20 | grep -v OSISReference +echo +echo "-- RTF output" +../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-20 | grep -v OSISReference diff --git a/tests/testsuite/osis_mod2zmod.good b/tests/testsuite/osis_mod2zmod.good new file mode 100644 index 0000000..36ec4fe --- /dev/null +++ b/tests/testsuite/osis_mod2zmod.good @@ -0,0 +1,186 @@ +SUCCESS: ../../utilities/osis2mod: has finished its work and will now rest +Key: +Psalms 3:1 +------- +Preverse Header 0: +Raw: +<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="x-p"/> <lg sID="gen14"/> +------- +Rendered Header: + <h3 class="title psalm canonical">A Psalm of David, when he fled from Absalom his son.</h3> + +<br /> + +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChange { font-style: italic; } + .transChange.transChange-supplied { font-style: italic; } + .transChange.transChange-added { font-style: italic; } + .transChange.transChange-tenseChange::before { content: '*'; } + .transChange.transChange-tenseChange { font-style: normal; } + .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; } + .overline { text-decoration: overline; } + .indent1 { margin-left: 1em; } + .indent2 { margin-left: 2em; } + .indent3 { margin-left: 3em; } + .indent4 { margin-left: 4em; } + abbr { &:hover{ &:before{ content: attr(title); } } } + .small-caps { font-variant: small-caps; } + .selah { text-align: right; width: 50%; margin: 0; padding: 0; } + .acrostic { text-align: center; } + .colophon {font-style: italic; font-size: small; display: block; } + .rdg { font-style: italic; } + .catchWord {font-style: bold; } + .x-p-indent {text-indent: 1em; } + +------- +RenderText: + <span class="line indent0"><span class="divineName">Lord</span>, how are they increased that trouble me!</span><br /> +<span class="line indent0">many <span class="transChange transChange-added">are</span> they that rise up against me.</span><br /> + +------- +------- + +Key: +Matthew 2:6 +------- +Preverse Header 0: +Raw: +<div></div> +------- +Rendered Header: +<div class=""></div> +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChange { font-style: italic; } + .transChange.transChange-supplied { font-style: italic; } + .transChange.transChange-added { font-style: italic; } + .transChange.transChange-tenseChange::before { content: '*'; } + .transChange.transChange-tenseChange { font-style: normal; } + .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; } + .overline { text-decoration: overline; } + .indent1 { margin-left: 1em; } + .indent2 { margin-left: 2em; } + .indent3 { margin-left: 3em; } + .indent4 { margin-left: 4em; } + abbr { &:hover{ &:before{ content: attr(title); } } } + .small-caps { font-variant: small-caps; } + .selah { text-align: right; width: 50%; margin: 0; padding: 0; } + .acrostic { text-align: center; } + .colophon {font-style: italic; font-size: small; display: block; } + .rdg { font-style: italic; } + .catchWord {font-style: bold; } + .x-p-indent {text-indent: 1em; } + +------- +RenderText: +<span class="line indent0">‘<a class=" crossReference" href="passagestudy.jsp?action=showNote&type=x&value=1&module=zOSISReference&passage=Matthew+2%3A6"><small><sup class="x">*x</sup></small></a><span class="small-caps">And you, Bethlehem, land of Judah</span>, </span><br /> +<span class="line indent0"><span class="small-caps">Are by no means least among the leaders of Judah</span>; </span><br /> +<span class="line indent0"><span class="small-caps">For out of you shall come forth a Ruler</span> </span><br /> +<span class="line indent0"><span class="small-caps">Who will</span> <a class=" crossReference" href="passagestudy.jsp?action=showNote&type=x&value=2&module=zOSISReference&passage=Matthew+2%3A6"><small><sup class="x">*x</sup></small></a><span class="small-caps">shepherd My people Israel</span>.’” <br /> + +------- +------- + +Key: +Mark 1:14 +------- +Preverse Header 0: +Raw: +<div sID="gen25" type="section"/> <title>The Beginning of the Ministry of Jesus</title> <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>) </title> <div sID="gen26" type="x-p"/> +------- +Rendered Header: + <h3 class="title">The Beginning of the Ministry of Jesus</h3> + +<h3 class="title parallel">(<a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3> + +<br /> + +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChange { font-style: italic; } + .transChange.transChange-supplied { font-style: italic; } + .transChange.transChange-added { font-style: italic; } + .transChange.transChange-tenseChange::before { content: '*'; } + .transChange.transChange-tenseChange { font-style: normal; } + .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; } + .overline { text-decoration: overline; } + .indent1 { margin-left: 1em; } + .indent2 { margin-left: 2em; } + .indent3 { margin-left: 3em; } + .indent4 { margin-left: 4em; } + abbr { &:hover{ &:before{ content: attr(title); } } } + .small-caps { font-variant: small-caps; } + .selah { text-align: right; width: 50%; margin: 0; padding: 0; } + .acrostic { text-align: center; } + .colophon {font-style: italic; font-size: small; display: block; } + .rdg { font-style: italic; } + .catchWord {font-style: bold; } + .x-p-indent {text-indent: 1em; } + +------- +RenderText: + Now after that John was put in prison, Jesus came into Galilee, preaching the gospel of the kingdom of God, +------- +------- + + +Whitespace tests around headings: + + + <h1 class="bookHeader">Old Testament</h1> + + <h1 class="bookHeader main">THE FIRST BOOK OF MOSES CALLED GENESIS</h1> + + <h1 class="bookHeader">Introduction and Outline</h1> + +<br /> +This is the <b>Book of Genesis</b>, the <i>first</i> book in the Bible. It may be outlined as follows: <br /> +<br /> +<ul> + <li><sup>1</sup>Creation of Heaven and Earth, 1:1-2:4a</li> + <li><sup>2</sup>Creation of Man and Woman, 2:4b-25</li> + <li><sub>3</sub>Fall, 3:1-24</li> + <li>...</li> +</ul> + <br /> +Tables work like this: <table><tbody> + <tr> <td><b>Column 1 Label</b></td> <td><b>Column 2 Label</b></td> </tr> + <tr> <td>Column 1, Row 1</td> <td>Column 2, Row 1</td> </tr> + <tr> <td>Column 1, Row 2</td> <td>Column 2, Row 2</td> </tr> + </tbody></table> +<br /> + + <h2 class="chapterHeader">From Creation to Abraham (1:1–11:9)</h2> + + + <h3 class="title">Creation of the Heavens and the Earth</h3> + +<br /> + +[ Genesis 1:1 ] In the beginning God created the heaven and the earth. <br /> + +<br /> + +[ Genesis 1:2 ] Text of verse 2. + +-- Plain output +Acts 2:19: ‘* And I will grant wonders in the sky above * +* And signs on the earth below *, +* Blood, and fire, and vapor of smoke *. + +Acts 2:20: ‘* The sun will be turned into darkness * +* And the moon into blood *, +* Before the great and glorious day of the Lord shall come *. + + +-- RTF output +{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par +Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par +} diff --git a/tests/testsuite/osis_mod2zmod.sh b/tests/testsuite/osis_mod2zmod.sh new file mode 100755 index 0000000..52149fc --- /dev/null +++ b/tests/testsuite/osis_mod2zmod.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +rm -rf tmp/osis_mod2zmod/ +mkdir -p tmp/osis_mod2zmod/mods.d +mkdir -p tmp/osis_mod2zmod/modules +mkdir -p tmp/osis_mod2zmod/zmodules + +cat > tmp/osis_mod2zmod/mods.d/osisreference.conf <<! +[OSISReference] +DataPath=./modules/ +ModDrv=RawText +#ModDrv=zText +#CipherKey=abc123 +Encoding=UTF-8 +BlockType=BOOK +CompressType=ZIP +SourceType=OSIS +Lang=en +GlobalOptionFilter=OSISLemma +GlobalOptionFilter=OSISStrongs +GlobalOptionFilter=OSISMorph +GlobalOptionFilter=OSISFootnotes +GlobalOptionFilter=OSISHeadings +GlobalOptionFilter=OSISRedLetterWords +Feature=StrongsNumbers +! + +cat > tmp/osis_mod2zmod/mods.d/zosisreference.conf <<! +[zOSISReference] +DataPath=./zmodules/ +#ModDrv=RawText +ModDrv=zText +CipherKey=abc123 +Encoding=UTF-8 +BlockType=BOOK +CompressType=ZIP +SourceType=OSIS +Lang=en +GlobalOptionFilter=OSISLemma +GlobalOptionFilter=OSISStrongs +GlobalOptionFilter=OSISMorph +GlobalOptionFilter=OSISFootnotes +GlobalOptionFilter=OSISHeadings +GlobalOptionFilter=OSISRedLetterWords +Feature=StrongsNumbers +! + +../../utilities/osis2mod tmp/osis_mod2zmod/modules/ osisReference.xml 2>&1 | grep -v \$Rev + +sed 's/OSISReference/zOSISReference/' osis_basic.good > osis_mod2zmod.good +cd tmp/osis_mod2zmod +../../../../utilities/mod2zmod OSISReference zmodules/ 4 2 0 abc123 > /dev/null 2>&1 +../../../osistest zOSISReference + +echo +echo "-- Plain output" +../../../../utilities/diatheke/diatheke -b zOSISReference -f plain -k Acts 2:19-20 | grep -v zOSISReference +echo +echo "-- RTF output" +../../../../utilities/diatheke/diatheke -b zOSISReference -f RTF -k Acts 2:19-20 | grep -v zOSISReference diff --git a/tests/testsuite/osis_osis2modcipher.good b/tests/testsuite/osis_osis2modcipher.good new file mode 100644 index 0000000..ab3123f --- /dev/null +++ b/tests/testsuite/osis_osis2modcipher.good @@ -0,0 +1,186 @@ +SUCCESS: ../../utilities/osis2mod: has finished its work and will now rest +Key: +Psalms 3:1 +------- +Preverse Header 0: +Raw: +<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="x-p"/> <lg sID="gen14"/> +------- +Rendered Header: + <h3 class="title psalm canonical">A Psalm of David, when he fled from Absalom his son.</h3> + +<br /> + +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChange { font-style: italic; } + .transChange.transChange-supplied { font-style: italic; } + .transChange.transChange-added { font-style: italic; } + .transChange.transChange-tenseChange::before { content: '*'; } + .transChange.transChange-tenseChange { font-style: normal; } + .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; } + .overline { text-decoration: overline; } + .indent1 { margin-left: 1em; } + .indent2 { margin-left: 2em; } + .indent3 { margin-left: 3em; } + .indent4 { margin-left: 4em; } + abbr { &:hover{ &:before{ content: attr(title); } } } + .small-caps { font-variant: small-caps; } + .selah { text-align: right; width: 50%; margin: 0; padding: 0; } + .acrostic { text-align: center; } + .colophon {font-style: italic; font-size: small; display: block; } + .rdg { font-style: italic; } + .catchWord {font-style: bold; } + .x-p-indent {text-indent: 1em; } + +------- +RenderText: + <span class="line indent0"><span class="divineName">Lord</span>, how are they increased that trouble me!</span><br /> +<span class="line indent0">many <span class="transChange transChange-added">are</span> they that rise up against me.</span><br /> + +------- +------- + +Key: +Matthew 2:6 +------- +Preverse Header 0: +Raw: +<div></div> +------- +Rendered Header: +<div class=""></div> +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChange { font-style: italic; } + .transChange.transChange-supplied { font-style: italic; } + .transChange.transChange-added { font-style: italic; } + .transChange.transChange-tenseChange::before { content: '*'; } + .transChange.transChange-tenseChange { font-style: normal; } + .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; } + .overline { text-decoration: overline; } + .indent1 { margin-left: 1em; } + .indent2 { margin-left: 2em; } + .indent3 { margin-left: 3em; } + .indent4 { margin-left: 4em; } + abbr { &:hover{ &:before{ content: attr(title); } } } + .small-caps { font-variant: small-caps; } + .selah { text-align: right; width: 50%; margin: 0; padding: 0; } + .acrostic { text-align: center; } + .colophon {font-style: italic; font-size: small; display: block; } + .rdg { font-style: italic; } + .catchWord {font-style: bold; } + .x-p-indent {text-indent: 1em; } + +------- +RenderText: +<span class="line indent0">‘<a class=" crossReference" href="passagestudy.jsp?action=showNote&type=x&value=1&module=OSISReference&passage=Matthew+2%3A6"><small><sup class="x">*x</sup></small></a><span class="small-caps">And you, Bethlehem, land of Judah</span>, </span><br /> +<span class="line indent0"><span class="small-caps">Are by no means least among the leaders of Judah</span>; </span><br /> +<span class="line indent0"><span class="small-caps">For out of you shall come forth a Ruler</span> </span><br /> +<span class="line indent0"><span class="small-caps">Who will</span> <a class=" crossReference" href="passagestudy.jsp?action=showNote&type=x&value=2&module=OSISReference&passage=Matthew+2%3A6"><small><sup class="x">*x</sup></small></a><span class="small-caps">shepherd My people Israel</span>.’” <br /> + +------- +------- + +Key: +Mark 1:14 +------- +Preverse Header 0: +Raw: +<div sID="gen25" type="section"/> <title>The Beginning of the Ministry of Jesus</title> <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>) </title> <div sID="gen26" type="x-p"/> +------- +Rendered Header: + <h3 class="title">The Beginning of the Ministry of Jesus</h3> + +<h3 class="title parallel">(<a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3> + +<br /> + +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChange { font-style: italic; } + .transChange.transChange-supplied { font-style: italic; } + .transChange.transChange-added { font-style: italic; } + .transChange.transChange-tenseChange::before { content: '*'; } + .transChange.transChange-tenseChange { font-style: normal; } + .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; } + .overline { text-decoration: overline; } + .indent1 { margin-left: 1em; } + .indent2 { margin-left: 2em; } + .indent3 { margin-left: 3em; } + .indent4 { margin-left: 4em; } + abbr { &:hover{ &:before{ content: attr(title); } } } + .small-caps { font-variant: small-caps; } + .selah { text-align: right; width: 50%; margin: 0; padding: 0; } + .acrostic { text-align: center; } + .colophon {font-style: italic; font-size: small; display: block; } + .rdg { font-style: italic; } + .catchWord {font-style: bold; } + .x-p-indent {text-indent: 1em; } + +------- +RenderText: + Now after that John was put in prison, Jesus came into Galilee, preaching the gospel of the kingdom of God, +------- +------- + + +Whitespace tests around headings: + + + <h1 class="bookHeader">Old Testament</h1> + + <h1 class="bookHeader main">THE FIRST BOOK OF MOSES CALLED GENESIS</h1> + + <h1 class="bookHeader">Introduction and Outline</h1> + +<br /> +This is the <b>Book of Genesis</b>, the <i>first</i> book in the Bible. It may be outlined as follows: <br /> +<br /> +<ul> + <li><sup>1</sup>Creation of Heaven and Earth, 1:1-2:4a</li> + <li><sup>2</sup>Creation of Man and Woman, 2:4b-25</li> + <li><sub>3</sub>Fall, 3:1-24</li> + <li>...</li> +</ul> + <br /> +Tables work like this: <table><tbody> + <tr> <td><b>Column 1 Label</b></td> <td><b>Column 2 Label</b></td> </tr> + <tr> <td>Column 1, Row 1</td> <td>Column 2, Row 1</td> </tr> + <tr> <td>Column 1, Row 2</td> <td>Column 2, Row 2</td> </tr> + </tbody></table> +<br /> + + <h2 class="chapterHeader">From Creation to Abraham (1:1–11:9)</h2> + + + <h3 class="title">Creation of the Heavens and the Earth</h3> + +<br /> + +[ Genesis 1:1 ] In the beginning God created the heaven and the earth. <br /> + +<br /> + +[ Genesis 1:2 ] Text of verse 2. + +-- Plain output +Acts 2:19: ‘* And I will grant wonders in the sky above * +* And signs on the earth below *, +* Blood, and fire, and vapor of smoke *. + +Acts 2:20: ‘* The sun will be turned into darkness * +* And the moon into blood *, +* Before the great and glorious day of the Lord shall come *. + + +-- RTF output +{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par +Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par +} diff --git a/tests/testsuite/osis_osis2modcipher.sh b/tests/testsuite/osis_osis2modcipher.sh new file mode 100755 index 0000000..06e6310 --- /dev/null +++ b/tests/testsuite/osis_osis2modcipher.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +rm -rf tmp/osis_osis2modcipher/ +mkdir -p tmp/osis_osis2modcipher/mods.d +mkdir -p tmp/osis_osis2modcipher/modules + +cat > tmp/osis_osis2modcipher/mods.d/osisreference.conf <<! +[OSISReference] +DataPath=./modules/ +ModDrv=zText +CipherKey=abc123 +Encoding=UTF-8 +BlockType=BOOK +CompressType=ZIP +SourceType=OSIS +Lang=en +GlobalOptionFilter=OSISLemma +GlobalOptionFilter=OSISStrongs +GlobalOptionFilter=OSISMorph +GlobalOptionFilter=OSISFootnotes +GlobalOptionFilter=OSISHeadings +GlobalOptionFilter=OSISRedLetterWords +Feature=StrongsNumbers +! + +../../utilities/osis2mod tmp/osis_osis2modcipher/modules/ osisReference.xml -z -c abc123 2>&1 | grep -v \$Rev|grep -v "with phrase" + +cp osis_basic.good osis_osis2modcipher.good +cd tmp/osis_osis2modcipher +../../../osistest OSISReference + +echo +echo "-- Plain output" +../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-20 | grep -v OSISReference +echo +echo "-- RTF output" +../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-20 | grep -v OSISReference diff --git a/tests/testsuite/runall.sh b/tests/testsuite/runall.sh index 75eb221..fb5232b 100755 --- a/tests/testsuite/runall.sh +++ b/tests/testsuite/runall.sh @@ -3,7 +3,7 @@ # # Runs entire test suite # -# $Id: runall.sh 2327 2009-04-22 11:42:33Z scribe $ +# $Id: runall.sh 3063 2014-03-04 13:04:11Z chrislit $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society diff --git a/tests/testsuite/runtest.sh b/tests/testsuite/runtest.sh index 4ef57f7..305524b 100755 --- a/tests/testsuite/runtest.sh +++ b/tests/testsuite/runtest.sh @@ -3,7 +3,7 @@ # # Runs a single test # -# $Id: runtest.sh 2364 2009-04-29 08:10:02Z scribe $ +# $Id: runtest.sh 3063 2014-03-04 13:04:11Z chrislit $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society diff --git a/tests/testsuite/utf8basic.good b/tests/testsuite/utf8basic.good new file mode 100644 index 0000000..4ab4ca6 --- /dev/null +++ b/tests/testsuite/utf8basic.good @@ -0,0 +1,300 @@ +UTF-8 decoder capability and stress test +---------------------------------------- + +Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> - 2015-08-28 - CC BY 4.0 + +This test file can help you examine, how your UTF-8 decoder handles +various types of correct, malformed, or otherwise interesting UTF-8 +sequences. This file is not meant to be a conformance test. It does +not prescribe any particular outcome. Therefore, there is no way to +"pass" or "fail" this test file, even though the text does suggest a +preferable decoder behaviour at some places. Its aim is, instead, to +help you think about, and test, the behaviour of your UTF-8 decoder on a +systematic collection of unusual inputs. Experience so far suggests +that most first-time authors of UTF-8 decoders find at least one +serious problem in their decoder using this file. + +The test lines below cover boundary conditions, malformed UTF-8 +sequences, as well as correctly encoded UTF-8 sequences of Unicode code +points that should never occur in a correct UTF-8 file. + +According to ISO 10646-1:2000, sections D.7 and 2.3c, a device +receiving UTF-8 shall interpret a "malformed sequence in the same way +that it interprets a character that is outside the adopted subset" and +"characters that are not within the adopted subset shall be indicated +to the user" by a receiving device. One commonly used approach in +UTF-8 decoders is to replace any malformed UTF-8 sequence by a +replacement character (U+FFFD), which looks a bit like an inverted +question mark, or a similar symbol. It might be a good idea to +visually distinguish a malformed UTF-8 sequence from a correctly +encoded Unicode character that is just not available in the current +font but otherwise fully legal, even though ISO 10646-1 doesn't +mandate this. In any case, just ignoring malformed sequences or +unavailable characters does not conform to ISO 10646, will make +debugging more difficult, and can lead to user confusion. + +Please check, whether a malformed UTF-8 sequence is (1) represented at +all, (2) represented by exactly one single replacement character (or +equivalent signal), and (3) the following quotation mark after an +illegal UTF-8 sequence is correctly displayed, i.e. proper +resynchronization takes place immediately after any malformed +sequence. This file says "THE END" in the last line, so if you don't +see that, your decoder crashed somehow before, which should always be +cause for concern. + +All lines in this file are exactly 79 characters long (plus the line +feed). In addition, all lines end with "|", except for the two test +lines 2.1.1 and 2.2.1, which contain non-printable ASCII controls +U+0000 and U+007F. If you display this file with a fixed-width font, +these "|" characters should all line up in column 79 (right margin). +This allows you to test quickly, whether your UTF-8 decoder finds the +correct number of characters in every line, that is whether each +malformed sequences is replaced by a single replacement character. + +Note that, as an alternative to the notion of malformed sequence used +here, it is also a perfectly acceptable (and in some situations even +preferable) solution to represent each individual byte of a malformed +sequence with a replacement character. If you follow this strategy in +your decoder, then please ignore the "|" column. + + +Here come the tests: | + | +1 Some correct UTF-8 text | + | +You should see the Greek word 'kosme': "κόσμε" | + | +2 Boundary condition test cases | + | +2.1 First possible sequence of a certain length | + | +2.1.1 1 byte (U-00000000): "^@" // SWORD: removed. we don't support null mid-string, <- that's a literal <caret at> +2.1.2 2 bytes (U-00000080): "" | +2.1.3 3 bytes (U-00000800): "ࠀ" | +2.1.4 4 bytes (U-00010000): "𐀀" | +2.1.5 5 bytes (U-00200000): "�" | +2.1.6 6 bytes (U-04000000): "�" | + | +2.2 Last possible sequence of a certain length | + | +2.2.1 1 byte (U-0000007F): "" +2.2.2 2 bytes (U-000007FF): "߿" | +2.2.3 3 bytes (U-0000FFFF): "" | +2.2.4 4 bytes (U-001FFFFF): "�" | +2.2.5 5 bytes (U-03FFFFFF): "�" | +2.2.6 6 bytes (U-7FFFFFFF): "�" | + | +2.3 Other boundary conditions | + | +2.3.1 U-0000D7FF = ed 9f bf = "" | +2.3.2 U-0000E000 = ee 80 80 = "" | +2.3.3 U-0000FFFD = ef bf bd = "�" | +2.3.4 U-0010FFFF = f4 8f bf bf = "" | +2.3.5 U-00110000 = f4 90 80 80 = "�" | + | +3 Malformed sequences | + | +3.1 Unexpected continuation bytes | + | +Each unexpected continuation byte should be separately signalled as a | +malformed sequence of its own. | + | +3.1.1 First continuation byte 0x80: "�" | +3.1.2 Last continuation byte 0xbf: "�" | + | +3.1.3 2 continuation bytes: "��" | +3.1.4 3 continuation bytes: "���" | +3.1.5 4 continuation bytes: "����" | +3.1.6 5 continuation bytes: "�����" | +3.1.7 6 continuation bytes: "������" | +3.1.8 7 continuation bytes: "�������" | + | +3.1.9 Sequence of all 64 possible continuation bytes (0x80-0xbf): | + | + "���������������� | + ���������������� | + ���������������� | + ����������������" | + | +3.2 Lonely start characters | + | +3.2.1 All 32 first bytes of 2-byte sequences (0xc0-0xdf), | + each followed by a space character: | + | + "� � � � � � � � � � � � � � � � | + � � � � � � � � � � � � � � � � " | + | +3.2.2 All 16 first bytes of 3-byte sequences (0xe0-0xef), | + each followed by a space character: | + | + "� � � � � � � � � � � � � � � � " | + | +3.2.3 All 8 first bytes of 4-byte sequences (0xf0-0xf7), | + each followed by a space character: | + | + "� � � � � � � � " | + | +3.2.4 All 4 first bytes of 5-byte sequences (0xf8-0xfb), | + each followed by a space character: | + | + "� � � � " | + | +3.2.5 All 2 first bytes of 6-byte sequences (0xfc-0xfd), | + each followed by a space character: | + | + "� � " | + | +3.3 Sequences with last continuation byte missing | + | +All bytes of an incomplete sequence should be signalled as a single | +malformed sequence, i.e., you should see only a single replacement | +character in each of the next 10 tests. (Characters as in section 2) | + | +3.3.1 2-byte sequence with last byte missing (U+0000): "�" | +3.3.2 3-byte sequence with last byte missing (U+0000): "�" | +3.3.3 4-byte sequence with last byte missing (U+0000): "�" | +3.3.4 5-byte sequence with last byte missing (U+0000): "�" | +3.3.5 6-byte sequence with last byte missing (U+0000): "�" | +3.3.6 2-byte sequence with last byte missing (U-000007FF): "�" | +3.3.7 3-byte sequence with last byte missing (U-0000FFFF): "�" | +3.3.8 4-byte sequence with last byte missing (U-001FFFFF): "�" | +3.3.9 5-byte sequence with last byte missing (U-03FFFFFF): "�" | +3.3.10 6-byte sequence with last byte missing (U-7FFFFFFF): "�" | + | +3.4 Concatenation of incomplete sequences | + | +All the 10 sequences of 3.3 concatenated, you should see 10 malformed | +sequences being signalled: | + | + "����������" | + | +3.5 Impossible bytes | + | +The following two bytes cannot appear in a correct UTF-8 string | + | +3.5.1 fe = "�" | +3.5.2 ff = "�" | +3.5.3 fe fe ff ff = "����" | + | +4 Overlong sequences | + | +The following sequences are not malformed according to the letter of | +the Unicode 2.0 standard. However, they are longer then necessary and | +a correct UTF-8 encoder is not allowed to produce them. A "safe UTF-8 | +decoder" should reject them just like malformed sequences for two | +reasons: (1) It helps to debug applications if overlong sequences are | +not treated as valid representations of characters, because this helps | +to spot problems more quickly. (2) Overlong sequences provide | +alternative representations of characters, that could maliciously be | +used to bypass filters that check only for ASCII characters. For | +instance, a 2-byte encoded line feed (LF) would not be caught by a | +line counter that counts only 0x0a bytes, but it would still be | +processed as a line feed by an unsafe UTF-8 decoder later in the | +pipeline. From a security point of view, ASCII compatibility of UTF-8 | +sequences means also, that ASCII characters are *only* allowed to be | +represented by ASCII bytes in the range 0x00-0x7f. To ensure this | +aspect of ASCII compatibility, use only "safe UTF-8 decoders" that | +reject overlong UTF-8 sequences for which a shorter encoding exists. | + | +4.1 Examples of an overlong ASCII character | + | +With a safe UTF-8 decoder, all of the following five overlong | +representations of the ASCII character slash ("/") should be rejected | +like a malformed UTF-8 sequence, for instance by substituting it with | +a replacement character. If you see a slash below, you do not have a | +safe UTF-8 decoder! | + | +4.1.1 U+002F = c0 af = "�" | +4.1.2 U+002F = e0 80 af = "�" | +4.1.3 U+002F = f0 80 80 af = "�" | +4.1.4 U+002F = f8 80 80 80 af = "�" | +4.1.5 U+002F = fc 80 80 80 80 af = "�" | + | +4.2 Maximum overlong sequences | + | +Below you see the highest Unicode value that is still resulting in an | +overlong sequence if represented with the given number of bytes. This | +is a boundary test for safe UTF-8 decoders. All five characters should | +be rejected like malformed UTF-8 sequences. | + | +4.2.1 U-0000007F = c1 bf = "�" | +4.2.2 U-000007FF = e0 9f bf = "�" | +4.2.3 U-0000FFFF = f0 8f bf bf = "�" | +4.2.4 U-001FFFFF = f8 87 bf bf bf = "�" | +4.2.5 U-03FFFFFF = fc 83 bf bf bf bf = "�" | + | +4.3 Overlong representation of the NUL character | + | +The following five sequences should also be rejected like malformed | +UTF-8 sequences and should not be treated like the ASCII NUL | +character. | + | +4.3.1 U+0000 = c0 80 = "�" | +4.3.2 U+0000 = e0 80 80 = "�" | +4.3.3 U+0000 = f0 80 80 80 = "�" | +4.3.4 U+0000 = f8 80 80 80 80 = "�" | +4.3.5 U+0000 = fc 80 80 80 80 80 = "�" | + | +5 Illegal code positions | + | +The following UTF-8 sequences should be rejected like malformed | +sequences, because they never represent valid ISO 10646 characters and | +a UTF-8 decoder that accepts them might introduce security problems | +comparable to overlong UTF-8 sequences. | + | +5.1 Single UTF-16 surrogates | + | +5.1.1 U+D800 = ed a0 80 = "" | +5.1.2 U+DB7F = ed ad bf = "" | +5.1.3 U+DB80 = ed ae 80 = "" | +5.1.4 U+DBFF = ed af bf = "" | +5.1.5 U+DC00 = ed b0 80 = "" | +5.1.6 U+DF80 = ed be 80 = "" | +5.1.7 U+DFFF = ed bf bf = "" | + | +5.2 Paired UTF-16 surrogates | + | +5.2.1 U+D800 U+DC00 = ed a0 80 ed b0 80 = "" | +5.2.2 U+D800 U+DFFF = ed a0 80 ed bf bf = "" | +5.2.3 U+DB7F U+DC00 = ed ad bf ed b0 80 = "" | +5.2.4 U+DB7F U+DFFF = ed ad bf ed bf bf = "" | +5.2.5 U+DB80 U+DC00 = ed ae 80 ed b0 80 = "" | +5.2.6 U+DB80 U+DFFF = ed ae 80 ed bf bf = "" | +5.2.7 U+DBFF U+DC00 = ed af bf ed b0 80 = "" | +5.2.8 U+DBFF U+DFFF = ed af bf ed bf bf = "" | + | +5.3 Noncharacter code positions | + | +The following "noncharacters" are "reserved for internal use" by | +applications, and according to older versions of the Unicode Standard | +"should never be interchanged". Unicode Corrigendum #9 dropped the | +latter restriction. Nevertheless, their presence in incoming UTF-8 data | +can remain a potential security risk, depending on what use is made of | +these codes subsequently. Examples of such internal use: | + | + - Some file APIs with 16-bit characters may use the integer value -1 | + = U+FFFF to signal an end-of-file (EOF) or error condition. | + | + - In some UTF-16 receivers, code point U+FFFE might trigger a | + byte-swap operation (to convert between UTF-16LE and UTF-16BE). | + | +With such internal use of noncharacters, it may be desirable and safer | +to block those code points in UTF-8 decoders, as they should never | +occur legitimately in incoming UTF-8 data, and could trigger unsafe | +behaviour in subsequent processing. | + | +Particularly problematic noncharacters in 16-bit applications: | + | +5.3.1 U+FFFE = ef bf be = "" | +5.3.2 U+FFFF = ef bf bf = "" | + | +Other noncharacters: | + | +5.3.3 U+FDD0 .. U+FDEF = ""| + | +5.3.4 U+nFFFE U+nFFFF (for n = 1..10) | + | + " | + " | + | +THE END | diff --git a/tests/testsuite/utf8basic.sh b/tests/testsuite/utf8basic.sh new file mode 100755 index 0000000..625f1ff --- /dev/null +++ b/tests/testsuite/utf8basic.sh @@ -0,0 +1,10 @@ +#/bin/sh + +# utf8basic.good originally generated with: +# uconv --from-code UTF-8 --to-code UTF-8 --from-callback substitute UTF-8-test.txt > utf8basic.good +# but modified to ignore UTF-16 surrogates which are apparently illegal. We return multiple replacement +# characters there, but the spec apparently says we are only supposed to return 1 per UTF-16 surrogate +# there are comments in the spec about "security vulnerability" but we always check if we're at the +# end of our buffer before continuing processing each byte (shouldn't all decoders do this?), so there +# shouldn't be a problem. Ignoring the UTF-16 non-conformance for now. +../utf8norm < UTF-8-test.txt diff --git a/tests/testsuite/versekeytest.good b/tests/testsuite/versekeytest.good index 5540c6a..62f61fb 100644 --- a/tests/testsuite/versekeytest.good +++ b/tests/testsuite/versekeytest.good @@ -64,3 +64,13 @@ Mark.1.1-- = Matthew 28:20 Matthew.1.1-- = Malachi 4:6 ++ = Matthew 1:1 .setBook(.getBook() - 1) = Malachi 1:1 + +Chapter math + +Matthew.1.1 - 1 chapter +.setChapter(.getChapter() - 1) = Malachi 4:1 + +Verse math + +Matthew.1.1 - 1 verse +.setVerse(.getVerse() - 1) = Malachi 4:6 diff --git a/tests/testsuite/versekeytest.sh b/tests/testsuite/versekeytest.sh index c2238c1..3bdda63 100755 --- a/tests/testsuite/versekeytest.sh +++ b/tests/testsuite/versekeytest.sh @@ -1,7 +1,7 @@ #!/bin/sh #****************************************************************************** # -# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ +# $Id: versekeytest.sh 3063 2014-03-04 13:04:11Z chrislit $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society diff --git a/tests/testsuite/versemgrtest.sh b/tests/testsuite/versemgrtest.sh index 91b1af8..fd2c2af 100755 --- a/tests/testsuite/versemgrtest.sh +++ b/tests/testsuite/versemgrtest.sh @@ -1,7 +1,7 @@ #!/bin/sh #****************************************************************************** # -# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ +# $Id: versemgrtest.sh 3063 2014-03-04 13:04:11Z chrislit $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society diff --git a/tests/testsuite/verseparsing-utf8.sh b/tests/testsuite/verseparsing-utf8.sh index 1d05007..4be346a 100755 --- a/tests/testsuite/verseparsing-utf8.sh +++ b/tests/testsuite/verseparsing-utf8.sh @@ -3,7 +3,7 @@ # # This only works if --with-icu was passed to configure # -# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ +# $Id: verseparsing-utf8.sh 3063 2014-03-04 13:04:11Z chrislit $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society diff --git a/tests/testsuite/verseparsing.sh b/tests/testsuite/verseparsing.sh index aa6ae25..6e3dd42 100755 --- a/tests/testsuite/verseparsing.sh +++ b/tests/testsuite/verseparsing.sh @@ -1,7 +1,7 @@ #!/bin/sh #****************************************************************************** # -# $Id: verseparsing.sh 2796 2013-04-11 16:18:45Z scribe $ +# $Id: verseparsing.sh 3063 2014-03-04 13:04:11Z chrislit $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society diff --git a/tests/testsuite/vs2osisref.good b/tests/testsuite/vs2osisref.good new file mode 100644 index 0000000..eea5961 --- /dev/null +++ b/tests/testsuite/vs2osisref.good @@ -0,0 +1,2 @@ +Matt 3:1-12: {Mark 1:3-8; Luke 3:2-17;} John 1:6-8, 19-28 +<reference osisRef="Matt.3.1-Matt.3.12">Matt 3:1-12</reference>: {<reference osisRef="Mark.1.3-Mark.1.8">Mark 1:3-8</reference>; <reference osisRef="Luke.3.2-Luke.3.17">Luke 3:2-17</reference>;} <reference osisRef="John.1.6-John.1.8">John 1:6-8</reference>, <reference osisRef="John.1.19-John.1.28">19-28</reference> diff --git a/tests/testsuite/vs2osisref.sh b/tests/testsuite/vs2osisref.sh new file mode 100755 index 0000000..90c978b --- /dev/null +++ b/tests/testsuite/vs2osisref.sh @@ -0,0 +1,22 @@ +#!/bin/sh +#****************************************************************************** +# +# $Id$ +# +# Copyright 1998-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. +# + +echo "Matt 3:1-12: {Mark 1:3-8; Luke 3:2-17;} John 1:6-8, 19-28" +../../utilities/vs2osisref "Matt 3:1-12: {Mark 1:3-8; Luke 3:2-17;} John 1:6-8, 19-28" diff --git a/tests/testsuite/xmltag.sh b/tests/testsuite/xmltag.sh index f223b68..4686519 100755 --- a/tests/testsuite/xmltag.sh +++ b/tests/testsuite/xmltag.sh @@ -1,7 +1,7 @@ #!/bin/sh #****************************************************************************** # -# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ +# $Id: xmltag.sh 3063 2014-03-04 13:04:11Z chrislit $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society diff --git a/tests/utf8norm.cpp b/tests/utf8norm.cpp index a992a2e..63a9545 100644 --- a/tests/utf8norm.cpp +++ b/tests/utf8norm.cpp @@ -2,7 +2,7 @@ * * utf8norm.cpp - * - * $Id: utf8norm.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: utf8norm.cpp 3515 2017-11-01 11:38:09Z scribe $ * * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -23,16 +23,62 @@ #include <iostream> #include <utilstr.h> #include <swbuf.h> +#if !defined(__GNUC__) && !defined(_WIN32_WCE) +#include <io.h> +#include <direct.h> +#else +#include <unistd.h> +#endif +#include <utf8greekaccents.h> using namespace sword; using namespace std; int main(int argc, char **argv) { - const char *buf = (argc > 1) ? argv[1] : "Description=German Unrevidierte Luther Übersetzung von 1545"; + const char *buf = (argc > 1 && argv[1][0] != '-') ? argv[1] : 0; // "Description=German Unrevidierte Luther Übersetzung von 1545"; - SWBuf fixed = assureValidUTF8(buf); + if (buf) { + SWBuf fixed = assureValidUTF8(buf); - cout << "input / processed:\n" << buf << "\n" << fixed << endl; + cout << "input / processed:\n" << buf << "\n" << fixed << endl; + } + else { + SWOptionFilter *filter = 0; + if (argc > 1 && !strcmp(argv[1], "-ga")) filter = new UTF8GreekAccents(); + if (filter && filter->isBoolean()) filter->setOptionValue("Off"); + int repeat = 1; + if (argc > 2) repeat = atoi(argv[2]); + SWBuf contents = ""; + char chunk[255]; + int count = 254; + while (count > 0) { + count = read(STDIN_FILENO, chunk, 254); + if (count > 0) { + chunk[count] = 0; + contents.append(chunk); + } + } + SWBuf filteredContents = contents; + if (filter) { + for (int i = 0; i < repeat; ++i) { + filteredContents = contents; + filter->processText(filteredContents); + } + } + const unsigned char *c = (const unsigned char *)filteredContents.getRawData(); + // UTF-32 BOM + __u32 ch = 0xfeff; +// write(STDOUT_FILENO, &ch, 4); + while (c && *c) { + ch = getUniCharFromUTF8(&c); +// ch = __swswap32(ch); + if (!ch) ch = 0xFFFD; + SWBuf c8; + getUTF8FromUniChar(ch, &c8); + write(STDOUT_FILENO, c8.getRawData(), c8.length()); + } + delete filter; + } return 0; } diff --git a/tests/versekeytest.cpp b/tests/versekeytest.cpp index 4ae064e..d8bea6a 100644 --- a/tests/versekeytest.cpp +++ b/tests/versekeytest.cpp @@ -2,7 +2,7 @@ * * versekeytest.cpp - * - * $Id: versekeytest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * $Id: versekeytest.cpp 3305 2014-12-15 02:02:48Z charcoal $ * * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -277,5 +277,19 @@ cout << currentVerse << endl; vkey.setBook(vkey.getBook() - 1); cout << ".setBook(.getBook() - 1) = " << vkey << "\n"; + cout << "\nChapter math\n\n"; + + cout << "Matthew.1.1 - 1 chapter\n"; + vkey = "Matthew.1.1"; + vkey.setChapter(vkey.getChapter() - 1); + cout << ".setChapter(.getChapter() - 1) = " << vkey << "\n"; + + cout << "\nVerse math\n\n"; + + cout << "Matthew.1.1 - 1 verse\n"; + vkey = "Matthew.1.1"; + vkey.setVerse(vkey.getVerse() - 1); + cout << ".setVerse(.getVerse() - 1) = " << vkey << "\n"; + return 0; } @@ -3,7 +3,7 @@ # usrinst.sh - Convenience script specifying most common development options # to ./configure # -# $Id: usrinst.sh 3164 2014-04-17 04:06:51Z greg.hellings $ +# $Id: usrinst.sh 3472 2017-05-22 04:19:02Z scribe $ # # Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society @@ -35,6 +35,7 @@ OPTIONS="--enable-debug $OPTIONS" #OPTIONS="--enable-profile $OPTIONS" #OPTIONS="--with-cxx11regex $OPTIONS" +OPTIONS="--with-icuregex $OPTIONS" #OPTIONS="--with-icusword $OPTIONS" #OPTIONS="--without-icu $OPTIONS" #OPTIONS="--without-clucene $OPTIONS" @@ -48,6 +49,25 @@ OPTIONS="--enable-debug $OPTIONS" #LIBS="-no-undefined" #OPTIONS="lt_cv_deplibs_check_method=pass_all $OPTIONS" +# These are for experimental purposes, review, +# may not be available on all platforms, are unsupported, +# and no modules should be released which depend on them. +# If significant gains in size and speed are achieved, +# we should discuss the portability of these libraries +# and decide if we should make the switch to prefer one +# of these compression systems over zlib. +# That's not to say that support for these is not appreciated +# (chrislit)-- on the contrary, this is the R in R&D, we just +# need to consider portability: ios, android-ndk, and +# windows support, before implying modules can be made with them. +# I am all for switching to one, by policy, if we observe appreciable +# gains and confirm portability. I only see support disadvantages to +# expanding compression options, otherwise. + +#OPTIONS="--with-bzip2 $OPTIONS" +#OPTIONS="--with-xz $OPTIONS" + + LIBS="$LIBS" ./configure $OPTIONS $* 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 <rawld.h> #include <rawld4.h> #include <zld.h> +#ifndef EXCLUDEZLIB #include <zipcomprs.h> +#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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\cipherraw.exe"/>
- <OBJFILES value="obj\cipherraw.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="cipherraw.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="cipherraw.bpf" FORMNAME="" UNITNAME="cipherraw" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\cipherraw.cpp" FORMNAME="" UNITNAME="cipherraw" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\cipherraw.exe"/> + <OBJFILES value="obj\cipherraw.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="cipherraw.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="cipherraw.bpf" FORMNAME="" UNITNAME="cipherraw" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\cipherraw.cpp" FORMNAME="" UNITNAME="cipherraw" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\diatheke.exe"/>
- <OBJFILES value="obj\diatheke.obj obj\thmlcgi.obj obj\corediatheke.obj obj\diafiltmgr.obj
- obj\diathekemgr.obj obj\gbfcgi.obj obj\osiscgi.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;..\diatheke"/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="diatheke.bpf"/>
- <INCLUDEPATH value="..\diatheke;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common;Z:\Biblie\SRC\icu-sword\source\i18n"/>
- <LIBPATH value="..\diatheke;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\diatheke -I..\. -I.. -I..\..\include -I$(BCB)\include
- -I$(BCB)\include\vcl -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY
- -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -s -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="diatheke.bpf" FORMNAME="" UNITNAME="diatheke" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\diatheke\diatheke.cpp" FORMNAME="" UNITNAME="diatheke" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\diatheke\thmlcgi.cpp" FORMNAME="" UNITNAME="thmlcgi" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\diatheke\corediatheke.cpp" FORMNAME="" UNITNAME="corediatheke" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\diatheke\diafiltmgr.cpp" FORMNAME="" UNITNAME="diafiltmgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\diatheke\diathekemgr.cpp" FORMNAME="" UNITNAME="diathekemgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\diatheke\gbfcgi.cpp" FORMNAME="" UNITNAME="gbfcgi" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\diatheke\osiscgi.cpp" FORMNAME="" UNITNAME="osiscgi" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\diatheke.exe"/> + <OBJFILES value="obj\diatheke.obj obj\thmlcgi.obj obj\corediatheke.obj obj\diafiltmgr.obj + obj\diathekemgr.obj obj\gbfcgi.obj obj\osiscgi.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;..\diatheke"/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="diatheke.bpf"/> + <INCLUDEPATH value="..\diatheke;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common;Z:\Biblie\SRC\icu-sword\source\i18n"/> + <LIBPATH value="..\diatheke;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\diatheke -I..\. -I.. -I..\..\include -I$(BCB)\include + -I$(BCB)\include\vcl -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY + -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -s -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="diatheke.bpf" FORMNAME="" UNITNAME="diatheke" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\diatheke\diatheke.cpp" FORMNAME="" UNITNAME="diatheke" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\diatheke\thmlcgi.cpp" FORMNAME="" UNITNAME="thmlcgi" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\diatheke\corediatheke.cpp" FORMNAME="" UNITNAME="corediatheke" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\diatheke\diafiltmgr.cpp" FORMNAME="" UNITNAME="diafiltmgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\diatheke\diathekemgr.cpp" FORMNAME="" UNITNAME="diathekemgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\diatheke\gbfcgi.cpp" FORMNAME="" UNITNAME="gbfcgi" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\diatheke\osiscgi.cpp" FORMNAME="" UNITNAME="osiscgi" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\imp2gbs.exe"/>
- <OBJFILES value="obj\imp2gbs.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="imp2gbs.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="imp2gbs.bpf" FORMNAME="" UNITNAME="imp2gbs" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\imp2gbs.cpp" FORMNAME="" UNITNAME="imp2gbs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\imp2gbs.exe"/> + <OBJFILES value="obj\imp2gbs.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="imp2gbs.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="imp2gbs.bpf" FORMNAME="" UNITNAME="imp2gbs" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\imp2gbs.cpp" FORMNAME="" UNITNAME="imp2gbs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\imp2ld.exe"/>
- <OBJFILES value="obj\imp2ld.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="imp2ld.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="imp2ld.bpf" FORMNAME="" UNITNAME="imp2ld" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\imp2ld.cpp" FORMNAME="" UNITNAME="imp2ld" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\imp2ld.exe"/> + <OBJFILES value="obj\imp2ld.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="imp2ld.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="imp2ld.bpf" FORMNAME="" UNITNAME="imp2ld" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\imp2ld.cpp" FORMNAME="" UNITNAME="imp2ld" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\imp2vs.exe"/>
- <OBJFILES value="obj\imp2vs.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="imp2vs.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="imp2vs.bpf" FORMNAME="" UNITNAME="imp2vs" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\imp2vs.cpp" FORMNAME="" UNITNAME="imp2vs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\imp2vs.exe"/> + <OBJFILES value="obj\imp2vs.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="imp2vs.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="imp2vs.bpf" FORMNAME="" UNITNAME="imp2vs" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\imp2vs.cpp" FORMNAME="" UNITNAME="imp2vs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\mkfastmod.exe"/>
- <OBJFILES value="obj\mkfastmod.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="mkfastmod.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="mkfastmod.bpf" FORMNAME="" UNITNAME="mkfastmod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\mkfastmod.cpp" FORMNAME="" UNITNAME="mkfastmod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\mkfastmod.exe"/> + <OBJFILES value="obj\mkfastmod.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="mkfastmod.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="mkfastmod.bpf" FORMNAME="" UNITNAME="mkfastmod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\mkfastmod.cpp" FORMNAME="" UNITNAME="mkfastmod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\mod2imp.exe"/>
- <OBJFILES value="obj\mod2imp.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="mod2imp.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="mod2imp.bpf" FORMNAME="" UNITNAME="mod2imp" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\mod2imp.cpp" FORMNAME="" UNITNAME="mod2imp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\mod2imp.exe"/> + <OBJFILES value="obj\mod2imp.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="mod2imp.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="mod2imp.bpf" FORMNAME="" UNITNAME="mod2imp" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\mod2imp.cpp" FORMNAME="" UNITNAME="mod2imp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\mod2osis.exe"/>
- <OBJFILES value="obj\mod2osis.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="mod2osis.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="mod2osis.bpf" FORMNAME="" UNITNAME="mod2osis" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\mod2osis.cpp" FORMNAME="" UNITNAME="mod2osis" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\mod2osis.exe"/> + <OBJFILES value="obj\mod2osis.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="mod2osis.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="mod2osis.bpf" FORMNAME="" UNITNAME="mod2osis" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\mod2osis.cpp" FORMNAME="" UNITNAME="mod2osis" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\mod2vpl.exe"/>
- <OBJFILES value="obj\mod2vpl.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="mod2vpl.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="mod2vpl.bpf" FORMNAME="" UNITNAME="mod2vpl" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\mod2vpl.cpp" FORMNAME="" UNITNAME="mod2vpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\mod2vpl.exe"/> + <OBJFILES value="obj\mod2vpl.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="mod2vpl.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="mod2vpl.bpf" FORMNAME="" UNITNAME="mod2vpl" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\mod2vpl.cpp" FORMNAME="" UNITNAME="mod2vpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\mod2zmod.exe"/>
- <OBJFILES value="obj\mod2zmod.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="mod2zmod.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="mod2zmod.bpf" FORMNAME="" UNITNAME="mod2zmod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\mod2zmod.cpp" FORMNAME="" UNITNAME="mod2zmod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\mod2zmod.exe"/> + <OBJFILES value="obj\mod2zmod.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="mod2zmod.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="mod2zmod.bpf" FORMNAME="" UNITNAME="mod2zmod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\mod2zmod.cpp" FORMNAME="" UNITNAME="mod2zmod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\osis2mod.exe"/>
- <OBJFILES value="obj\osis2mod.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="osis2mod.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="osis2mod.bpf" FORMNAME="" UNITNAME="osis2mod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\osis2mod.cpp" FORMNAME="" UNITNAME="osis2mod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\osis2mod.exe"/> + <OBJFILES value="obj\osis2mod.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="osis2mod.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="osis2mod.bpf" FORMNAME="" UNITNAME="osis2mod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\osis2mod.cpp" FORMNAME="" UNITNAME="osis2mod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\step2vpl.exe"/>
- <OBJFILES value="obj\step2vpl.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="step2vpl.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="step2vpl.bpf" FORMNAME="" UNITNAME="step2vpl" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\step2vpl.cpp" FORMNAME="" UNITNAME="step2vpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\step2vpl.exe"/> + <OBJFILES value="obj\step2vpl.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="step2vpl.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="step2vpl.bpf" FORMNAME="" UNITNAME="step2vpl" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\step2vpl.cpp" FORMNAME="" UNITNAME="step2vpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\stepdump.exe"/>
- <OBJFILES value="obj\stepdump.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="stepdump.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="stepdump.bpf" FORMNAME="" UNITNAME="stepdump" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\stepdump.cpp" FORMNAME="" UNITNAME="stepdump" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\stepdump.exe"/> + <OBJFILES value="obj\stepdump.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="stepdump.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="stepdump.bpf" FORMNAME="" UNITNAME="stepdump" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\stepdump.cpp" FORMNAME="" UNITNAME="stepdump" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\vpl2mod.exe"/>
- <OBJFILES value="obj\vpl2mod.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="vpl2mod.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="vpl2mod.bpf" FORMNAME="" UNITNAME="vpl2mod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\vpl2mod.cpp" FORMNAME="" UNITNAME="vpl2mod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\vpl2mod.exe"/> + <OBJFILES value="obj\vpl2mod.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="vpl2mod.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="vpl2mod.bpf" FORMNAME="" UNITNAME="vpl2mod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\vpl2mod.cpp" FORMNAME="" UNITNAME="vpl2mod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\vs2osisref.exe"/>
- <OBJFILES value="obj\vs2osisref.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="vs2osisref.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="vs2osisref.bpf" FORMNAME="" UNITNAME="vs2osisref" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\vs2osisref.cpp" FORMNAME="" UNITNAME="vs2osisref" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\vs2osisref.exe"/> + <OBJFILES value="obj\vs2osisref.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="vs2osisref.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="vs2osisref.bpf" FORMNAME="" UNITNAME="vs2osisref" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\vs2osisref.cpp" FORMNAME="" UNITNAME="vs2osisref" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.06.00"/>
- <PROJECT value="stage\xml2gbs.exe"/>
- <OBJFILES value="obj\xml2gbs.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi
- bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi
- ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi
- bcb2kaxserver.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="xml2gbs.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- <OTHERFILES value=""/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b-
- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/>
- <OTHERFILES value=""/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- <OTHERFILES value=""/>
- </LINKER>
- <FILELIST>
- <FILE FILENAME="xml2gbs.bpf" FORMNAME="" UNITNAME="xml2gbs" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\xml2gbs.cpp" FORMNAME="" UNITNAME="xml2gbs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
- </FILELIST>
- <BUILDTOOLS>
- </BUILDTOOLS>
-
- <IDEOPTIONS>
-[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
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.06.00"/> + <PROJECT value="stage\xml2gbs.exe"/> + <OBJFILES value="obj\xml2gbs.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi + bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi + ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi + bcb2kaxserver.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="ilink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="xml2gbs.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + <OTHERFILES value=""/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/> + <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- + -k -y -v -vi- -c -tW -tWM"/> + <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-Iobj -D"" -ap -Tpe -GD -x -Gn -M -v /P512"/> + <OTHERFILES value=""/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + <OTHERFILES value=""/> + </LINKER> + <FILELIST> + <FILE FILENAME="xml2gbs.bpf" FORMNAME="" UNITNAME="xml2gbs" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\xml2gbs.cpp" FORMNAME="" UNITNAME="xml2gbs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/> + </FILELIST> + <BUILDTOOLS> + </BUILDTOOLS> + + <IDEOPTIONS> +[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 + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="addgb.exe"/>
- <OBJFILES value="..\addgb.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib
- ..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="addgb.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\icu-sword\source\common -I..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="addgb.exe"/> + <OBJFILES value="..\addgb.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib + ..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="addgb.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -I..\..\..\icu-sword\source\common -I..\..\..\icu-sword\source\i18n + -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 + -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="addld.exe"/>
- <OBJFILES value="..\addld.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib
- ..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="addld.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\icu-sword\source\common -I..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="addld.exe"/> + <OBJFILES value="..\addld.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib + ..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="addld.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -I..\..\..\icu-sword\source\common -I..\..\..\icu-sword\source\i18n + -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 + -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="addvs.exe"/>
- <OBJFILES value="..\addvs.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib
- ..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="addvs.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\icu-sword\source\common -I..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="addvs.exe"/> + <OBJFILES value="..\addvs.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib + ..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="addvs.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -I..\..\..\icu-sword\source\common -I..\..\..\icu-sword\source\i18n + -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 + -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{8B701034-E9E3-4B73-9D88-2DC067DF3B34}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="cipherraw.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="USBINARY"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="USBINARY"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="USBINARY"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg" value="0x20000"/>
- <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg.merge" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="USBINARY"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="cipherraw.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="cipherraw" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\cipherraw.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="cipherraw" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">3</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_;USBINARY</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item2">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams"></Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">cipherraw.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{8B701034-E9E3-4B73-9D88-2DC067DF3B34}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="cipherraw.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="USBINARY"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="USBINARY"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="USBINARY"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg" value="0x20000"/> + <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="USBINARY"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="cipherraw.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="cipherraw" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\cipherraw.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="cipherraw" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">3</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_;USBINARY</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item2">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams"></Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">cipherraw.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{06777FCC-BCA9-468B-9054-72709495FE83}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="dontverifylibs" value="0"/>
- <property category="build.node" name="name" value="diatheke.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="1"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="WIN32"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\diatheke"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\diatheke\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.3" value="_RTLDLL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.4" value="USEPACKAGES"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\diatheke"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\diatheke\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\diatheke"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\diatheke\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\diatheke\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\diatheke"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\diatheke"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\diatheke"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\diatheke"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\diatheke"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\diatheke"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mti.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.2" value="$(PACKAGES)"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\diatheke"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\diatheke\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="diatheke.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="diatheke" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\diatheke\diatheke.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="diatheke" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\diatheke\thmlcgi.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlcgi" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\diatheke\corediatheke.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="corediatheke" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\diatheke\diafiltmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="diafiltmgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\diatheke\diathekemgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="diathekemgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\diatheke\gbfcgi.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfcgi" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\diatheke\osiscgi.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osiscgi" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include\</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..\diatheke;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">2</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\diatheke;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..\diatheke;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams"></Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">diatheke.bpf</Source>
- </Source> <buildevents/>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{06777FCC-BCA9-468B-9054-72709495FE83}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="dontverifylibs" value="0"/> + <property category="build.node" name="name" value="diatheke.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="1"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="WIN32"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\diatheke"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\diatheke\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.3" value="_RTLDLL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.4" value="USEPACKAGES"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\diatheke"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\diatheke\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\diatheke"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\diatheke\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\diatheke\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\diatheke"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\diatheke"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\diatheke"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\diatheke"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\diatheke"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\diatheke"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mti.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.2" value="$(PACKAGES)"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\diatheke"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\diatheke\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="diatheke.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="diatheke" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\diatheke\diatheke.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="diatheke" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\diatheke\thmlcgi.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlcgi" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\diatheke\corediatheke.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="corediatheke" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\diatheke\diafiltmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="diafiltmgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\diatheke\diathekemgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="diathekemgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\diatheke\gbfcgi.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfcgi" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\diatheke\osiscgi.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osiscgi" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include\</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..\diatheke;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">2</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\diatheke;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..\diatheke;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams"></Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">diatheke.bpf</Source> + </Source> <buildevents/> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{C753C90F-6763-4737-A085-8679D216A2FC}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="imp2gbs.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="..\..\..\icu-sword\source\i18n"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.8" value="..\..\..\icu-sword\source\common"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg" value="0x20000"/>
- <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg.merge" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="imp2gbs.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="imp2gbs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\imp2gbs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="imp2gbs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams"></Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">imp2gbs.bpf</Source>
- </Source> <buildevents/>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{C753C90F-6763-4737-A085-8679D216A2FC}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="imp2gbs.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="..\..\..\icu-sword\source\i18n"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.8" value="..\..\..\icu-sword\source\common"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg" value="0x20000"/> + <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="imp2gbs.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="imp2gbs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\imp2gbs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="imp2gbs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams"></Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">imp2gbs.bpf</Source> + </Source> <buildevents/> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{C9D9EA10-ED0F-4164-95BF-276685D5FEFC}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="imp2ld.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="imp2ld.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="imp2ld" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\imp2ld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="imp2ld" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams"></Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">imp2ld.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{C9D9EA10-ED0F-4164-95BF-276685D5FEFC}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="imp2ld.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="imp2ld.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="imp2ld" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\imp2ld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="imp2ld" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams"></Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">imp2ld.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{D58B7A37-F286-4252-A3EC-736F261D9021}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="imp2vs.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="imp2vs.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="imp2vs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\imp2vs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="imp2vs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams"></Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">imp2vs.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{D58B7A37-F286-4252-A3EC-736F261D9021}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="imp2vs.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="imp2vs.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="imp2vs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\imp2vs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="imp2vs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams"></Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">imp2vs.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{1C014927-4D74-41D5-B034-1C5F85DBE9BE}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="installmgr.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="UNICODE"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.4" value="USBINARY"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.6" value="USELUCENE"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.7" value="_WIN32"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.7" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.7" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.6" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\..\src\mgr"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.7" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="installmgr.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="installmgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\installmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="installmgr" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\apps\InstallMgr\libcurl.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libcurl" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams">RWP ./ 3 2 abc</Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">installmgr.bpf</Source>
- </Source> <buildevents/>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{1C014927-4D74-41D5-B034-1C5F85DBE9BE}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="installmgr.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="UNICODE"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.4" value="USBINARY"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.6" value="USELUCENE"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.7" value="_WIN32"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\..\src\mgr"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\..\src\mgr"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.7" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\..\src\mgr"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.7" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\..\src\mgr"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.6" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\..\src\mgr"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.7" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="installmgr.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="installmgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\installmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="installmgr" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\apps\InstallMgr\libcurl.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libcurl" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams">RWP ./ 3 2 abc</Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">installmgr.bpf</Source> + </Source> <buildevents/> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="installmgr.exe"/>
- <OBJFILES value="..\installmgr.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib
- ..\..\..\biblecs\clucene\clucene.lib
- ..\..\..\biblecs\apps\InstallMgr\libcurl.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="installmgr.bpf"/>
- <INCLUDEPATH value="..\..\src\mgr;..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\..\src\mgr;..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\..\src\mgr -I..\. -I.. -I..\..\include -I$(BCB)\include
- -I$(BCB)\include\vcl -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="installmgr.exe"/> + <OBJFILES value="..\installmgr.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib + ..\..\..\biblecs\clucene\clucene.lib + ..\..\..\biblecs\apps\InstallMgr\libcurl.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_ICU_;_ICUSWORD_"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="installmgr.bpf"/> + <INCLUDEPATH value="..\..\src\mgr;..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\..\src\mgr;..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\..\src\mgr -I..\. -I.. -I..\..\include -I$(BCB)\include + -I$(BCB)\include\vcl -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{13757126-9ACE-4CF8-9718-890CAFC2FD05}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="mkfastmod.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.noregistervars.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="_DEBUG"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y+"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.2" value="W"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.v.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.4" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="_DEBUG"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="mkfastmod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mkfastmod" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\mkfastmod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mkfastmod" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">3</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item2">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams">KJV</Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">mkfastmod.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{13757126-9ACE-4CF8-9718-890CAFC2FD05}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="mkfastmod.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.noregistervars.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="_DEBUG"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y+"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.2" value="W"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.4" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="_DEBUG"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="mkfastmod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mkfastmod" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\mkfastmod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mkfastmod" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">3</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item2">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams">KJV</Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">mkfastmod.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{6FCCCABA-912D-4BF4-B104-85847C33E994}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="mod2imp.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="mod2imp.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2imp" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\mod2imp.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2imp" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams"></Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">mod2imp.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{6FCCCABA-912D-4BF4-B104-85847C33E994}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="mod2imp.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="mod2imp.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2imp" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\mod2imp.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2imp" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams"></Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">mod2imp.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{0699AF27-87FC-42C2-94B7-C5FFBDE04AC9}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="mod2osis.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="mod2osis.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2osis" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\mod2osis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2osis" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams">KJV</Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">mod2osis.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{0699AF27-87FC-42C2-94B7-C5FFBDE04AC9}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="mod2osis.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="mod2osis.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2osis" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\mod2osis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2osis" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams">KJV</Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">mod2osis.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{31FAB7FF-0030-4558-84D8-0634F85BCE1F}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="mod2vpl.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="mod2vpl.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2vpl" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\mod2vpl.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2vpl" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams">RWP ./ 3 2 abc</Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">mod2vpl.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{31FAB7FF-0030-4558-84D8-0634F85BCE1F}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="mod2vpl.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="mod2vpl.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2vpl" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\mod2vpl.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2vpl" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams">RWP ./ 3 2 abc</Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">mod2vpl.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{55779991-2EEA-4AC6-8C30-52012FF06C48}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="mod2zmod.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="USBINARY"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="USBINARY"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="USBINARY"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="USBINARY"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="mod2zmod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2zmod" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\mod2zmod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2zmod" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">5</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_;USBINARY</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_;USBINARY;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item2">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item3">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item4">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams">KJV ./ 3 2 abc</Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">mod2zmod.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{55779991-2EEA-4AC6-8C30-52012FF06C48}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="mod2zmod.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="USBINARY"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="USBINARY"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="USBINARY"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="USBINARY"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="mod2zmod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2zmod" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\mod2zmod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2zmod" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">5</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_;USBINARY</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_;USBINARY;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item2">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item3">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item4">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams">KJV ./ 3 2 abc</Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">mod2zmod.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{CC392976-EF1E-4C5D-A4A6-FE412E04B145}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="osis2mod.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.noregistervars.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y+"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.2" value="W"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.v.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.4" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_DEBUG"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="osis2mod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="osis2mod" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\osis2mod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osis2mod" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams">./nasb nasb.xml</Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">osis2mod.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{CC392976-EF1E-4C5D-A4A6-FE412E04B145}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="osis2mod.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.noregistervars.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y+"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.2" value="W"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.v.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.4" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_DEBUG"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="osis2mod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="osis2mod" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\osis2mod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osis2mod" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams">./nasb nasb.xml</Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">osis2mod.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{847D89F0-DA8A-4F75-AA82-5A9BB2A9D3CD}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="step2vpl.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="step2vpl.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="step2vpl" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\step2vpl.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="step2vpl" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams"></Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">step2vpl.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{847D89F0-DA8A-4F75-AA82-5A9BB2A9D3CD}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="step2vpl.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="step2vpl.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="step2vpl" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\step2vpl.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="step2vpl" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams"></Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">step2vpl.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{A012F78B-1EC5-4A4B-84C3-1E5E2080E2EB}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="stepdump.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="stepdump.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="stepdump" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\stepdump.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="stepdump" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams"></Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">stepdump.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{A012F78B-1EC5-4A4B-84C3-1E5E2080E2EB}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="stepdump.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="stepdump.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="stepdump" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\stepdump.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="stepdump" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams"></Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">stepdump.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="tei2mod.exe"/>
- <OBJFILES value="..\tei2mod.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib
- ..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_DEBUG"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="tei2mod.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa"/>
- <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k
- -y -v -vi- -tWC -tWM -c"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn -v"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="tei2mod.exe"/> + <OBJFILES value="..\tei2mod.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib + ..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value="_DEBUG"/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="tei2mod.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa"/> + <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k + -y -v -vi- -tWC -tWM -c"/> + <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zi"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn -v"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="treeidxutil.exe"/>
- <OBJFILES value="..\treeidxutil.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib
- ..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value=""/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="treeidxutil.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="treeidxutil.exe"/> + <OBJFILES value="..\treeidxutil.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib + ..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value=""/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="treeidxutil.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">Default.Personality</Option>
- <Option Name="ProjectType"></Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{9922D349-DBA7-45A7-A547-F2DD34E7E460}</Option>
- </Option>
- </PersonalityInfo>
- <Default.Personality>
-
- <Projects>
- <Projects Name="icuuc.lib">..\..\..\icu-sword\as_is\borland\icuuc.bdsproj</Projects>
- <Projects Name="icuin.lib">..\..\..\icu-sword\as_is\borland\icuin.bdsproj</Projects>
- <Projects Name="libcurl.lib">..\..\..\biblecs\apps\InstallMgr\libcurl.bdsproj</Projects>
- <Projects Name="clucene.lib">..\..\..\biblecs\clucene\clucene.bdsproj</Projects>
- <Projects Name="libsword.lib">..\..\lib\bcppmake\libsword.bdsproj</Projects>
- <Projects Name="osis2mod.exe">osis2mod.bdsproj</Projects>
- <Projects Name="mod2zmod.exe">mod2zmod.bdsproj</Projects>
- <Projects Name="mod2vpl.exe">mod2vpl.bdsproj</Projects>
- <Projects Name="mkfastmod.exe">mkfastmod.bdsproj</Projects>
- <Projects Name="imp2gbs.exe">imp2gbs.bdsproj</Projects>
- <Projects Name="vpl2mod.exe">vpl2mod.bdsproj</Projects>
- <Projects Name="imp2ld.exe">imp2ld.bdsproj</Projects>
- <Projects Name="imp2vs.exe">imp2vs.bdsproj</Projects>
- <Projects Name="mod2imp.exe">mod2imp.bdsproj</Projects>
- <Projects Name="cipherraw.exe">cipherraw.bdsproj</Projects>
- <Projects Name="step2vpl.exe">step2vpl.bdsproj</Projects>
- <Projects Name="stepdump.exe">stepdump.bdsproj</Projects>
- <Projects Name="mod2osis.exe">mod2osis.bdsproj</Projects>
- <Projects Name="vs2osisref.exe">vs2osisref.bdsproj</Projects>
- <Projects Name="diatheke.exe">diatheke.bdsproj</Projects>
- <Projects Name="xml2gbs.exe">xml2gbs.bdsproj</Projects>
- <Projects Name="installmgr.exe">installmgr.bdsproj</Projects>
- <Projects Name="Targets">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</Projects>
- </Projects>
- <Dependencies/>
- </Default.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">Default.Personality</Option> + <Option Name="ProjectType"></Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{9922D349-DBA7-45A7-A547-F2DD34E7E460}</Option> + </Option> + </PersonalityInfo> + <Default.Personality> + + <Projects> + <Projects Name="icuuc.lib">..\..\..\icu-sword\as_is\borland\icuuc.bdsproj</Projects> + <Projects Name="icuin.lib">..\..\..\icu-sword\as_is\borland\icuin.bdsproj</Projects> + <Projects Name="libcurl.lib">..\..\..\biblecs\apps\InstallMgr\libcurl.bdsproj</Projects> + <Projects Name="clucene.lib">..\..\..\biblecs\clucene\clucene.bdsproj</Projects> + <Projects Name="libsword.lib">..\..\lib\bcppmake\libsword.bdsproj</Projects> + <Projects Name="osis2mod.exe">osis2mod.bdsproj</Projects> + <Projects Name="mod2zmod.exe">mod2zmod.bdsproj</Projects> + <Projects Name="mod2vpl.exe">mod2vpl.bdsproj</Projects> + <Projects Name="mkfastmod.exe">mkfastmod.bdsproj</Projects> + <Projects Name="imp2gbs.exe">imp2gbs.bdsproj</Projects> + <Projects Name="vpl2mod.exe">vpl2mod.bdsproj</Projects> + <Projects Name="imp2ld.exe">imp2ld.bdsproj</Projects> + <Projects Name="imp2vs.exe">imp2vs.bdsproj</Projects> + <Projects Name="mod2imp.exe">mod2imp.bdsproj</Projects> + <Projects Name="cipherraw.exe">cipherraw.bdsproj</Projects> + <Projects Name="step2vpl.exe">step2vpl.bdsproj</Projects> + <Projects Name="stepdump.exe">stepdump.bdsproj</Projects> + <Projects Name="mod2osis.exe">mod2osis.bdsproj</Projects> + <Projects Name="vs2osisref.exe">vs2osisref.bdsproj</Projects> + <Projects Name="diatheke.exe">diatheke.bdsproj</Projects> + <Projects Name="xml2gbs.exe">xml2gbs.bdsproj</Projects> + <Projects Name="installmgr.exe">installmgr.bdsproj</Projects> + <Projects Name="Targets">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</Projects> + </Projects> + <Dependencies/> + </Default.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{DFB41EBE-3AE8-4E04-8037-375F4F5EE782}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="vpl2mod.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="vpl2mod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="vpl2mod" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\vpl2mod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="vpl2mod" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams"></Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">vpl2mod.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{DFB41EBE-3AE8-4E04-8037-375F4F5EE782}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="vpl2mod.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="vpl2mod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="vpl2mod" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\vpl2mod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="vpl2mod" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams"></Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">vpl2mod.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{91C55E1D-B813-477E-A8A5-1C3AFDFDEF95}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="vs2osisref.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="vs2osisref.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="vs2osisref" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\vs2osisref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="vs2osisref" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams">Gen1:1</Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">vs2osisref.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{91C55E1D-B813-477E-A8A5-1C3AFDFDEF95}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="vs2osisref.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="vs2osisref.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="vs2osisref" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\vs2osisref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="vs2osisref" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams">Gen1:1</Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">vs2osisref.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 @@ -<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="vs2osisreftxt.exe"/>
- <OBJFILES value="..\vs2osisreftxt.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib
- ..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value=""/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="vs2osisreftxt.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -src_suffix cpp -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[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=
- </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?> +<!-- C++Builder XML Project --> +<PROJECT> + <MACROS> + <VERSION value="BCB.05.03"/> + <PROJECT value="vs2osisreftxt.exe"/> + <OBJFILES value="..\vs2osisreftxt.obj"/> + <RESFILES value=""/> + <IDLFILES value=""/> + <IDLGENFILES value=""/> + <DEFFILE value=""/> + <RESDEPEN value="$(RESFILES)"/> + <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib + ..\..\..\icu-sword\as_is\borland\icudatab.lib + ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib + ..\..\..\biblecs\clucene\clucene.lib"/> + <LIBRARIES value=""/> + <SPARELIBS value=""/> + <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi + ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi + VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi + dclocx50.bpi bcb2kaxserver50.bpi"/> + <PATHCPP value=".;.."/> + <PATHPAS value=".;"/> + <PATHRC value=".;"/> + <PATHASM value=".;"/> + <DEBUGLIBPATH value="$(BCB)\lib\debug"/> + <RELEASELIBPATH value="$(BCB)\lib\release"/> + <LINKER value="tlink32"/> + <USERDEFINES value=""/> + <SYSDEFINES value="NO_STRICT;_NO_VCL"/> + <MAINSOURCE value="vs2osisreftxt.bpf"/> + <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/> + <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/> + <WARNINGS value="-w-par"/> + </MACROS> + <OPTIONS> + <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl + -src_suffix cpp -boa"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <RFLAGS value=""/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -ap -Tpe -x -Gn"/> + </OPTIONS> + <LINKER> + <ALLOBJ value="c0x32.obj $(OBJFILES)"/> + <ALLRES value="$(RESFILES)"/> + <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/> + </LINKER> + <IDEOPTIONS> +[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= + </IDEOPTIONS> </PROJECT>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
- <Option Name="ProjectType">CppConsoleApplication</Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{EF536EAE-FEDD-49D8-B32A-0EB5C911B107}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
- <project version="10.0">
- <property category="build.config" name="active" value="0"/>
- <property category="build.config" name="count" value="1"/>
- <property category="build.config" name="excludedefaultforzero" value="0"/>
- <property category="build.config.0" name="builddir" value="Debug"/>
- <property category="build.config.0" name="key" value="Debug_Build"/>
- <property category="build.config.0" name="name" value="Debug Build"/>
- <property category="build.config.0" name="settings.win32b" value="default"/>
- <property category="build.config.0" name="type" value="Toolset"/>
- <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>
- <property category="build.config.1" name="key" value="Release_Build"/>
- <property category="build.config.1" name="name" value="Release Build"/>
- <property category="build.config.1" name="settings.win32b" value="default"/>
- <property category="build.config.1" name="type" value="Toolset"/>
- <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>
- <property category="build.node" name="name" value="xml2gbs.exe"/>
- <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>
- <property category="build.node" name="use_packages" value="0"/>
- <property category="build.platform" name="active" value="win32"/>
- <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
- <property category="build.platform" name="win32.default" value="win32b"/>
- <property category="build.platform" name="win32.enabled" value="1"/>
- <property category="build.platform" name="win32.win32b.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>
- <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <optionset name="all_configurations">
- <property category="node" name="displayname" value="All Configurations"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>
- <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>
- <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>
- <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>
- <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>
- <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="_DEBUG"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>
- <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/>
- <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>
- <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg" value="0x20000"/>
- <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg.merge" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>
- <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>
- <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>
- <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>
- <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>
- </optionset>
- </project>
- <FILELIST>
- <FILE FILENAME="xml2gbs.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="xml2gbs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\xml2gbs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="xml2gbs" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>
- </FILELIST>
- <IDEOPTIONS>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">0</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1033</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
- <VersionInfoKeys Name="Comments"></VersionInfoKeys>
- </VersionInfoKeys>
- <HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>
- </HistoryLists_hlIncludePath>
- <HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>
- </HistoryLists_hlLibraryPath>
- <HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
- </HistoryLists_hlDebugSourcePath>
- <HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">3</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item2">_DEBUG</HistoryLists_hlConditionals>
- </HistoryLists_hlConditionals>
- <Debugging>
- <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
- </Debugging>
- <Parameters>
- <Parameters Name="RunParams">summatheologica.xml</Parameters>
- <Parameters Name="Launcher"></Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="DebugCWD"></Parameters>
- <Parameters Name="HostApplication"></Parameters>
- <Parameters Name="RemoteHost"></Parameters>
- <Parameters Name="RemotePath"></Parameters>
- <Parameters Name="RemoteParams"></Parameters>
- <Parameters Name="RemoteLauncher"></Parameters>
- <Parameters Name="UseRemoteLauncher">False</Parameters>
- <Parameters Name="RemoteCWD"></Parameters>
- <Parameters Name="RemoteDebug">False</Parameters>
- <Parameters Name="Debug Symbols Search Path"></Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <Language>
- <Language Name="ActiveLang"></Language>
- <Language Name="ProjectLang">$00000000</Language>
- <Language Name="RootDir"></Language>
- </Language>
- <Linker>
- <Linker Name="LibPrefix"></Linker>
- <Linker Name="LibSuffix"></Linker>
- <Linker Name="LibVersion"></Linker>
- </Linker>
- </IDEOPTIONS>
- </BCBPROJECT>
- <Source>
- <Source Name="MainSource">xml2gbs.bpf</Source>
- </Source>
- </CPlusPlusBuilder.Personality>
-</BorlandProject>
+<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <PersonalityInfo> + <Option> + <Option Name="Personality">CPlusPlusBuilder.Personality</Option> + <Option Name="ProjectType">CppConsoleApplication</Option> + <Option Name="Version">1.0</Option> + <Option Name="GUID">{EF536EAE-FEDD-49D8-B32A-0EB5C911B107}</Option> + </Option> + </PersonalityInfo> + <CPlusPlusBuilder.Personality> + <BCBPROJECT> + <project version="10.0"> + <property category="build.config" name="active" value="0"/> + <property category="build.config" name="count" value="1"/> + <property category="build.config" name="excludedefaultforzero" value="0"/> + <property category="build.config.0" name="builddir" value="Debug"/> + <property category="build.config.0" name="key" value="Debug_Build"/> + <property category="build.config.0" name="name" value="Debug Build"/> + <property category="build.config.0" name="settings.win32b" value="default"/> + <property category="build.config.0" name="type" value="Toolset"/> + <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/> + <property category="build.config.1" name="key" value="Release_Build"/> + <property category="build.config.1" name="name" value="Release Build"/> + <property category="build.config.1" name="settings.win32b" value="default"/> + <property category="build.config.1" name="type" value="Toolset"/> + <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/> + <property category="build.node" name="name" value="xml2gbs.exe"/> + <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/> + <property category="build.node" name="use_packages" value="0"/> + <property category="build.platform" name="active" value="win32"/> + <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/> + <property category="build.platform" name="win32.default" value="win32b"/> + <property category="build.platform" name="win32.enabled" value="1"/> + <property category="build.platform" name="win32.win32b.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/> + <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/> + <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/> + <optionset name="all_configurations"> + <property category="node" name="displayname" value="All Configurations"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/> + <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/> + <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/> + <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/> + <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/> + <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/> + <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="_DEBUG"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/> + <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.arg" value=""""/> + <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/> + <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg" value="0x20000"/> + <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg.merge" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/> + <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/> + <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/> + <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/> + <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/> + <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/> + <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/> + </optionset> + </project> + <FILELIST> + <FILE FILENAME="xml2gbs.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="xml2gbs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\xml2gbs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="xml2gbs" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/> + <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/> + </FILELIST> + <IDEOPTIONS> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> + <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"></VersionInfoKeys> + <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> + <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> + <VersionInfoKeys Name="ProductName"></VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"></VersionInfoKeys> + </VersionInfoKeys> + <HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath> + </HistoryLists_hlIncludePath> + <HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath> + </HistoryLists_hlLibraryPath> + <HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath> + <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath> + </HistoryLists_hlDebugSourcePath> + <HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Count">3</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals> + <HistoryLists_hlConditionals Name="Item2">_DEBUG</HistoryLists_hlConditionals> + </HistoryLists_hlConditionals> + <Debugging> + <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging> + </Debugging> + <Parameters> + <Parameters Name="RunParams">summatheologica.xml</Parameters> + <Parameters Name="Launcher"></Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="DebugCWD"></Parameters> + <Parameters Name="HostApplication"></Parameters> + <Parameters Name="RemoteHost"></Parameters> + <Parameters Name="RemotePath"></Parameters> + <Parameters Name="RemoteParams"></Parameters> + <Parameters Name="RemoteLauncher"></Parameters> + <Parameters Name="UseRemoteLauncher">False</Parameters> + <Parameters Name="RemoteCWD"></Parameters> + <Parameters Name="RemoteDebug">False</Parameters> + <Parameters Name="Debug Symbols Search Path"></Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ActiveLang"></Language> + <Language Name="ProjectLang">$00000000</Language> + <Language Name="RootDir"></Language> + </Language> + <Linker> + <Linker Name="LibPrefix"></Linker> + <Linker Name="LibSuffix"></Linker> + <Linker Name="LibVersion"></Linker> + </Linker> + </IDEOPTIONS> + </BCBPROJECT> + <Source> + <Source Name="MainSource">xml2gbs.bpf</Source> + </Source> + </CPlusPlusBuilder.Personality> +</BorlandProject> 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 <ctype.h> -#include <stdio.h> -#include <fcntl.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> - -#ifndef __GNUC__ -#include <io.h> -#else -#include <unistd.h> -#endif - -#include <filemgr.h> -#include <swcipher.h> -#include <versekey.h> -#include <rawverse.h> -#include <swbuf.h> - -#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 <datapath> \"<key>\"\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<SWBuf> loclist = lm->getAvailableLocales(); - list<SWBuf>::iterator li = loclist.begin(); - for (;li != loclist.end(); li++) { - *output << li->c_str() << endl; + for (list<SWBuf>::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 << "<entry>"; - if (querytype == QT_BIBLE) { - *parser = listkey; - *output << (const char *)*parser; - } - else *output << (const char *)listkey; - if (outputformat == FMT_CGI) *output << "</entry>"; - } - listkey++; - while (!listkey.popError()) { - *output << " ; "; - if (outputformat == FMT_CGI) *output << "<entry>"; - if (querytype == QT_BIBLE) { - *parser = listkey; - *output << (const char *)*parser; - } - else *output << (const char *)listkey; - if (outputformat == FMT_CGI) *output << "</entry>"; - 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 << "<entry>"; + *output << listkey.getText(); + if (outputformat == FMT_CGI) *output << "</entry>"; + } + 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 << "<meta http-equiv=\"content-type\" content=\"text/html\" charset=\"UTF-8\"" - " lang=\"" << locale << "\" xml:lang=\"" << locale << "\"/>"; + *output << "<html><head><meta http-equiv=\"content-type\" content=\"text/html\" charset=\"UTF-8\"" + " lang=\"" << locale << "\" xml:lang=\"" << locale << "\"/>\n" + "<style type=\"text/css\">" << target->getRenderHeader() << "</style></head><body>"; + } + 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 << ": <span style=\"font:\"" << font << ";\"" - << " lang=\"" << modlocale << "\">"; + // 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 << ": <span "; + *output << "style=\"font:" << font << ";\" "; + if (strcmp(modlocale,locale) !=0 ) { *output << "lang=\"" << modlocale << "\"";} + *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 << "</span>"; } @@ -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 << "<br />"; + else if (outputformat == FMT_OSIS) + *output << "<milestone type=\"line\"/>"; + else if (outputformat == FMT_RTF) + *output << "\\par "; + else if (outputformat == FMT_GBF) + *output << "<CM>"; - 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 << "<meta http-equiv=\"content-type\" content=\"text/html\" charset=\"UTF-8\"" - " lang=\"" << locale << "\" xml:lang=\"" << locale << "\"/>"; + 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 << ": <span "; - if (font) { *output << "style=\"font:\"" << font << ";\" " ;} - if (strcmp(modlocale,locale) !=0 ) { *output << "lang=\"" << modlocale << "\"";} - *output << ">"; - } - if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { - *output << ": <span style=\"font:\"" << font << ";\"" << " lang=\"" << modlocale << "\">"; - } - 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 << "</span>"; - } - 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 << "<br />"; - else if (outputformat == FMT_OSIS) - *output << "<milestone type=\"line\"/>"; - else if (outputformat == FMT_RTF) - *output << "\\par "; - else if (outputformat == FMT_GBF) - *output << "<CM>"; - - *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 << ": <span "; - if (font) { *output << "style=\"font:\"" << font << ";\" " ;} - if (strcmp(modlocale,locale) !=0 ) { *output << "lang=\"" << modlocale << "\"";} - *output << ">"; - } - - if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { - *output << ": <font face=\"" << font << "\">"; - } - 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 << "</span>"; - } - 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 << "<br />"; - else if (outputformat == FMT_OSIS) - *output << "<milestone type=\"line\"/>"; - else if (outputformat == FMT_RTF) - *output << "\\par "; - else if (outputformat == FMT_GBF) - *output << "<CM>"; - - *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 << "</body></html>\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 <swmgr.h> +#include <swmodule.h> + #include <thmlplain.h> -#include <gbfplain.h> #include <thmlgbf.h> -#include <gbfthml.h> +#include <thmlosis.h> #include <thmlhtml.h> -#include <gbfhtml.h> #include <thmlhtmlhref.h> -#include <gbfhtmlhref.h> +#include <thmlxhtml.h> +#include <thmllatex.h> #include <thmlrtf.h> +#include <thmlwebif.h> + +#include <gbfplain.h> +#include <gbfthml.h> +#include <gbfosis.h> +#include <gbfhtml.h> +#include <gbfhtmlhref.h> +#include <gbfxhtml.h> +#include <gbflatex.h> #include <gbfrtf.h> +#include <gbfwebif.h> + +#include <osisplain.h> +#include <osisosis.h> #include <osisrtf.h> #include <osishtmlhref.h> -#include <swmodule.h> -#include <osisplain.h> -#include <thmlosis.h> -#include <gbfosis.h> +#include <osisxhtml.h> +#include <osislatex.h> +#include <osiswebif.h> -#include <swmgr.h> +#include <teiplain.h> +#include <teirtf.h> +#include <teihtmlhref.h> +#include <teixhtml.h> +#include <teilatex.h> #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 <encfiltmgr.h> @@ -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 <book> 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{891A765C-5503-4FED-B427-7AE1413DB264}</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </LinkIncremental>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <TypeLibraryName>.\Debug/diatheke.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>.\Debug/diatheke.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
- <ObjectFileName>.\Debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>.\Debug/diatheke.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>.\Debug/diatheke.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Debug/diatheke.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>.\Release/diatheke.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>.\Release/diatheke.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
- <ObjectFileName>.\Release/</ObjectFileName>
- <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>.\Release/diatheke.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>.\Release/diatheke.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Release/diatheke.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="corediatheke.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="diafiltmgr.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="diatheke.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="diathekemgr.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="gbfcgi.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="osiscgi.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="thmlcgi.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="corediatheke.h" />
- <ClInclude Include="diafiltmgr.h" />
- <ClInclude Include="diathekemgr.h" />
- <ClInclude Include="gbfcgi.h" />
- <ClInclude Include="osiscgi.h" />
- <ClInclude Include="thmlcgi.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{891A765C-5503-4FED-B427-7AE1413DB264}</ProjectGuid> + <RootNamespace>diatheke</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\diatheke\Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\diatheke\Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + </LinkIncremental> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Midl> + <TypeLibraryName>.\Debug/diatheke.tlb</TypeLibraryName> + <HeaderFileName> + </HeaderFileName> + </Midl> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeaderOutputFile>.\Debug/diatheke.pch</PrecompiledHeaderOutputFile> + <AssemblerListingLocation>.\Debug/</AssemblerListingLocation> + <ObjectFileName>.\Debug/</ObjectFileName> + <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName> + <BrowseInformation>true</BrowseInformation> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Link> + <AdditionalDependencies>icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug/diatheke.exe</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>.\Debug/diatheke.pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Debug/diatheke.bsc</OutputFile> + </Bscmake> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Midl> + <TypeLibraryName>.\Release/diatheke.tlb</TypeLibraryName> + <HeaderFileName> + </HeaderFileName> + </Midl> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeaderOutputFile>.\Release/diatheke.pch</PrecompiledHeaderOutputFile> + <AssemblerListingLocation>.\Release/</AssemblerListingLocation> + <ObjectFileName>.\Release/</ObjectFileName> + <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> + <BrowseInformation>true</BrowseInformation> + <SuppressStartupBanner>true</SuppressStartupBanner> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Link> + <AdditionalDependencies>icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release/diatheke.exe</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <ProgramDatabaseFile>.\Release/diatheke.pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Release/diatheke.bsc</OutputFile> + </Bscmake> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="corediatheke.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <ClCompile Include="diafiltmgr.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <ClCompile Include="diatheke.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <ClCompile Include="diathekemgr.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <ClCompile Include="gbfcgi.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <ClCompile Include="osiscgi.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <ClCompile Include="thmlcgi.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="corediatheke.h" /> + <ClInclude Include="diafiltmgr.h" /> + <ClInclude Include="diathekemgr.h" /> + <ClInclude Include="gbfcgi.h" /> + <ClInclude Include="osiscgi.h" /> + <ClInclude Include="thmlcgi.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 <chrislit@crosswire.org>
-Based on code schema of <cking@acy.digex.net>
-
-#######################################################################
-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 <chrislit@crosswire.org> +Based on code schema of <cking@acy.digex.net> + +####################################################################### +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 <rawld.h> #include <rawld4.h> #include <zld.h> -#include <zipcomprs.h> #include <lzsscomprs.h> +#ifndef EXCLUDEZLIB +#include <zipcomprs.h> +#endif +#ifndef EXCLUDEBZIP2 +#include <bz2comprs.h> +#endif +#ifndef EXCLUDEXZ +#include <xzcomprs.h> +#endif #include <stdio.h> 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 <imp_file> [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 <output_path>\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 <l|z|b|x>\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 <output_path>\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 <entry_count>\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 <rawtext4.h> #include <ztext.h> #include <lzsscomprs.h> +#ifndef EXCLUDEZLIB #include <zipcomprs.h> +#endif +#ifndef EXCLUDEBZIP2 +#include <bz2comprs.h> +#endif +#ifndef EXCLUDEXZ +#include <xzcomprs.h> +#endif #include <localemgr.h> +#include <cipherfil.h> #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 <imp_file> [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 <l|z|b|x>\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 <output_path>\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 <locale>\t\t specify a locale scheme to use (default is en)\n"); + fprintf(stderr, " -c <cipher_key>\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 <locale>"); } + else if (!strcmp(argv[i], "-c")) { + if (i+1 < argc) cipherKey = argv[++i]; + else usage(*argv, "-c requires <cipher_key>"); + } 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> [command ...]\n" + fprintf(stderr, "\nusage: %s [--allow...] <command> [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 <remoteSrcName>\t\trefresh remote source\n" "\t-rl <remoteSrcName>\t\tlist available modules from remote source\n" "\t-rd <remoteSrcName>\t\tlist new/updated modules from remote source\n" + "\t-rdesc <remoteSrcName> <modName>\tdescribe module from remote source\n" "\t-ri <remoteSrcName> <modName>\tinstall module from remote source\n" "\t-l\t\t\t\tlist installed modules\n" "\t-u <modName>\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 <remoteSrcName>"); } + 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 <remoteSrcName> <modName>"); + } 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 <module_name> [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 <option_name> <option_value> - 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 <swtext.h> #include <swmgr.h> #include <lzsscomprs.h> +#ifndef EXCLUDEZLIB #include <zipcomprs.h> +#endif +#ifndef EXCLUDEBZIP2 +#include <bz2comprs.h> +#endif +#ifndef EXCLUDEXZ +#include <xzcomprs.h> +#endif + #include <versekey.h> #include <stdio.h> #include <cipherfil.h> @@ -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 << " <modname> <datapath> [blockType [compressType [cipherKey]]]\n\n"; + cerr << "usage: "<< appName << " <modname> <datapath> [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 <versekey.h> #include <ztext.h> +#include <ztext4.h> #include <lzsscomprs.h> +#ifndef EXCLUDEZLIB #include <zipcomprs.h> +#endif +#ifndef EXCLUDEBZIP2 +#include <bz2comprs.h> +#endif +#ifndef EXCLUDEXZ +#include <xzcomprs.h> +#endif #include <cipherfil.h> #ifdef _ICU_ #include <utf8nfc.h> #include <latin1utf8.h> +#include <utf8scsu.h> +#include <scsuutf8.h> #endif +#include <utf8utf16.h> +#include <utf16utf8.h> #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 = "<milestone type=\"x-importer\" subType=\"x-osis2mod\" n=\"$Rev: 3314 $\"/>"; + static const char* revision = "<milestone type=\"x-importer\" subType=\"x-osis2mod\" n=\"$Rev: 3431 $\"/>"; 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, <div type="book" ...> 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<XMLTag> 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, " <osisDoc>\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 <l|z|b|x>\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 <cipher_key>\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 "<!--", ending 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 <cipher_key>"); @@ -1645,7 +1936,6 @@ int main(int argc, char **argv) { else usage(*argv, "-v requires <v11n>"); } 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 <flags>"); } + 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 <n=1-15> <text-to-be-stripped> + * + * $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 <stdio.h> +#include <cstdlib> +#include <swmgr.h> +#include <markupfiltmgr.h> +#include <iostream> + +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif + +int usage() +{ + fprintf(stderr, "\nusage: stripaccents <n=1-15> <text-to-be-stripped> \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 <rawld.h> #include <rawld4.h> #include <zld.h> -#include <zipcomprs.h> #include <lzsscomprs.h> +#ifndef EXCLUDEZLIB +#include <zipcomprs.h> +#endif +#ifndef EXCLUDEBZIP2 +#include <bz2comprs.h> +#endif +#ifndef EXCLUDEXZ +#include <xzcomprs.h> +#endif #include <stdio.h> #include <cipherfil.h> @@ -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 <output/path> <teiDoc> [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 <l|z|b|x>\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 <cipher_key>\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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{76895767-61D0-41E6-B92D-FD541BB26D32}</ProjectGuid>
- <RootNamespace>addgb</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\addgb.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{76895767-61D0-41E6-B92D-FD541BB26D32}</ProjectGuid> + <RootNamespace>addgb</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\addgb.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}</ProjectGuid>
- <RootNamespace>addld</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\addld.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}</ProjectGuid> + <RootNamespace>addld</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\addld.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{CFF1021E-B878-481A-851B-2B226701D525}</ProjectGuid>
- <RootNamespace>addvs</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\addvs.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{CFF1021E-B878-481A-851B-2B226701D525}</ProjectGuid> + <RootNamespace>addvs</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\addvs.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}</ProjectGuid>
- <RootNamespace>cipherraw</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\cipherraw.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}</ProjectGuid> + <RootNamespace>cipherraw</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\cipherraw.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{A55BEE98-25BB-463D-9016-14CA4567DFBF}</ProjectGuid>
- <RootNamespace>emptyvss</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\emptyvss.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{A55BEE98-25BB-463D-9016-14CA4567DFBF}</ProjectGuid> + <RootNamespace>emptyvss</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\emptyvss.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}</ProjectGuid>
- <RootNamespace>genbookutil</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\genbookutil.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}</ProjectGuid> + <RootNamespace>genbookutil</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\genbookutil.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{2066EC0D-98CC-43E7-8405-5156AF111B38}</ProjectGuid>
- <RootNamespace>imp2gbs</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\imp2gbs.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{2066EC0D-98CC-43E7-8405-5156AF111B38}</ProjectGuid> + <RootNamespace>imp2gbs</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\imp2gbs.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}</ProjectGuid>
- <RootNamespace>imp2ld</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\imp2ld.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}</ProjectGuid> + <RootNamespace>imp2ld</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\imp2ld.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{5637456D-5B83-4C12-A129-708FC8CF0B33}</ProjectGuid>
- <RootNamespace>imp2vs</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\imp2vs.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5637456D-5B83-4C12-A129-708FC8CF0B33}</ProjectGuid> + <RootNamespace>imp2vs</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\imp2vs.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}</ProjectGuid>
- <RootNamespace>installmgr</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\installmgr.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}</ProjectGuid> + <RootNamespace>installmgr</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\installmgr.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{D1115CD8-3810-48B0-8A21-F695016C3557}</ProjectGuid>
- <RootNamespace>lexdump</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\lexdump.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D1115CD8-3810-48B0-8A21-F695016C3557}</ProjectGuid> + <RootNamespace>lexdump</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\lexdump.c" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{DB592F77-25DC-4005-BD49-6D0E50303844}</ProjectGuid>
- <RootNamespace>mkfastmod</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\mkfastmod.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{DB592F77-25DC-4005-BD49-6D0E50303844}</ProjectGuid> + <RootNamespace>mkfastmod</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\mkfastmod.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}</ProjectGuid>
- <RootNamespace>mod2imp</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\mod2imp.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}</ProjectGuid> + <RootNamespace>mod2imp</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\mod2imp.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{B5D19969-5285-4B0E-B798-496A0B8DCA61}</ProjectGuid>
- <RootNamespace>mod2osis</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\mod2osis.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{B5D19969-5285-4B0E-B798-496A0B8DCA61}</ProjectGuid> + <RootNamespace>mod2osis</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\mod2osis.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{0C43604F-08D6-490C-BDFD-1B6CACB59740}</ProjectGuid>
- <RootNamespace>mod2vpl</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\mod2vpl.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{0C43604F-08D6-490C-BDFD-1B6CACB59740}</ProjectGuid> + <RootNamespace>mod2vpl</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\mod2vpl.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}</ProjectGuid>
- <RootNamespace>mod2zmod</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\mod2zmod.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}</ProjectGuid> + <RootNamespace>mod2zmod</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\mod2zmod.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}</ProjectGuid>
- <RootNamespace>modwrite</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\modwrite.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}</ProjectGuid> + <RootNamespace>modwrite</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\modwrite.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}</ProjectGuid>
- <RootNamespace>osis2mod</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <WholeProgramOptimization>
- </WholeProgramOptimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>
- </OptimizeReferences>
- <EnableCOMDATFolding>
- </EnableCOMDATFolding>
- <LinkTimeCodeGeneration>
- </LinkTimeCodeGeneration>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\osis2mod.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}</ProjectGuid> + <RootNamespace>osis2mod</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <WholeProgramOptimization> + </WholeProgramOptimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>false</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences> + </OptimizeReferences> + <EnableCOMDATFolding> + </EnableCOMDATFolding> + <LinkTimeCodeGeneration> + </LinkTimeCodeGeneration> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\osis2mod.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{43B53430-3C91-4A11-8A1F-5873AEEE0926}</ProjectGuid>
- <RootNamespace>step2vpl</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\step2vpl.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{43B53430-3C91-4A11-8A1F-5873AEEE0926}</ProjectGuid> + <RootNamespace>step2vpl</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\step2vpl.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}</ProjectGuid>
- <RootNamespace>stepdump</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\stepdump.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}</ProjectGuid> + <RootNamespace>stepdump</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\stepdump.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}</ProjectGuid>
- <RootNamespace>tei2mod</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\tei2mod.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}</ProjectGuid> + <RootNamespace>tei2mod</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\tei2mod.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}</ProjectGuid>
- <RootNamespace>treeidxutil</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\treeidxutil.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}</ProjectGuid> + <RootNamespace>treeidxutil</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\treeidxutil.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{7192CF83-B08C-4387-A869-FD1970167115}</ProjectGuid>
- <RootNamespace>vpl2mod</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\vpl2mod.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{7192CF83-B08C-4387-A869-FD1970167115}</ProjectGuid> + <RootNamespace>vpl2mod</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\vpl2mod.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{DFDB8804-5D6C-448F-A935-DD85629E0554}</ProjectGuid>
- <RootNamespace>vs2osisref</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\vs2osisref.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{DFDB8804-5D6C-448F-A935-DD85629E0554}</ProjectGuid> + <RootNamespace>vs2osisref</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\vs2osisref.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}</ProjectGuid>
- <RootNamespace>vs2osisreftxt</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\vs2osisreftxt.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}</ProjectGuid> + <RootNamespace>vs2osisreftxt</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\vs2osisreftxt.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{87116D0C-E498-4193-9F2D-301A8771B77D}</ProjectGuid>
- <RootNamespace>xml2gbs</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>
- </LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>
- </ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- </ClCompile>
- <Link>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\xml2gbs.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">
- <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{87116D0C-E498-4193-9F2D-301A8771B77D}</ProjectGuid> + <RootNamespace>xml2gbs</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\$(ProjectName)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental> + </LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Debug\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers> + </ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + </ClCompile> + <Link> + <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>Release\$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\xml2gbs.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj"> + <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project>
\ 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 |
