[sword-cvs] sword/apps/windoze/CBuilder5/InstallMgr InstallManager.bpr,1.2,1.3 InstallManager.res,1.1,1.2 MainFrm.cpp,1.21,1.22 MainFrm.h,1.9,1.10 StatusFrm.cpp,1.17,1.18 StatusFrm.h,1.11,1.12 cipherfrm.cpp,1.5,1.6 cipherfrm.h,1.4,1.5 libcurl.bpr,1.8,1.9
sword@www.crosswire.org
sword@www.crosswire.org
Wed, 13 Aug 2003 17:57:40 -0700
Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr
In directory www:/tmp/cvs-serv3180/apps/windoze/CBuilder5/InstallMgr
Modified Files:
InstallManager.bpr InstallManager.res MainFrm.cpp MainFrm.h
StatusFrm.cpp StatusFrm.h cipherfrm.cpp cipherfrm.h
libcurl.bpr
Log Message:
no message
Index: InstallManager.bpr
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/InstallManager.bpr,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- InstallManager.bpr 28 Jun 2003 01:48:10 -0000 1.2
+++ InstallManager.bpr 14 Aug 2003 00:57:38 -0000 1.3
@@ -30,7 +30,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY;_DEBUG"/>
+ <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="InstallManager.cpp"/>
<INCLUDEPATH value="..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include"/>
@@ -43,12 +43,12 @@
-I..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr
-I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\..\include -src_suffix
cpp -DVCL -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -r-
- -a8 -b- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+ <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8
+ -b- -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-D"" -aa -Tpe -x -Gn -v"/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D"" -aa -Tpe -x -Gn"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0w32.obj sysinit.obj $(OBJFILES)"/>
@@ -61,8 +61,8 @@
AutoIncBuild=0
MajorVer=1
MinorVer=5
-Release=4
-Build=0
+Release=5
+Build=4
Debug=0
PreRelease=0
Special=0
@@ -74,13 +74,13 @@
[Version Info Keys]
CompanyName=CrossWire Bible Society
FileDescription=SWORD Installation Manager
-FileVersion=1.5.4.0
+FileVersion=1.5.5.4
InternalName=InstallMgr
LegalCopyright=Copyright 2002 by CrossWire Bible Society
LegalTrademarks=
OriginalFilename=
ProductName=The SWORD Project
-ProductVersion=1.5.4a
+ProductVersion=1.5.6rc2
Comments=Seek Jesus who exchanges temporary for eternal
[HistoryLists\hlIncludePath]
@@ -109,18 +109,19 @@
Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
-Count=11
-Item0=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY;_DEBUG
-Item1=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG
-Item2=VCL;_ICU_;_ICUSWORD_;USBINARY
-Item3=VCL
-Item4=VCL;_DEBUG
-Item5=VCL;__STDC__ true
-Item6=VCL;__STDC__
-Item7=VCL;_MSC_VER
-Item8=VCL __STDC__
-Item9=_DEBUG;VCL
-Item10=_DEBUG
+Count=12
+Item0=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY
+Item1=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY;_DEBUG
+Item2=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item3=VCL;_ICU_;_ICUSWORD_;USBINARY
+Item4=VCL
+Item5=VCL;_DEBUG
+Item6=VCL;__STDC__ true
+Item7=VCL;__STDC__
+Item8=VCL;_MSC_VER
+Item9=VCL __STDC__
+Item10=_DEBUG;VCL
+Item11=_DEBUG
[HistoryLists\hlRunParameters]
Count=1
Index: InstallManager.res
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/InstallManager.res,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs5xyxem and /tmp/cvsoyRz0f differ
Index: MainFrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/MainFrm.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- MainFrm.cpp 7 Jul 2003 02:50:05 -0000 1.21
+++ MainFrm.cpp 14 Aug 2003 00:57:38 -0000 1.22
@@ -42,7 +42,7 @@
StatusForm->totalBytes = totalBytes;
StatusForm->completedBytes = completedBytes;
StatusForm->buffer = message;
- StatusForm->PreDownload1();
+ StatusForm->PreDownload2();
Application->ProcessMessages();
}
@@ -59,6 +59,11 @@
Application->ProcessMessages();
}
+bool InstallMgrWin::getCipherCode(const char *modName, SWConfig *config) {
+ CipherForm->modName = modName;
+ CipherForm->config = config;
+ return (CipherForm->ShowModal() == mrCancel);
+}
__fastcall InstallSourceTab::InstallSourceTab(TComponent *Owner, InstallSource *is) : TControl(Owner) {
this->is = is;
Index: MainFrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/MainFrm.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- MainFrm.h 7 Jul 2003 00:25:59 -0000 1.9
+++ MainFrm.h 14 Aug 2003 00:57:38 -0000 1.10
@@ -39,6 +39,7 @@
virtual int FTPCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer = false, const char *suffix = "");
virtual void statusUpdate(double dltotal, double dlnow);
virtual void preDownloadStatus(long totalBytes, long completedBytes, const char *message);
+ virtual bool getCipherCode(const char *modName, SWConfig *config);
};
//---------------------------------------------------------------------------
Index: StatusFrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- StatusFrm.cpp 7 Jul 2003 00:25:59 -0000 1.17
+++ StatusFrm.cpp 14 Aug 2003 00:57:38 -0000 1.18
@@ -114,14 +114,14 @@
}
-void __fastcall TStatusForm::TFTPThread::PreDownload2(void)
+void __fastcall TStatusForm::PreDownload2(void)
{
- StatusForm->buffer = "Downloading: ";
- StatusForm->buffer += src.c_str();
+// StatusForm->buffer = "Downloading: ";
+// StatusForm->buffer += src.c_str();
StatusForm->actionBar->Caption = StatusForm->buffer.c_str();
StatusForm->statusBar->Caption = "";
StatusForm->Repaint();
- FileMgr::createParent(dest.c_str()); // make sure parent directory exists
+// FileMgr::createParent(dest.c_str()); // make sure parent directory exists
}
Index: StatusFrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/StatusFrm.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- StatusFrm.h 7 Jul 2003 00:25:59 -0000 1.11
+++ StatusFrm.h 14 Aug 2003 00:57:38 -0000 1.12
@@ -51,11 +51,11 @@
void __fastcall FTPLinkPacketRecvd(TObject *Sender);
void __fastcall CreateFTPObject(void);
void __fastcall PreConnect(void);
- void __fastcall PreDownload2(void);
// void __fastcall Cleanup(void);
} *ftpThread;
public: // User declarations
void __fastcall PreDownload1(void);
+ void __fastcall PreDownload2(void);
long completedBytes;
long totalBytes;
InstallSource *is;
Index: cipherfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cipherfrm.cpp 27 Jun 2003 01:41:06 -0000 1.5
+++ cipherfrm.cpp 14 Aug 2003 00:57:38 -0000 1.6
@@ -23,17 +23,14 @@
{
SectionMap::iterator section;
ConfigEntMap::iterator entry;
- SWConfig *modconf = new SWConfig(confFile.c_str());
SWBuf tmpBuf;
- section = modconf->Sections.find(modName);
- if (section != modconf->Sections.end()) {
+ section = config->Sections.find(modName);
+ if (section != config->Sections.end()) {
entry = section->second.find("CipherKey");
if (entry != section->second.end()) {
entry->second = CipherForm->cipherEdit->Text.c_str();
- modconf->Save();
- delete modconf; // close file
- modconf = 0;
+ config->Save();
SWMgr *mgr = new SWMgr();
SWModule *mod = mgr->Modules[modName];
mod->setKey("Ipet 2:12");
@@ -45,9 +42,6 @@
delete mgr;
}
}
- if (modconf)
- delete modconf;
-
}
//---------------------------------------------------------------------------
Index: cipherfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/cipherfrm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cipherfrm.h 27 Jun 2003 01:41:06 -0000 1.4
+++ cipherfrm.h 14 Aug 2003 00:57:38 -0000 1.5
@@ -8,6 +8,7 @@
#include <Forms.hpp>
#include <ExtCtrls.hpp>
#include <swbuf.h>
+#include <swconfig.h>
using namespace sword;
//---------------------------------------------------------------------------
@@ -29,7 +30,7 @@
void __fastcall FormClose(TObject *Sender, TCloseAction &Action);
private: // User declarations
public: // User declarations
- SWBuf confFile;
+ SWConfig *config;
SWBuf modName;
__fastcall TCipherForm(TComponent* Owner);
};
Index: libcurl.bpr
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/libcurl.bpr,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libcurl.bpr 26 Jun 2003 20:05:52 -0000 1.8
+++ libcurl.bpr 14 Aug 2003 00:57:38 -0000 1.9
@@ -27,7 +27,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value="_DEBUG"/>
+ <USERDEFINES value=""/>
<SYSDEFINES value="_RTLDLL;NO_STRICT"/>
<MAINSOURCE value="libcurl.bpf"/>
<INCLUDEPATH value="curl\curlcpp;curl\lib;curl\include;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -36,10 +36,9 @@
<LISTFILE value=""/>
</MACROS>
<OPTIONS>
- <CFLAG1 value="-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=""/>
</OPTIONS>
<LINKER>