[sword-cvs] biblecs/apps/InstallMgr InstallManager.bpg, 1.1, 1.2 InstallManager.bpr, 1.5, 1.6 InstallManager.cpp, 1.1, 1.2 MainFrm.cpp, 1.24, 1.25 MainFrm.dfm, 1.10, 1.11 MainFrm.h, 1.10, 1.11

sword at www.crosswire.org sword at www.crosswire.org
Mon May 3 15:41:16 MST 2004 

Update of /cvs/core/biblecs/apps/InstallMgr
In directory www:/tmp/cvs-serv21558/apps/InstallMgr

Modified Files:
	InstallManager.bpg InstallManager.bpr InstallManager.cpp 
	MainFrm.cpp MainFrm.dfm MainFrm.h 
Log Message:
no message

Index: InstallManager.bpg
===================================================================
RCS file: /cvs/core/biblecs/apps/InstallMgr/InstallManager.bpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- InstallManager.bpg	26 Jun 2003 20:05:52 -0000	1.1
+++ InstallManager.bpg	3 May 2004 22:41:14 -0000	1.2
@@ -9,7 +9,7 @@
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = libsword.lib libcurl.lib InstallManager.exe
+PROJECTS = libcurl.lib libsword.lib InstallManager.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
@@ -18,12 +18,12 @@
   $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
-libsword.lib: ..\..\..\..\lib\bcppmake\libsword.bpr
-  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
 InstallManager.exe: InstallManager.bpr
   $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+libsword.lib: ..\..\..\sword\lib\bcppmake\libsword.bpr
+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
 

Index: InstallManager.bpr
===================================================================
RCS file: /cvs/core/biblecs/apps/InstallMgr/InstallManager.bpr,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- InstallManager.bpr	17 Aug 2003 09:26:28 -0000	1.5
+++ InstallManager.bpr	3 May 2004 22:41:14 -0000	1.6
@@ -6,7 +6,7 @@
     <PROJECT value="InstallManager.exe"/>
     <OBJFILES value="InstallManager.obj MainFrm.obj StatusFrm.obj RemoteMntFrm.obj InfoFrm.obj 
       cipherfrm.obj UninstallFrm.obj ..\..\swwinlog.obj 
-      ..\..\..\..\src\mgr\installmgr.obj"/>
+      ..\..\..\sword\src\mgr\installmgr.obj"/>
     <RESFILES value="InstallManager.res"/>
     <IDLFILES value=""/>
     <IDLGENFILES value=""/>
@@ -14,16 +14,15 @@
     <RESDEPEN value="$(RESFILES) MainFrm.dfm StatusFrm.dfm RemoteMntFrm.dfm InfoFrm.dfm 
       cipherfrm.dfm UninstallFrm.dfm"/>
     <LIBFILES value="libcurl.lib curl\lib\ws2_32.lib 
-      ..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib 
-      ..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib 
-      ..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib 
-      ..\..\..\..\lib\libsword.lib"/>
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\sword\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icuuc.lib 
+      ..\..\..\icu-sword\as_is\borland\icuin.lib"/>
     <LIBRARIES value="NMFast50.lib vclx50.lib vcl50.lib"/>
     <SPARELIBS value="vcl50.lib vclx50.lib NMFast50.lib"/>
     <PACKAGES value="vcl50.bpi vclx50.bpi vcljpg50.bpi bcbsmp50.bpi qrpt50.bpi vcldb50.bpi 
       vclbde50.bpi ibsmp50.bpi vcldbx50.bpi teeui50.bpi teedb50.bpi tee50.bpi 
       nmfast50.bpi dclocx50.bpi"/>
-    <PATHCPP value=".;..\..;..\..\..\..\src\mgr"/>
+    <PATHCPP value=".;..\..;..\..\..\sword\src\mgr"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
@@ -33,8 +32,8 @@
     <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"/>
-    <LIBPATH value="..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include"/>
+    <LIBPATH value="..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;..\BibleCS;D:\usr\src\sword\apps\windoze\CBuilder4\InstallMgr\;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par -w-8027 -w-8026"/>
     <WARNOPTSTR value=""/>
   </MACROS>
@@ -84,25 +83,30 @@
 Comments=Seek Jesus who exchanges temporary for eternal
 
 [HistoryLists\hlIncludePath]
-Count=8
-Item0=..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item1=..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item2=curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item3=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item4=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item5=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Count=11
+Item0=..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
+Item1=curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
+Item2=..\..\..\mgr;..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item3=..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item4=..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item5=curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
 Item6=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item7=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item7=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item8=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item9=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item10=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
 
 [HistoryLists\hlLibraryPath]
