aboutsummaryrefslogtreecommitdiffstats
path: root/utilities
diff options
context:
space:
mode:
Diffstat (limited to 'utilities')
-rw-r--r--utilities/bcppmake/cipherraw.bpr9
-rw-r--r--utilities/bcppmake/libsword.bpr18
-rw-r--r--utilities/bcppmake/mkfastmod.bpr16
-rw-r--r--utilities/bcppmake/mod2vpl.bpr18
-rw-r--r--utilities/bcppmake/mod2zmod.bpr12
-rw-r--r--utilities/bcppmake/thml2gbs.bpr20
-rw-r--r--utilities/bcppmake/utilities.bpg4
-rw-r--r--utilities/bcppmake/vpl2mod.bpr13
-rw-r--r--utilities/mod2zmod.cpp16
9 files changed, 69 insertions, 57 deletions
diff --git a/utilities/bcppmake/cipherraw.bpr b/utilities/bcppmake/cipherraw.bpr
index b2e0df9..f2587c2 100644
--- a/utilities/bcppmake/cipherraw.bpr
+++ b/utilities/bcppmake/cipherraw.bpr
@@ -26,7 +26,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
<SYSDEFINES value="NO_STRICT;_NO_VCL"/>
<MAINSOURCE value="cipherraw.bpf"/>
<INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -91,9 +91,10 @@ Count=1
Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
-Count=2
-Item0=_ICU_;_ICUSWORD_
-Item1=_DEBUG
+Count=3
+Item0=_ICU_;_ICUSWORD_;USBINARY
+Item1=_ICU_;_ICUSWORD_
+Item2=_DEBUG
[Debugging]
DebugSourceDirs=$(BCB)\source\vcl
diff --git a/utilities/bcppmake/libsword.bpr b/utilities/bcppmake/libsword.bpr
index 4fad418..22a1d97 100644
--- a/utilities/bcppmake/libsword.bpr
+++ b/utilities/bcppmake/libsword.bpr
@@ -99,7 +99,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;_DEBUG"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="libsword.bpf"/>
<INCLUDEPATH value="..\..\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"/>
@@ -108,10 +108,9 @@
<LISTFILE value=""/>
</MACROS>
<OPTIONS>
- <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k
- -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
- <AFLAGS value="/mx /w2 /zi"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zn"/>
<LFLAGS value="/P512"/>
</OPTIONS>
<LINKER>
@@ -168,10 +167,11 @@ Count=1
Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
-Count=3
-Item0=_ICU_;_ICUSWORD_;_DEBUG
+Count=4
+Item0=_ICU_;_ICUSWORD_;USBINARY
Item1=_ICU_;_ICUSWORD_
-Item2=_DEBUG
+Item2=_ICU_;_ICUSWORD_;_DEBUG
+Item3=_DEBUG
[HistoryLists\hlTlibPageSize]
Count=5
@@ -194,7 +194,7 @@ RemoteDebug=0
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
[Language]
ActiveLang=
diff --git a/utilities/bcppmake/mkfastmod.bpr b/utilities/bcppmake/mkfastmod.bpr
index 2bfe89f..cef648d 100644
--- a/utilities/bcppmake/mkfastmod.bpr
+++ b/utilities/bcppmake/mkfastmod.bpr
@@ -74,15 +74,17 @@ ProductVersion=1.0.0.0
Comments=
[HistoryLists\hlIncludePath]
-Count=3
-Item0=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item1=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item2=..;$(BCB)\include;$(BCB)\include\vcl
+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=2
-Item0=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..;$(BCB)\lib\obj;$(BCB)\lib
+Count=3
+Item0=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..;$(BCB)\lib\obj;$(BCB)\lib
[HistoryLists\hlDebugSourcePath]
Count=1
diff --git a/utilities/bcppmake/mod2vpl.bpr b/utilities/bcppmake/mod2vpl.bpr
index fe6c102..b6981df 100644
--- a/utilities/bcppmake/mod2vpl.bpr
+++ b/utilities/bcppmake/mod2vpl.bpr
@@ -74,15 +74,17 @@ ProductVersion=1.0.0.0
Comments=
[HistoryLists\hlIncludePath]
-Count=3
-Item0=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item1=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item2=..;$(BCB)\include;$(BCB)\include\vcl
+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=2
-Item0=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..;$(BCB)\lib\obj;$(BCB)\lib
+Count=3
+Item0=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..;$(BCB)\lib\obj;$(BCB)\lib
[HistoryLists\hlDebugSourcePath]
Count=1
@@ -97,7 +99,7 @@ Item1=_DEBUG
DebugSourceDirs=$(BCB)\source\vcl
[Parameters]
-RunParams=
+RunParams=RWP ./ 3 2 abc
HostApplication=
RemoteHost=
RemotePath=
diff --git a/utilities/bcppmake/mod2zmod.bpr b/utilities/bcppmake/mod2zmod.bpr
index f388f91..de1a8f7 100644
--- a/utilities/bcppmake/mod2zmod.bpr
+++ b/utilities/bcppmake/mod2zmod.bpr
@@ -26,7 +26,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
<SYSDEFINES value="NO_STRICT;_NO_VCL"/>
<MAINSOURCE value="mod2zmod.bpf"/>
<INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -91,15 +91,17 @@ Count=1
Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
-Count=2
-Item0=_ICU_;_ICUSWORD_
-Item1=_DEBUG
+Count=4
+Item0=_ICU_;_ICUSWORD_;USBINARY
+Item1=_ICU_;_ICUSWORD_
+Item2=_ICU_;_ICUSWORD_;_DEBUG
+Item3=_DEBUG
[Debugging]
DebugSourceDirs=$(BCB)\source\vcl
[Parameters]
-RunParams=
+RunParams=RWP ./ 3 2 abc
HostApplication=
RemoteHost=
RemotePath=
diff --git a/utilities/bcppmake/thml2gbs.bpr b/utilities/bcppmake/thml2gbs.bpr
index 0447081..3ba21c6 100644
--- a/utilities/bcppmake/thml2gbs.bpr
+++ b/utilities/bcppmake/thml2gbs.bpr
@@ -26,7 +26,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;_DEBUG"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_"/>
<SYSDEFINES value="NO_STRICT;_NO_VCL"/>
<MAINSOURCE value="thml2gbs.bpf"/>
<INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -36,12 +36,11 @@
<OPTIONS>
<IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
-src_suffix cpp -D_ICU_ -D_ICUSWORD_ -D_DEBUG -boa"/>
- <CFLAG1 value="-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"/>
+ <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 /zi"/>
- <LFLAGS value="-D&quot;&quot; -S:0x200000 -Sc:0x20000 -ap -Tpe -x -Gn -v"/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D&quot;&quot; -S:0x200000 -Sc:0x20000 -ap -Tpe -x -Gn"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0x32.obj $(OBJFILES)"/>
@@ -96,8 +95,8 @@ Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
Count=3
-Item0=_ICU_;_ICUSWORD_;_DEBUG
-Item1=_ICU_;_ICUSWORD_
+Item0=_ICU_;_ICUSWORD_
+Item1=_ICU_;_ICUSWORD_;_DEBUG
Item2=_DEBUG
[Debugging]
@@ -115,11 +114,6 @@ ShowInfoMsgs=0
LinkDebugVcl=0
LinkCGLIB=0
-[CORBA]
-AddServerUnit=1
-AddClientUnit=1
-PrecompiledHeaders=1
-
[Language]
ActiveLang=
ProjectLang=
diff --git a/utilities/bcppmake/utilities.bpg b/utilities/bcppmake/utilities.bpg
index 1fcc1c1..b68ef5e 100644
--- a/utilities/bcppmake/utilities.bpg
+++ b/utilities/bcppmake/utilities.bpg
@@ -9,8 +9,8 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
DCC = $(ROOT)\bin\dcc32.exe $**
BRCC = $(ROOT)\bin\brcc32.exe $**
#------------------------------------------------------------------------------
-PROJECTS = libsword.lib mod2vpl.exe vpl2mod.exe mkfastmod.exe imp2gbs.exe \
- imp2ld.exe imp2vs.exe thml2gbs.exe mod2zmod.exe mod2imp.exe cipherraw.exe \
+PROJECTS = libsword.lib mod2zmod.exe mod2vpl.exe vpl2mod.exe mkfastmod.exe \
+ imp2gbs.exe imp2ld.exe imp2vs.exe thml2gbs.exe mod2imp.exe cipherraw.exe \
stepdump.exe step2vpl.exe mod2osis.exe
#------------------------------------------------------------------------------
default: $(PROJECTS)
diff --git a/utilities/bcppmake/vpl2mod.bpr b/utilities/bcppmake/vpl2mod.bpr
index 54810be..4cb048a 100644
--- a/utilities/bcppmake/vpl2mod.bpr
+++ b/utilities/bcppmake/vpl2mod.bpr
@@ -74,15 +74,16 @@ ProductVersion=1.0.0.0
Comments=
[HistoryLists\hlIncludePath]
-Count=3
-Item0=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item1=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item2=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+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=3
-Item0=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item0=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
Item2=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
[HistoryLists\hlDebugSourcePath]
diff --git a/utilities/mod2zmod.cpp b/utilities/mod2zmod.cpp
index 7d64b54..de7a3e3 100644
--- a/utilities/mod2zmod.cpp
+++ b/utilities/mod2zmod.cpp
@@ -19,11 +19,12 @@
#include <zipcomprs.h>
#include <versekey.h>
#include <stdio.h>
+#include <cipherfil.h>
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]]\n\n";
+ cerr << "usage: "<< appName << " <modname> <datapath> [blockType [compressType [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";
@@ -36,12 +37,13 @@ int main(int argc, char **argv)
{
int iType = 4;
int compType = 1;
+ string cipherKey = "";
SWCompress *compressor = 0;
SWModule *inModule = 0;
SWModule *outModule = 0;
- if ((argc < 3) || (argc > 5)) {
+ if ((argc < 3) || (argc > 6)) {
errorOutHelp(argv[0]);
}
@@ -49,6 +51,9 @@ int main(int argc, char **argv)
iType = atoi(argv[3]);
if (argc > 4) {
compType = atoi(argv[4]);
+ if (argc > 5) {
+ cipherKey = argv[5];
+ }
}
}
@@ -115,6 +120,11 @@ int main(int argc, char **argv)
break;
}
+ if (!cipherKey.empty()) {
+ SWFilter *cipherFilter = new CipherFilter(cipherKey.c_str());
+ outModule->AddRawFilter(cipherFilter);
+ }
+
string lastBuffer = "Something that would never be first module entry";
SWKey bufferKey;
SWKey lastBufferKey;
@@ -153,7 +163,7 @@ int main(int argc, char **argv)
}
(*inModule)++;
}
- delete outModuleKey;
delete outModule;
+ delete outModuleKey;
}
generated by cgit (git 2.34.1) at 2024-11-10 00:20:21 +0000