-Count=7
-Item0=..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item3=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Count=9
+Item0=..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;..\BibleCS;D:\usr\src\sword\apps\windoze\CBuilder4\InstallMgr\;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\..\..\mgr;..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
 Item4=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
 Item5=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item6=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item6=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item7=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item8=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1

Index: InstallManager.cpp
===================================================================
RCS file: /cvs/core/biblecs/apps/InstallMgr/InstallManager.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- InstallManager.cpp	26 Jun 2003 20:05:52 -0000	1.1
+++ InstallManager.cpp	3 May 2004 22:41:14 -0000	1.2
@@ -10,12 +10,12 @@
 USEFORM("UninstallFrm.cpp", UninstallForm);
 USELIB("libcurl.lib");
 USELIB("curl\lib\ws2_32.lib");
-USELIB("..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib");
-USELIB("..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib");
-USELIB("..\..\..\..\lib\libsword.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
 USEUNIT("..\..\swwinlog.cpp");
-USEUNIT("..\..\..\..\src\mgr\installmgr.cpp");
+USEUNIT("..\..\..\sword\src\mgr\installmgr.cpp");
+USELIB("..\..\..\sword\lib\libsword.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
 //---------------------------------------------------------------------------
 WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
 {

Index: MainFrm.cpp
===================================================================
RCS file: /cvs/core/biblecs/apps/InstallMgr/MainFrm.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- MainFrm.cpp	17 Aug 2003 09:26:28 -0000	1.24
+++ MainFrm.cpp	3 May 2004 22:41:14 -0000	1.25
@@ -92,10 +92,6 @@
 
 
 __fastcall TMainForm::~TMainForm() {
-	delete manager;
-	if (localMgr)
-		delete localMgr;
-	delete installMgr;
 }
 
 
@@ -103,9 +99,7 @@
 
 	refreshPageControl();
 	
-	if (SWLog::systemlog)
-		delete SWLog::systemlog;
-	SWLog::systemlog = new SWWinLog(this->Handle);		// set the system logger to our MSWindows specific SWLog class
+	SWLog::setSystemLog(new SWWinLog(this->Handle));		// set the system logger to our MSWindows specific SWLog class
 
 	fillInstallTree();
 	fillSourceTree(localTree);
@@ -696,6 +690,16 @@
 
 	SWBuf helpExe = helpDir + "\\Sword.chm::modulesh.html#instmgr";
 	ShellExecute(this->Handle, "open", "hh", helpExe.c_str(), NULL, SW_SHOWNORMAL);
+}
+//---------------------------------------------------------------------------
+
+void __fastcall TMainForm::FormClose(TObject *Sender, TCloseAction &Action)
+{
+	delete manager;
+	if (localMgr)
+		delete localMgr;
+	delete installMgr;
+	
 }
 //---------------------------------------------------------------------------
 

Index: MainFrm.dfm
===================================================================
RCS file: /cvs/core/biblecs/apps/InstallMgr/MainFrm.dfm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MainFrm.dfm	17 Aug 2003 09:26:28 -0000	1.10
+++ MainFrm.dfm	3 May 2004 22:41:14 -0000	1.11
@@ -14,6 +14,7 @@
   OldCreateOrder = False
   Position = poScreenCenter
   Scaled = False
+  OnClose = FormClose
   OnCreate = FormCreate
   OnShow = FormShow
   PixelsPerInch = 96
@@ -1676,7 +1677,7 @@
     Left = 524
     Top = 110
     Bitmap = {
-      494C010106000900040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
+      494C010106000900040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000003000000001001000000000000018
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1884,7 +1885,8 @@
       F8FFFC7FE00FFC7FF07FD837F00FD837E03FE00FF00FE00FC01FE00FF80FE00F
       800FC007F007C0070007C007F007800700030001F00700018001C007F00F0007
       C003C007F01F0007E00FE00FF81F000FF00FE00FFE1F000FF81FD837FF1F8037
-      FC7FFEFFFF1F80FFFFFFFEFFFFBFC2FF}
+      FC7FFEFFFF1F80FFFFFFFEFFFFBFC2FF00000000000000000000000000000000
+      000000000000}
   end
   object ImageList2: TImageList
     Left = 524

Index: MainFrm.h
===================================================================
RCS file: /cvs/core/biblecs/apps/InstallMgr/MainFrm.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MainFrm.h	14 Aug 2003 00:57:38 -0000	1.10
+++ MainFrm.h	3 May 2004 22:41:14 -0000	1.11
@@ -105,6 +105,7 @@
 	void __fastcall FormShow(TObject *Sender);
 	void __fastcall LockedModules1Click(TObject *Sender);
 	void __fastcall Contents1Click(TObject *Sender);
+	void __fastcall FormClose(TObject *Sender, TCloseAction &Action);
 
 private:	// User declarations

More information about the sword-cvs mailing list