[sword-svn] r451 - in trunk: . apps/InstallMgr apps/InstallMgr/curl/lib apps/cdstartup clucene installer installer/SwordInstaller installer/SwordInstaller/include stage
scribe at www.crosswire.org
scribe at www.crosswire.org
Sat Mar 10 14:28:08 MST 2007
Author: scribe
Date: 2007-03-10 14:28:07 -0700 (Sat, 10 Mar 2007)
New Revision: 451
Added:
trunk/installer/SwordInstaller/
trunk/installer/SwordInstaller/LICENSE
trunk/installer/SwordInstaller/Sword.bmp
trunk/installer/SwordInstaller/SwordSetup.nsi
trunk/installer/SwordInstaller/include/
trunk/installer/SwordInstaller/include/MSReg.nsh
trunk/installer/SwordInstaller/include/SwordFamily.nsh
trunk/installer/SwordInstaller/include/SwordFinish.nsh
trunk/installer/SwordInstaller/include/SwordLang.nsh
trunk/installer/SwordInstaller/include/SwordMUI.nsh
trunk/installer/SwordInstaller/include/SwordPages.nsh
trunk/installer/SwordInstaller/include/SwordPath.nsh
trunk/installer/SwordInstaller/include/SwordProduct.nsh
trunk/installer/SwordInstaller/include/SwordReserve.nsh
trunk/installer/SwordInstaller/include/SwordUtil.nsh
trunk/installer/SwordInstaller/include/WriteEnvStr.nsh
Modified:
trunk/apps/InstallMgr/InfoFrm.h
trunk/apps/InstallMgr/curl/lib/config-win32.h
trunk/apps/InstallMgr/libcurl.bdsproj
trunk/apps/cdstartup/mainfrm.cpp
trunk/apps/cdstartup/mainfrm.dfm
trunk/clucene/clucene.bdsproj
trunk/stage/layout.conf
trunk/sword.bpr
trunk/sword.res
Log:
Updates for latest installer and CD
Updates for BDS2006
Modified: trunk/apps/InstallMgr/InfoFrm.h
===================================================================
--- trunk/apps/InstallMgr/InfoFrm.h 2006-10-05 07:52:07 UTC (rev 450)
+++ trunk/apps/InstallMgr/InfoFrm.h 2007-03-10 21:28:07 UTC (rev 451)
@@ -9,7 +9,7 @@
#include <Buttons.hpp>
#include <ComCtrls.hpp>
#include <ExtCtrls.hpp>
-#include <string>
+#include <swbuf.h>
//---------------------------------------------------------------------------
class TInfoForm : public TForm
@@ -23,7 +23,7 @@
void __fastcall SpeedButton1Click(TObject *Sender);
private: // User declarations
public: // User declarations
- std::string info;
+ sword::SWBuf info;
__fastcall TInfoForm(TComponent* Owner);
};
//---------------------------------------------------------------------------
Modified: trunk/apps/InstallMgr/curl/lib/config-win32.h
===================================================================
--- trunk/apps/InstallMgr/curl/lib/config-win32.h 2006-10-05 07:52:07 UTC (rev 450)
+++ trunk/apps/InstallMgr/curl/lib/config-win32.h 2007-03-10 21:28:07 UTC (rev 451)
@@ -294,7 +294,7 @@
/* Define to 'int' if ssize_t is not an available 'typedefed' type */
#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__)
#else
-#define ssize_t int
+//#define ssize_t int
#endif
/* Define to 'int' if socklen_t is not an available 'typedefed' type */
Modified: trunk/apps/InstallMgr/libcurl.bdsproj
===================================================================
--- trunk/apps/InstallMgr/libcurl.bdsproj 2006-10-05 07:52:07 UTC (rev 450)
+++ trunk/apps/InstallMgr/libcurl.bdsproj 2007-03-10 21:28:07 UTC (rev 451)
@@ -1,15 +1,15 @@
<?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">{783138B5-CDFF-4797-98C4-6F174393BD12}</Option>
- </Option>
- </PersonalityInfo>
- <CPlusPlusBuilder.Personality>
- <BCBPROJECT>
+ <PersonalityInfo>
+ <Option>
+ <Option Name="Personality">CPlusPlusBuilder.Personality</Option>
+ <Option Name="ProjectType">CppStaticLibrary</Option>
+ <Option Name="Version">1.0</Option>
+ <Option Name="GUID">{5A91165A-D7D7-4ADE-9525-E8682F7F86E8}</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"/>
@@ -77,10 +77,6 @@
<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="__STDC__"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.2" 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"/>
@@ -175,7 +171,7 @@
<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="32"/>
+ <property category="win32.*.win32b.tlib" name="option.P.arg" value="64"/>
<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="."/>
@@ -185,51 +181,50 @@
</project>
<FILELIST>
<FILE FILENAME="libcurl.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="libcurl" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\connect.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="connect" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\cookie.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="cookie" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\dict.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="dict" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="curl\lib\easy.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="easy" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\escape.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="escape" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\file.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="file" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\formdata.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="formdata" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\ftp.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ftp" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\base64.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="base64" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\version.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="version" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\getinfo.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="getinfo" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\getpass.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="getpass" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\hash.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="hash" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\hostip.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="hostip" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\http.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="http" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\http_chunks.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="http_chunks" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\if2ip.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="if2ip" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\krb4.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="krb4" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\ldap.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ldap" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\llist.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="llist" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\memdebug.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="memdebug" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\mprintf.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mprintf" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\netrc.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="netrc" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\progress.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="progress" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\security.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="security" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\sendf.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="sendf" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\speedcheck.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="speedcheck" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="curl\lib\ssluse.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ssluse" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\sslgen.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="sslgen" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="curl\lib\strequal.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="strequal" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\strtok.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="strtok" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\timeval.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="timeval" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\transfer.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="transfer" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\url.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="url" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\getenv.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="getenv" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\telnet.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="telnet" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\strerror.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="strerror" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\select.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="select" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\hostip.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="hostip" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\hash.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="hash" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\llist.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="llist" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="curl\lib\inet_ntop.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="inet_ntop" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\mprintf.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mprintf" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="curl\lib\hostip4.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="hostip4" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="curl\lib\hostthre.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="hostthre" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="curl\lib\hostasyn.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="hostasyn" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="curl\lib\share.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="share" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\cookie.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="cookie" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\parsedate.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="parsedate" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\strtok.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="strtok" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\sendf.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="sendf" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\strerror.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="strerror" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\connect.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="connect" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\select.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="select" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\if2ip.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="if2ip" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\url.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="url" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\multi.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="multi" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\transfer.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="transfer" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\http.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="http" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\base64.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="base64" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="curl\lib\http_digest.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="http_digest" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\timeval.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="timeval" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="curl\lib\md5.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="md5" FORMNAME="" DESIGNCLASS=""/>
- <FILE FILENAME="curl\lib\getdate.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="getdate" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\formdata.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="formdata" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\progress.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="progress" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\http_chunks.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="http_chunks" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\speedcheck.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="speedcheck" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\splay.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="splay" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\getinfo.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="getinfo" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\getenv.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="getenv" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\ftp.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ftp" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\telnet.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="telnet" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\dict.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="dict" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\ldap.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ldap" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\file.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="file" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\tftp.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="tftp" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\escape.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="escape" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="curl\lib\netrc.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="netrc" FORMNAME="" DESIGNCLASS=""/>
</FILELIST>
<IDEOPTIONS>
<VersionInfo>
@@ -280,6 +275,12 @@
<HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals>
<HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals>
</HistoryLists_hlConditionals>
+ <HistoryLists_hlTlibPageSize>
+ <HistoryLists_hlTlibPageSize Name="Count">3</HistoryLists_hlTlibPageSize>
+ <HistoryLists_hlTlibPageSize Name="Item0">0x0020</HistoryLists_hlTlibPageSize>
+ <HistoryLists_hlTlibPageSize Name="Item1">32</HistoryLists_hlTlibPageSize>
+ <HistoryLists_hlTlibPageSize Name="Item2">0x0010</HistoryLists_hlTlibPageSize>
+ </HistoryLists_hlTlibPageSize>
<Debugging>
<Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>
</Debugging>
@@ -300,11 +301,6 @@
<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>
@@ -312,9 +308,9 @@
</Linker>
</IDEOPTIONS>
</BCBPROJECT>
- <Source>
- <Source Name="MainSource">libcurl.bpf</Source>
- </Source>
- <buildevents/>
- </CPlusPlusBuilder.Personality>
+ <Source>
+ <Source Name="MainSource">libcurl.bpf</Source>
+ </Source>
+ <buildevents/>
+ </CPlusPlusBuilder.Personality>
</BorlandProject>
Modified: trunk/apps/cdstartup/mainfrm.cpp
===================================================================
--- trunk/apps/cdstartup/mainfrm.cpp 2006-10-05 07:52:07 UTC (rev 450)
+++ trunk/apps/cdstartup/mainfrm.cpp 2007-03-10 21:28:07 UTC (rev 451)
@@ -22,7 +22,7 @@
//---------------------------------------------------------------------------
void __fastcall TForm1::BitBtn1Click(TObject *Sender)
{
- WinExec(".\\Disk Images\\disk1\\setup.exe", SW_SHOWNORMAL);
+ WinExec(".\\setup.exe", SW_SHOWNORMAL);
}
//---------------------------------------------------------------------------
void __fastcall TForm1::BitBtn2Click(TObject *Sender)
@@ -70,3 +70,4 @@
}
//---------------------------------------------------------------------------
+
Modified: trunk/apps/cdstartup/mainfrm.dfm
===================================================================
(Binary files differ)
Modified: trunk/clucene/clucene.bdsproj
===================================================================
--- trunk/clucene/clucene.bdsproj 2006-10-05 07:52:07 UTC (rev 450)
+++ trunk/clucene/clucene.bdsproj 2007-03-10 21:28:07 UTC (rev 451)
@@ -5,7 +5,7 @@
<Option Name="Personality">CPlusPlusBuilder.Personality</Option>
<Option Name="ProjectType">CppStaticLibrary</Option>
<Option Name="Version">1.0</Option>
- <Option Name="GUID">{488C6734-F24F-4560-9EE7-6098E093677B}</Option>
+ <Option Name="GUID">{271F7D4D-ABAC-4CE6-9289-2CF82BCACC5B}</Option>
</Option>
</PersonalityInfo>
<CPlusPlusBuilder.Personality>
@@ -73,9 +73,10 @@
<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="_WIN32"/>
- <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="_CL_DISABLE_MULTITHREADING"/>
+ <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="MAX_PATH=256"/>
+ <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="UNICODE"/>
+ <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="_WIN32"/>
+ <property category="win32.*.win32b.bcc32" name="option.D.arg.4" 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.I.arg.1" value="src\CLucene"/>
@@ -102,9 +103,10 @@
<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="_WIN32"/>
- <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="_CL_DISABLE_MULTITHREADING"/>
+ <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="MAX_PATH=256"/>
+ <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="UNICODE"/>
+ <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="_WIN32"/>
+ <property category="win32.*.win32b.brcc32" name="option.D.arg.4" 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\CLucene"/>
@@ -166,9 +168,10 @@
<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="_WIN32"/>
- <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="_CL_DISABLE_MULTITHREADING"/>
+ <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="MAX_PATH=256"/>
+ <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="UNICODE"/>
+ <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="_WIN32"/>
+ <property category="win32.*.win32b.tasm32" name="option.d.arg.4" 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\CLucene"/>
@@ -254,20 +257,22 @@
<HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>
</HistoryLists_hlDebugSourcePath>
<HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Count">13</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item0">UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item1">_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item2">_WIN32;HAVE_DIRENT;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item3">LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item4">LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item5">_DEBUG;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item6">_DEBUG;LUCENE_DISABLE_MULTITHREADING;_WIN32</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item7">_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT;_WIN32</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item8">_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H;_WIN32</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item9">_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H;_WIN32;UTF8</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item10">_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item11">_DEBUG;LUCENE_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
- <HistoryLists_hlConditionals Name="Item12">_DEBUG</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Count">15</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item0">MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item1">MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item2">UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item3">_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item4">_WIN32;HAVE_DIRENT;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item5">LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item6">LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item7">_DEBUG;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item8">_DEBUG;LUCENE_DISABLE_MULTITHREADING;_WIN32</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item9">_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT;_WIN32</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item10">_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H;_WIN32</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item11">_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H;_WIN32;UTF8</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item12">_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item13">_DEBUG;LUCENE_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>
+ <HistoryLists_hlConditionals Name="Item14">_DEBUG</HistoryLists_hlConditionals>
</HistoryLists_hlConditionals>
<HistoryLists_hlTlibPageSize>
<HistoryLists_hlTlibPageSize Name="Count">8</HistoryLists_hlTlibPageSize>
@@ -300,11 +305,6 @@
<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>
Added: trunk/installer/SwordInstaller/LICENSE
===================================================================
--- trunk/installer/SwordInstaller/LICENSE (rev 0)
+++ trunk/installer/SwordInstaller/LICENSE 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,350 @@
+The SWORD Project is (c) 1994-2005 The CrossWire Bible Society, under the
+terms of the GNU GPL, as stated below.
+
+NOTE: The text of the GNU GPL license is copyrighted by the Free Software
+Foundation, Inc., but The SWORD Project is copyrighted Corporately under:
+
+ CrossWire Bible Society
+ P. O. Box 2528
+ Tempe, AZ 85280-2528
+
+_________________________________________________________________
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ Appendix: How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ 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 of the License, 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Added: trunk/installer/SwordInstaller/Sword.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/installer/SwordInstaller/Sword.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/installer/SwordInstaller/SwordSetup.nsi
===================================================================
--- trunk/installer/SwordInstaller/SwordSetup.nsi (rev 0)
+++ trunk/installer/SwordInstaller/SwordSetup.nsi 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,336 @@
+# Authors: Troy Griffits, Lynn Alan, DM Smith
+# License: GPL 2.0
+# NSIS Engine: 2.20
+# Date last modified: Sept 2006
+
+;--------------------------------
+; LZMA is a tight compressor.
+; comment out for testing
+SetCompressor lzma
+
+# Variables
+Var StartMenuGroup
+Var ModuleDir
+
+# The location of our nsh files
+!addincludedir include
+
+# Included files
+!include LogicLib.nsh
+!include FileFunc.nsh
+!insertmacro GetParent
+
+!include Sections.nsh
+!define ALL_USERS ; parameter for WriteEnvStr.nsh
+!include WriteEnvStr.nsh
+
+!include SwordProduct.nsh
+!include SwordFinish.nsh
+!include SwordUtil.nsh
+!include SwordPath.nsh
+!include SwordMUI.nsh
+
+; Change the working directory to the deployment directory
+; !cd ${PRODUCT_DEPLOYDIR}
+
+;--------------------------------
+; Installer attributes
+Name "${PRODUCT_TITLE}"
+
+; Allow for the resulting installer to be renamed with /DSTYLE=CD
+!ifdef STYLE
+ OutFile "${PRODUCT_NAME}Setup${STYLE}.exe"
+!else
+ OutFile "${PRODUCT_NAME}Setup.exe"
+!endif
+
+; Uncomment the following if installation and unstallation should be scroll by.
+; Without these, there is a "details" button.
+;ShowInstDetails show
+;ShowUninstDetails show
+
+; Establish the default install location
+InstallDir "$PROGRAMFILES\${FAMILY_NAME}\${PRODUCT_TITLE}"
+; See if there was a prior install and use that location as the default
+InstallDirRegKey HKLM "${PRODUCT_INST_KEY}" Path
+
+; Uncomment the following to put a full screen background up.
+;BGGradient 000080 000000 FFFFFF
+
+; Define various Windows friendly values
+; for the Version Tab of the File Properties
+VIProductVersion "${PRODUCT_FULL_VERSION}"
+VIAddVersionKey ProductName "${PRODUCT_TITLE}"
+VIAddVersionKey ProductVersion "${PRODUCT_VERSION}"
+VIAddVersionKey CompanyName "${PRODUCT_PUBLISHER}"
+VIAddVersionKey CompanyWebsite "${PRODUCT_WEBSITE}"
+VIAddVersionKey FileVersion ""
+VIAddVersionKey FileDescription ""
+VIAddVersionKey LegalCopyright "${PRODUCT_COPYRIGHT}"
+
+# Installer functions
+Function .onInit
+
+ ;--------------------------------
+ ; Shortcuts are for all users
+ SetShellVarContext all
+
+ ;System::Call "kernel32::GetCurrentDirectory(i ${NSIS_MAX_STRLEN}, t .r0)"
+ ;${If} "$0" != ""
+ ; StrCpy $CWD "$0"
+ ;${EndIf}
+
+ ; It is too difficult to allow non-administrators to install, so...
+ ; Determine whether the user has privileges to install
+ ; putting up a Sorry message if not.
+ ClearErrors
+ WriteRegStr HKLM "SOFTWARE\CrossWire\The SWORD Project" "Test" "Test"
+ IfErrors LimitedUserDetected AdminLevelDetected
+ LimitedUserDetected:
+ MessageBox MB_OK "Please install with administrator privileges."
+ abort
+ AdminLevelDetected:
+ DeleteRegValue HKLM "SOFTWARE\CrossWire\The SWORD Project" "Test"
+
+ ; Put up a splash screen
+ ; If we internationalize the splash,
+ ; then put it after the language selection
+ !insertmacro Splash ${PRODUCT_SPLASH}
+
+ ; Let the user choose a language for the installer
+ ; (Un)comment the following if more than one language is listed
+ ; in SwordLang.nsh
+ !insertmacro MUI_LANGDLL_DISPLAY
+
+FunctionEnd
+
+Function .onInstSuccess
+ Call SwordFinish
+FunctionEnd
+
+# Uninstaller functions
+Function un.onInit
+
+ ;--------------------------------
+ ; Shortcuts are for all users
+ SetShellVarContext all
+
+ !insertmacro Splash ${PRODUCT_SPLASH}
+
+ ; Let the user choose a language for he uninstaller
+ ; Uncomment the following if more than one language is listed
+ ; in SwordLang.nsh
+ !insertmacro MUI_UNGETLANGUAGE
+
+ ; Get the user's chosen location for the install
+ ReadRegStr $INSTDIR HKLM "${PRODUCT_INST_KEY}" Path
+
+ ; Get the user's chosen location for the Start Menu Group
+ !insertmacro MUI_STARTMENU_GETFOLDER Application $startMenuGroup
+
+FunctionEnd
+
+# Installer sections
+; Copy files into the installer
+Section -InstallFiles secInstallFiles
+ ;--------------------------------
+ ; Cleanup Sword 1.5.6
+ ; This can be removed in a later release.
+ ${If} ${FileExists} "$INSTDIR\UninstCust.dll"
+ Delete /REBOOTOK "$INSTDIR\UninstCust.dll"
+ ${EndIf}
+ ${If} ${FileExists} "$INSTDIR\InstallMgr.exe"
+ Delete /REBOOTOK "$INSTDIR\InstallMgr.exe"
+ ${EndIf}
+ ${If} ${FileExists} "$INSTDIR\swicu20.dll"
+ Delete /REBOOTOK "$INSTDIR\swicu20.dll"
+ ${EndIf}
+ ${If} ${FileExists} "$INSTDIR\Uninst.isu"
+ Delete /REBOOTOK "$INSTDIR\Uninst.isu"
+ ${EndIf}
+ ${If} ${FileExists} "$SMPROGRAMS\$StartMenuGroup\SWORD Help.lnk"
+ Delete "$SMPROGRAMS\$StartMenuGroup\SWORD Help.lnk"
+ ${EndIf}
+
+ SetOverwrite ifnewer
+
+ SetOutPath $INSTDIR
+
+ ;--------------------------------
+ ; Copy all the files in the deployment dir
+ ; It is ok for the directory to be empty or missing
+ File /nonfatal /r "${PRODUCT_DEPLOYDIR}\*"
+
+ ; Copy files from a Windows dir in the same dir as the installer
+ ; This is used when installing from CD
+ ${If} ${FileExists} "$EXEDIR\Windows\sword.exe"
+ CopyFiles "$EXEDIR\Windows\*" $INSTDIR
+ ${EndIf}
+
+ ; Establish ModuleDir as the directory containing mods.d
+ ; Look for mods.d under $INSTDIR
+ ; If it is there set ModulePath to it
+ ; Otherwise use ..\Library
+ ;
+ ; This allows for an upgrade that does not
+ ;${If} ${FileExists} "$INSTDIR\mods.d"
+ StrCpy $ModuleDir "$INSTDIR"
+ ;${Else}
+ ; ${GetParent} $INSTDIR $R0
+ ; StrCpy $ModuleDir "$R0\Library"
+ ;${EndIf}
+
+ ;--------------------------------
+ ; Copy library files to the ModuleDir
+ ; It is ok for the directory to be empty or missing
+ SetOutPath "$ModuleDir"
+ File /nonfatal /r "${LIBRARY_DEPLOYDIR}\*"
+ SetOutPath "$INSTDIR"
+
+ ;--------------------------------
+ ; Call InstallManager to initialize its notion of a CD install location.
+ ; This should be a silent run.
+ ExecWait '"$INSTDIR\InstallManager.exe" -init "$EXEDIR"'
+
+ ;--------------------------------
+ ; Create a link to the product's web home
+ WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEBSITE}"
+
+ ;--------------------------------
+ ; Create the uninstaller
+ WriteUninstaller $INSTDIR\SwordUninstall.exe
+
+
+ ;--------------------------------
+ ; For now, let's leave this check commented out as we probably want
+ ; to always advertise remote install features by running InstallManager.exe
+ ;
+ ; See if we have any modules to install
+ ;${If} ${FileExists} "$EXEDIR\modules"
+
+ ;--------------------------------
+ ; Show the InstallManager Readme
+ ExecWait 'notepad "$INSTDIR\${PRODUCT_README}"'
+ ExecWait "$INSTDIR\${PRODUCT_INSTALLMGR}"
+
+ ;${EndIf}
+
+SectionEnd
+
+; Write (un)installer registry entries
+Section -RegistryEntries secRegistryEntries
+
+ ;--------------------------------
+ ; Write the registry strings
+ ; This string allows future installers to know where the program is installed
+ WriteRegStr HKLM "${PRODUCT_INST_KEY}" Path $INSTDIR
+
+ ; The following are the uninstaller definition for the Control Panel Add/Remove Programs
+ WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" DisplayName "${PRODUCT_TITLE}"
+ WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" DisplayVersion "${PRODUCT_VERSION}"
+ WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" Publisher "${PRODUCT_PUBLISHER}"
+ WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" URLInfoAbout "${PRODUCT_WEBSITE}"
+ WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" UninstallString "$INSTDIR\${PRODUCT_NAME}Uninstall.exe"
+ WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" DisplayIcon "$INSTDIR\${PRODUCT_NAME}Uninstall.exe"
+ WriteRegDWord HKLM "${PRODUCT_UNINST_KEY}" NoModify 1
+ WriteRegDWord HKLM "${PRODUCT_UNINST_KEY}" NoRepair 1
+
+SectionEnd
+
+; Write shortcuts
+Section -Shortcuts secShortcuts
+
+ ;--------------------------------
+ ; Install the Start Menu Group
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+
+ ;--------------------------------
+ ; Write the menu group shortcuts
+ CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
+ CreateShortCut "$SMPROGRAMS\$StartMenuGroup\${PRODUCT_TITLE}.lnk" $INSTDIR\${PRODUCT_NAME}.exe
+ CreateShortCut "$SMPROGRAMS\$StartMenuGroup\Install Manager.lnk" $INSTDIR\InstallManager.exe
+ CreateShortCut "$SMPROGRAMS\$StartMenuGroup\Uninstall ${PRODUCT_TITLE}.lnk" $INSTDIR\${PRODUCT_NAME}Uninstall.exe
+ CreateShortCut "$SMPROGRAMS\$StartMenuGroup\${PRODUCT_TITLE} on the Web.lnk" $INSTDIR\${PRODUCT_NAME}.url
+ CreateShortCut "$SMPROGRAMS\$StartMenuGroup\${PRODUCT_TITLE} Help.lnk" $INSTDIR\help\${PRODUCT_NAME}.chm
+
+ ;--------------------------------
+ ; Create a desktop shortcut
+ CreateShortCut "$DESKTOP\${PRODUCT_TITLE}.lnk" $INSTDIR\${PRODUCT_NAME}.exe
+
+ !insertmacro MUI_STARTMENU_WRITE_END
+
+SectionEnd
+
+; Add the SWORD_PATH environment variable
+Section -SwordPath swordPath
+ Call setSwordPath
+SectionEnd
+
+# Uninstaller sections in the reverse order of the installer sections
+; Add the SWORD_PATH environment variable
+Section -un.SwordPath unSwordPath
+ Call un.setSwordPath
+SectionEnd
+
+Section -un.Shortcuts unSecShortcuts
+ ;--------------------------------
+ ; Use the InstallManager to uninstall modules
+ ; This will ask the user whether they want to remove them.
+ ExecWait "$INSTDIR\InstallManager.exe -uninstall"
+
+ ;--------------------------------
+ ; Uninstall the shortcuts in the Start Menu and on the Desktop
+ ; deleting what this installer added there
+ Delete "$DESKTOP\${PRODUCT_TITLE}.lnk"
+ Delete "$SMPROGRAMS\$StartMenuGroup\${PRODUCT_TITLE}.lnk"
+ Delete "$SMPROGRAMS\$StartMenuGroup\Install Manager.lnk"
+ Delete "$SMPROGRAMS\$StartMenuGroup\Uninstall ${PRODUCT_TITLE}.lnk"
+ Delete "$SMPROGRAMS\$StartMenuGroup\${PRODUCT_TITLE} on the Web.lnk"
+ Delete "$SMPROGRAMS\$StartMenuGroup\${PRODUCT_TITLE} Help.lnk"
+
+ ; if this folder is empty then delete it
+ ; and any other empty parent folders
+ ${RMDirUP} "$SMPROGRAMS\$StartMenuGroup"
+SectionEnd
+
+Section -un.RegistryEntires unRegistryEntries
+ ;--------------------------------
+ ; Uninstall the Registry Keys
+ ;
+ DeleteRegValue HKLM "${PRODUCT_INST_KEY}" Path
+ DeleteRegKey /ifempty HKLM "${PRODUCT_INST_KEY}"
+ DeleteRegKey /ifempty HKLM "${PRODUCT_UNINST_KEY}"
+ DeleteRegValue HKLM "${PRODUCT_REGKEY}" StartMenuGroup
+ DeleteRegKey /ifempty HKLM "${PRODUCT_REGKEY}"
+ DeleteRegKey /ifempty HKLM "${FAMILY_REGKEY}"
+SectionEnd
+
+Section -un.InstallFiles unSecInstallFiles
+ ; If the InstallMgr did not delete the modules
+ ; then don't delete in mods.d
+ ; InstallMgr may not delete all files in mods.d
+ ${Unless} ${FileExists} "$INSTDIR\modules"
+ RMDir /r /REBOOTOK $INSTDIR\mods.d
+ ${EndUnless}
+
+ RMDir /r /REBOOTOK $INSTDIR\uilocales.d
+ RMDir /r /REBOOTOK $INSTDIR\locales.d
+ RMDir /r /REBOOTOK $INSTDIR\colors
+ RMDir /r /REBOOTOK $INSTDIR\help
+ RMDir /r /REBOOTOK $INSTDIR\bookmarks
+ RMDir /r /REBOOTOK $INSTDIR\installMgr
+ Delete /REBOOTOK $INSTDIR\options.conf
+ Delete /REBOOTOK $INSTDIR\layout.conf
+ Delete /REBOOTOK $INSTDIR\${PRODUCT_FIRSTRUN}
+ Delete /REBOOTOK $INSTDIR\${PRODUCT_README}
+ Delete /REBOOTOK $INSTDIR\${PRODUCT_ICUDLL}
+ Delete /REBOOTOK $INSTDIR\${PRODUCT_LICENSE}
+ Delete /REBOOTOK $INSTDIR\${PRODUCT_EXECUTABLE}
+ Delete /REBOOTOK $INSTDIR\${PRODUCT_SPLASH}
+ Delete /REBOOTOK $INSTDIR\${PRODUCT_URL}
+ Delete /REBOOTOK $INSTDIR\${PRODUCT_UNINSTALL}
+
+ ; if this folder is empty then delete it
+ ; and any other empty parent folders
+ ${RMDirUP} $INSTDIR
+SectionEnd
Added: trunk/installer/SwordInstaller/include/MSReg.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/MSReg.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/MSReg.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,9 @@
+!ifndef _MSReg_nsh
+!define _MSReg_nsh
+
+; Standard Microsoft (MS) registry paths
+!define MS_CURRENT_VERSION "Software\Microsoft\Windows\CurrentVersion"
+!define MS_CURRENT_APP "${MS_CURRENT_VERSION}\App Paths"
+!define MS_CURRENT_UNINSTALL "${MS_CURRENT_VERSION}\Uninstall"
+
+!endif ; _MSReg_nsh
\ No newline at end of file
Added: trunk/installer/SwordInstaller/include/SwordFamily.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/SwordFamily.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/SwordFamily.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,11 @@
+;--------------------------------
+; Applications that use the Sword API are of the CrossWire Family
+; This file defines the CrossWire Family of products.
+; It does not need to be changed.
+!ifndef _SwordFamily_nsh
+!define _SwordFamily_nsh
+
+!define FAMILY_NAME "CrossWire"
+!define FAMILY_REGKEY "Software\${FAMILY_NAME}"
+
+!endif ; _SwordFamily_nsh
\ No newline at end of file
Added: trunk/installer/SwordInstaller/include/SwordFinish.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/SwordFinish.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/SwordFinish.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,55 @@
+;--------------------------------
+; This file defines the behavior when the installer finishes.
+; Specifically it shows the readme, waits, then runs the application.
+; Showing the readme and running the application are optional.
+; It does not need to be changed.
+!ifndef _SwordFinish_nsh
+!define _SwordFinish_nsh
+
+ !include SwordProduct.nsh
+ !include MUI.nsh
+
+; Var README_STATE
+ Var RUN_STATE
+
+ ; Merely set a flag indicating whether the readme should be shown
+; Function ShowReadme
+; StrCpy $README_STATE 1
+; FunctionEnd
+
+ ; Merely set a flag indicating whether the program should be run
+ Function RunProgram
+ StrCpy $RUN_STATE 1
+ FunctionEnd
+
+ ;--------------------------------
+ ; What to do when all done.
+ ; We are flipping the labels so README is before RUN
+ ; The $(...) digs into the international strings
+ !define MUI_FINISHPAGE_RUN
+; !define MUI_FINISHPAGE_RUN_TEXT $(MUI_TEXT_FINISH_SHOWREADME)
+ !define MUI_FINISHPAGE_RUN_FUNCTION RunProgram
+ ; !define MUI_FINISHPAGE_SHOWREADME
+ ; !define MUI_FINISHPAGE_SHOWREADME_TEXT $(MUI_TEXT_FINISH_RUN)
+ ; !define MUI_FINISHPAGE_SHOWREADME_FUNCTION RunProgram
+
+ ; Function shows the Readme and when that is closed it runs the program
+ Function SwordFinish
+
+ ; If the user has chosen to see the readme:
+ ; Show the readme and wait until it is done
+ ;StrCmp $README_STATE "1" 0 label.noshowreadme
+ ; ExecWait 'notepad "$INSTDIR\${PRODUCT_README}"'
+ ;label.noshowreadme:
+
+ ; If the user has chosen to run the program:
+ ; Show the InstallMgr and wait until it is done.
+ ; Then run the program.
+ StrCmp $RUN_STATE "1" 0 label.norun
+ ; ExecWait "$INSTDIR\${PRODUCT_INSTALLMGR}"
+ Exec "$INSTDIR\${PRODUCT_EXECUTABLE}"
+ label.norun:
+
+ FunctionEnd
+
+!endif ; _SwordFinish_nsh
Added: trunk/installer/SwordInstaller/include/SwordLang.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/SwordLang.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/SwordLang.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,73 @@
+;--------------------------------
+; This file defines which languages the installer will use.
+; It needs to be changed for all supported languages.
+; Comment out the languages to be hidden.
+; Add other languages when they become available
+;
+; Modern User Interface
+; MUI 1.74 compatible ------
+; For documentation on MUI see:
+; http://nsis.sourceforge.net/Docs/Modern%20UI/Readme.html
+!ifndef _SwordLang_nsh
+!define _SwordLang_nsh
+
+ ;--------------------------------
+ ; Installer languages
+ !insertmacro MUI_LANGUAGE "English" # first language is the default language
+
+ ; (Un)comment the languages below for an internationalized installation.
+ ; This will require translation of all non-MUI strings into those languages
+ !insertmacro MUI_LANGUAGE "Albanian"
+ !insertmacro MUI_LANGUAGE "Arabic"
+ !insertmacro MUI_LANGUAGE "Basque"
+ !insertmacro MUI_LANGUAGE "Belarusian"
+ !insertmacro MUI_LANGUAGE "Bosnian"
+ !insertmacro MUI_LANGUAGE "Breton"
+ !insertmacro MUI_LANGUAGE "Bulgarian"
+ !insertmacro MUI_LANGUAGE "Catalan"
+ !insertmacro MUI_LANGUAGE "Croatian"
+ !insertmacro MUI_LANGUAGE "Czech"
+ !insertmacro MUI_LANGUAGE "Danish"
+ !insertmacro MUI_LANGUAGE "Dutch"
+ !insertmacro MUI_LANGUAGE "Estonian"
+ !insertmacro MUI_LANGUAGE "Farsi"
+ !insertmacro MUI_LANGUAGE "Finnish"
+ !insertmacro MUI_LANGUAGE "French"
+ !insertmacro MUI_LANGUAGE "German"
+ !insertmacro MUI_LANGUAGE "Greek"
+ !insertmacro MUI_LANGUAGE "Hebrew"
+ !insertmacro MUI_LANGUAGE "Hungarian"
+ !insertmacro MUI_LANGUAGE "Icelandic"
+ !insertmacro MUI_LANGUAGE "Indonesian"
+ !insertmacro MUI_LANGUAGE "Irish"
+ !insertmacro MUI_LANGUAGE "Italian"
+ !insertmacro MUI_LANGUAGE "Japanese"
+ !insertmacro MUI_LANGUAGE "Korean"
+ !insertmacro MUI_LANGUAGE "Kurdish"
+ !insertmacro MUI_LANGUAGE "Latvian"
+ !insertmacro MUI_LANGUAGE "Lithuanian"
+ !insertmacro MUI_LANGUAGE "Luxembourgish"
+ !insertmacro MUI_LANGUAGE "Macedonian"
+ !insertmacro MUI_LANGUAGE "Malay"
+ !insertmacro MUI_LANGUAGE "Mongolian"
+ !insertmacro MUI_LANGUAGE "Norwegian"
+ !insertmacro MUI_LANGUAGE "NorwegianNynorsk"
+ !insertmacro MUI_LANGUAGE "Polish"
+ !insertmacro MUI_LANGUAGE "Portuguese"
+ !insertmacro MUI_LANGUAGE "PortugueseBR"
+ !insertmacro MUI_LANGUAGE "Romanian"
+ !insertmacro MUI_LANGUAGE "Russian"
+ !insertmacro MUI_LANGUAGE "Serbian"
+ !insertmacro MUI_LANGUAGE "SerbianLatin"
+ !insertmacro MUI_LANGUAGE "SimpChinese"
+ !insertmacro MUI_LANGUAGE "Slovak"
+ !insertmacro MUI_LANGUAGE "Slovenian"
+ !insertmacro MUI_LANGUAGE "Spanish"
+ !insertmacro MUI_LANGUAGE "Swedish"
+ !insertmacro MUI_LANGUAGE "Thai"
+ !insertmacro MUI_LANGUAGE "TradChinese"
+ !insertmacro MUI_LANGUAGE "Turkish"
+ !insertmacro MUI_LANGUAGE "Ukrainian"
+ !insertmacro MUI_LANGUAGE "Welsh"
+
+!endif ; _SwordLang_nsh
\ No newline at end of file
Added: trunk/installer/SwordInstaller/include/SwordMUI.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/SwordMUI.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/SwordMUI.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,41 @@
+;--------------------------------
+; Modern User Interface
+; MUI 1.74 compatible ------
+; For documentation on MUI see:
+; http://nsis.sourceforge.net/Docs/Modern%20UI/Readme.html
+!ifndef _SwordMUI_nsh
+!define _SwordMUI_nsh
+
+ !include "SwordProduct.nsh"
+ !include "MUI.nsh"
+
+ ;--------------------------------
+ ; Icons for the (un)installer
+ ; Note: the install and uninstall icons must have the same dimensions
+ ; Use icons provided with NSIS.
+ !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico"
+ !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico"
+
+ ; MUI Settings / Header
+ !define MUI_HEADERIMAGE
+ !define MUI_HEADERIMAGE_RIGHT
+ !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\orange-r.bmp"
+ !define MUI_HEADERIMAGE_UNBITMAP "${NSISDIR}\Contrib\Graphics\Header\orange-uninstall-r.bmp"
+
+ ; MUI Settings / Wizard
+ !define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp"
+ !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange-uninstall.bmp"
+
+ ;--------------------------------
+ ; Establish and remember the Start MenuGroup info
+ !define MUI_STARTMENUPAGE_DEFAULT_FOLDER "${PRODUCT_TITLE}"
+ ; Remember where it is
+ !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
+ !define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_REGKEY}"
+ !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
+
+ !include "SwordPages.nsh"
+ !include "SwordLang.nsh"
+ !include "SwordReserve.nsh"
+
+!endif ; _SwordMUI_nsh
\ No newline at end of file
Added: trunk/installer/SwordInstaller/include/SwordPages.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/SwordPages.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/SwordPages.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,37 @@
+;--------------------------------
+; Lays out the pages for the installer
+; It does not need to be changed.
+;
+; MUI 1.74 compatible ------
+; For documentation on MUI see:
+; http://nsis.sourceforge.net/Docs/Modern%20UI/Readme.html
+!ifndef _SwordPages_nsh
+!define _SwordPages_nsh
+
+ !include "SwordProduct.nsh"
+ !include "MUI.nsh"
+
+ ;--------------------------------
+ ; Do not automatically jump to the finish page,
+ ; to allow the user to check the (un)install log.
+ !define MUI_FINISHPAGE_NOAUTOCLOSE
+ !define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
+ ;--------------------------------
+ ; Show a message box with a warning
+ ; when the user wants to close the (un)installer.
+ !define MUI_ABORTWARNING
+ !define MUI_UNABORTWARNING
+
+ ;--------------------------------
+ ; (Un)Installer pages
+ !insertmacro MUI_PAGE_WELCOME
+ !insertmacro MUI_PAGE_LICENSE "${PRODUCT_LICENSE}"
+ !insertmacro MUI_PAGE_DIRECTORY
+ !insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
+ !insertmacro MUI_PAGE_INSTFILES
+ !insertmacro MUI_PAGE_FINISH
+ !insertmacro MUI_UNPAGE_CONFIRM
+ !insertmacro MUI_UNPAGE_INSTFILES
+
+!endif ; _SwordPages_nsh
\ No newline at end of file
Added: trunk/installer/SwordInstaller/include/SwordPath.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/SwordPath.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/SwordPath.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,48 @@
+;--------------------------------
+; This file defines two functions
+; for the (un)setting of SWORD_PATH environment variable.
+; It does not need to be changed.
+!ifndef _SwordPath_nsh
+!define _SwordPath_nsh
+
+!include LogicLib.nsh
+!include WriteEnvStr.nsh
+!include FileFunc.nsh
+!insertmacro GetParent
+
+; Add the SWORD_PATH environment variable
+; If it is not present or does not point to a
+; directory containing a mods.d directory
+Function setSwordPath
+
+ ; Look for mods.d under $INSTDIR
+ ; If it is there set SWORD_PATH to it
+ ; Otherwise go check Library
+ ${If} ${FileExists} "$INSTDIR\mods.d"
+ Push "SWORD_PATH"
+ Push $INSTDIR
+ Call WriteEnvStr
+ ${Else}
+ ; Check for Library/mods.d
+ ; and set SWORD_PATH to it
+ ${GetParent} $INSTDIR $R0
+
+ ${If} ${FileExists} "$R0\Library\mods.d"
+ Push "SWORD_PATH"
+ Push "$R0\Library"
+ Call WriteEnvStr
+ ${EndIf}
+ ${EndIf}
+FunctionEnd
+
+; Remove SWORD_PATH environment variable
+; if there are no other Keys under
+; SOFTWARE/CrossWire in either HKLM or HKCU
+Function un.setSwordPath
+ ;--------------------------------
+ ; Remove the environment variables
+ Push "SWORD_PATH"
+ Call un.DeleteEnvStr
+FunctionEnd
+
+!endif ; _SwordPath_nsh
\ No newline at end of file
Added: trunk/installer/SwordInstaller/include/SwordProduct.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/SwordProduct.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/SwordProduct.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,126 @@
+; Defines for a "product" in the CrossWire Family,
+; and defaults to "The SWORD Project" aka BibleCS
+;
+; Typical usage is to create a project specific header file that
+; overrides appropriate defines from this file
+; and then include it before this file.
+;
+; This file should only be included by the installer's nsi file.
+; It does not need to be changed.
+
+!ifndef _SwordProduct_nsh
+!define _SwordProduct_nsh
+
+ !include MSReg.nsh
+ !include SwordFamily.nsh
+
+ ; Basic defines of the product
+ !ifndef PRODUCT_NAME
+ !define PRODUCT_NAME "Sword"
+ !endif
+
+ !ifndef PRODUCT_TITLE
+ !define PRODUCT_TITLE "The SWORD Project"
+ !endif
+
+ !ifndef PRODUCT_MAJOR
+ !define PRODUCT_MAJOR 1
+ !endif
+
+ !ifndef PRODUCT_MINOR
+ !define PRODUCT_MINOR 5
+ !endif
+
+ !ifndef PRODUCT_SERVICE
+ !define PRODUCT_SERVICE 9
+ !endif
+
+ !ifndef PRODUCT_QUALIFIER
+ !define PRODUCT_QUALIFIER 0
+ !endif
+
+ !ifndef PRODUCT_PUBLISHER
+ !define PRODUCT_PUBLISHER "The Crosswire Bible Society"
+ !endif
+
+ !ifndef PRODUCT_WEBSITE
+ !define PRODUCT_WEBSITE "http://www.crosswire.org/sword/software/biblecs"
+ !endif
+
+ !ifndef PRODUCT_COPY_START
+ !define PRODUCT_COPY_START "1994"
+ !endif
+
+ !ifndef PRODUCT_COPY_END
+ !define PRODUCT_COPY_END "2007"
+ !endif
+
+
+ ; well known parts of the deployment
+ !ifndef PRODUCT_DEPLOYDIR
+ !define PRODUCT_DEPLOYDIR "Windows"
+ !endif
+
+ !ifndef LIBRARY_DEPLOYDIR
+ !define LIBRARY_DEPLOYDIR "Library"
+ !endif
+
+ !ifndef PRODUCT_README
+ !define PRODUCT_README "readme.txt"
+ !endif
+
+ !ifndef PRODUCT_INSTALLMGR
+ !define PRODUCT_INSTALLMGR "InstallManager.exe"
+ !endif
+
+ !ifndef PRODUCT_SPLASH
+ !define PRODUCT_SPLASH "sword.bmp"
+ !endif
+
+ !ifndef PRODUCT_LICENSE
+ !define PRODUCT_LICENSE "LICENSE"
+ !endif
+
+ !ifndef PRODUCT_ICUDLL
+ !define PRODUCT_ICUDLL "icudt36.dll"
+ !endif
+
+
+ !ifndef PRODUCT_EXECUTABLE
+ !define PRODUCT_EXECUTABLE "${PRODUCT_NAME}.exe"
+ !endif
+
+ !ifndef PRODUCT_URL
+ !define PRODUCT_URL "${PRODUCT_NAME}.url"
+ !endif
+
+ !ifndef PRODUCT_UNINSTALL
+ !define PRODUCT_UNINSTALL "${PRODUCT_NAME}Uninstall.exe"
+ !endif
+
+ !ifndef PRODUCT_VERSION
+ !define PRODUCT_VERSION "${PRODUCT_MAJOR}.${PRODUCT_MINOR}.${PRODUCT_SERVICE}"
+ !endif
+
+ !ifndef PRODUCT_FULL_VERSION
+ !define PRODUCT_FULL_VERSION "${PRODUCT_VERSION}.${PRODUCT_QUALIFIER}"
+ !endif
+
+ !ifndef PRODUCT_COPYRIGHT
+ !define PRODUCT_COPYRIGHT "©${PRODUCT_COPY_START}-${PRODUCT_COPY_END} ${PRODUCT_PUBLISHER}"
+ !endif
+
+ !ifndef PRODUCT_REGKEY
+ !define PRODUCT_REGKEY "${FAMILY_REGKEY}\${PRODUCT_TITLE}"
+ !endif
+
+ !ifndef PRODUCT_INST_KEY
+ !define PRODUCT_INST_KEY "${MS_CURRENT_APP}\${PRODUCT_EXECUTABLE}"
+ !endif
+
+ !ifndef PRODUCT_UNINST_KEY
+ !define PRODUCT_UNINST_KEY "${MS_CURRENT_UNINSTALL}\${PRODUCT_TITLE}"
+ !endif
+
+
+!endif ; _SwordProduct_nsh
Added: trunk/installer/SwordInstaller/include/SwordReserve.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/SwordReserve.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/SwordReserve.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,15 @@
+;--------------------------------
+; Reserve Files
+; These files should be inserted before other files in the data block
+; Keep these include before any File command
+; Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)
+!ifndef _SwordReserve_nsh
+!define _SwordReserve_nsh
+
+ !include "MUI.nsh"
+
+ ReserveFile "${NSISDIR}\Plugins\AdvSplash.dll"
+ !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+ !insertmacro MUI_RESERVEFILE_LANGDLL
+
+!endif ; _SwordReserve_nsh
\ No newline at end of file
Added: trunk/installer/SwordInstaller/include/SwordUtil.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/SwordUtil.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/SwordUtil.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,60 @@
+;--------------------------------
+; Various functions that are useful.
+; It does not need to be changed.
+!ifndef _SwordUtil_nsh
+!define _SwordUtil_nsh
+
+; copied from http://nsis.sourceforge.net/Recursively_remove_empty_parent_directories
+; modified by DM Smith to delete the specified directory first
+Function un.RMDirUP
+ !define RMDirUP '!insertmacro RMDirUPCall'
+
+ !macro RMDirUPCall _PATH
+ push '${_PATH}'
+ Call un.RMDirUP
+ !macroend
+
+ ; $0 - current folder
+ ClearErrors
+
+ Exch $0
+ RMDir "$0"
+
+ IfErrors Skip
+ ${RMDirUP} "$0\.."
+ Skip:
+
+ Pop $0
+FunctionEnd
+
+; Don't know where this macro came from
+# Macro for selecting uninstaller sections
+!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID
+ Push $R0
+ ReadRegStr $R0 HKLM "${PRODUCT_REGKEY}\Components" "${SECTION_NAME}"
+ StrCmp $R0 1 0 next${UNSECTION_ID}
+ !insertmacro SelectSection "${UNSECTION_ID}"
+ Goto done${UNSECTION_ID}
+next${UNSECTION_ID}:
+ !insertmacro UnselectSection "${UNSECTION_ID}"
+done${UNSECTION_ID}:
+ Pop $R0
+!macroend
+
+!macro Splash bmp
+ InitPluginsDir
+ Push $R1
+ File /oname=$PLUGINSDIR\spltmp.bmp ${bmp}
+ advsplash::show 1000 1000 1000 -1 $PLUGINSDIR\spltmp
+ Pop $R1
+ Pop $R1
+!macroend
+
+;!macro ReadRegStr var key value
+; StrCmp $ALLORCURRENT all 0 +3 # replace with real check
+; ReadRegStr "${var}" HKLM "${key}" "${value}"
+; Goto +2
+; ReadRegStr "${var}" HKCU "${key}" "${value}"
+;!macroend
+
+!endif ; _SwordUtil_nsh
Added: trunk/installer/SwordInstaller/include/WriteEnvStr.nsh
===================================================================
--- trunk/installer/SwordInstaller/include/WriteEnvStr.nsh (rev 0)
+++ trunk/installer/SwordInstaller/include/WriteEnvStr.nsh 2007-03-10 21:28:07 UTC (rev 451)
@@ -0,0 +1,152 @@
+; Copied from http://nsis.sourceforge.net/Setting_Environment_Variables
+; Author: KiCHiK, aka Amir Szekely
+
+!ifndef _WriteEnvStr_nsh
+!define _WriteEnvStr_nsh
+
+!include WinMessages.nsh
+
+!ifndef WriteEnvStr_RegKey
+ !ifdef ALL_USERS
+ !define WriteEnvStr_RegKey \
+ 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+ !else
+ !define WriteEnvStr_RegKey 'HKCU "Environment"'
+ !endif
+!endif
+
+#
+# WriteEnvStr - Writes an environment variable
+# Note: Win9x systems requires reboot
+#
+# Example:
+# Push "HOMEDIR" # name
+# Push "C:\New Home Dir\" # value
+# Call WriteEnvStr
+#
+Function WriteEnvStr
+ Exch $1 ; $1 has environment variable value
+ Exch
+ Exch $0 ; $0 has environment variable name
+ Push $2
+
+ Call IsNT
+ Pop $2
+ StrCmp $2 1 WriteEnvStr_NT
+ ; Not on NT
+ StrCpy $2 $WINDIR 2 ; Copy drive of windows (c:)
+ FileOpen $2 "$2\autoexec.bat" a
+ FileSeek $2 0 END
+ FileWrite $2 "$\r$\nSET $0=$1$\r$\n"
+ FileClose $2
+ SetRebootFlag true
+ Goto WriteEnvStr_done
+
+ WriteEnvStr_NT:
+ WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \
+ 0 "STR:Environment" /TIMEOUT=5000
+
+ WriteEnvStr_done:
+ Pop $2
+ Pop $0
+ Pop $1
+FunctionEnd
+
+#
+# un.DeleteEnvStr - Removes an environment variable
+# Note: Win9x systems requires reboot
+#
+# Example:
+# Push "HOMEDIR" # name
+# Call un.DeleteEnvStr
+#
+Function un.DeleteEnvStr
+ Exch $0 ; $0 now has the name of the variable
+ Push $1
+ Push $2
+ Push $3
+ Push $4
+ Push $5
+
+ Call un.IsNT
+ Pop $1
+ StrCmp $1 1 DeleteEnvStr_NT
+ ; Not on NT
+ StrCpy $1 $WINDIR 2
+ FileOpen $1 "$1\autoexec.bat" r
+ GetTempFileName $4
+ FileOpen $2 $4 w
+ StrCpy $0 "SET $0="
+ SetRebootFlag true
+
+ DeleteEnvStr_dosLoop:
+ FileRead $1 $3
+ StrLen $5 $0
+ StrCpy $5 $3 $5
+ StrCmp $5 $0 DeleteEnvStr_dosLoop
+ StrCmp $5 "" DeleteEnvStr_dosLoopEnd
+ FileWrite $2 $3
+ Goto DeleteEnvStr_dosLoop
+
+ DeleteEnvStr_dosLoopEnd:
+ FileClose $2
+ FileClose $1
+ StrCpy $1 $WINDIR 2
+ Delete "$1\autoexec.bat"
+ CopyFiles /SILENT $4 "$1\autoexec.bat"
+ Delete $4
+ Goto DeleteEnvStr_done
+
+ DeleteEnvStr_NT:
+ DeleteRegValue ${WriteEnvStr_RegKey} $0
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \
+ 0 "STR:Environment" /TIMEOUT=5000
+
+ DeleteEnvStr_done:
+ Pop $5
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+FunctionEnd
+
+!ifndef IsNT_KiCHiK
+!define IsNT_KiCHiK
+
+#
+# [un.]IsNT - Pushes 1 if running on NT, 0 if not
+#
+# Example:
+# Call IsNT
+# Pop $0
+# StrCmp $0 1 +3
+# MessageBox MB_OK "Not running on NT!"
+# Goto +2
+# MessageBox MB_OK "Running on NT!"
+#
+!macro IsNT UN
+Function ${UN}IsNT
+ Push $0
+ ReadRegStr $0 HKLM \
+ "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+ StrCmp $0 "" 0 IsNT_yes
+ ; we are not NT.
+ Pop $0
+ Push 0
+ Return
+
+ IsNT_yes:
+ ; NT!!!
+ Pop $0
+ Push 1
+FunctionEnd
+!macroend
+!insertmacro IsNT ""
+!insertmacro IsNT "un."
+
+!endif ; IsNT_KiCHiK
+
+!endif ; _WriteEnvStr_nsh
+
\ No newline at end of file
Modified: trunk/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf 2006-10-05 07:52:07 UTC (rev 450)
+++ trunk/stage/layout.conf 2007-03-10 21:28:07 UTC (rev 451)
@@ -45,14 +45,14 @@
LastParaMod01=NETfree
LastParaMod02=NASB
LastParaMod03=ESV
-LastTextModule=PARALLEL
-LastVerse=Ephesians 1:1
+LastTextModule=FarsiOPV
+LastVerse=James 1:1
LookupSaveCount=5
+LookupText=James 1:1
+LookupText=Psalms 5:1
+LookupText=Ephesians 1:1
LookupText=Psalms 34:1
LookupText=Romans 12:2
-LookupText=Genesis 3:6
-LookupText=I John 2:6
-LookupText=I John 2:10
SearchSaveCount=5
SearchText=the sword
SearchText=God love +world
@@ -203,10 +203,10 @@
Words of Christ in Red=On
[Screen]
-MainHeight=776
+MainHeight=863
MainLeft=30
MainTop=94
-MainWidth=1257
+MainWidth=1092
Maximized=false
SearchHeight=566
SearchLeft=599
@@ -214,8 +214,8 @@
SearchResCol0Width=175
SearchTop=51
SearchWidth=759
-TextComHeight=421
-TextWidth=733
+TextComHeight=585
+TextWidth=613
[TextView]
AB=
@@ -248,9 +248,10 @@
Diaglott=
DutSVV=
EMTV=
-ESV=
+ESV=true
Esperanto=
Est=
+FarsiOPV=
FinBiblia=
FinPR=
FinPR92=
@@ -292,9 +293,9 @@
Montgomery=
Murdock=
NASB=true
-NET=
-NETfree=
-NETtext=
+NET=true
+NETfree=true
+NETtext=true
Norsk=
OrthJBC=
PARALLEL=true
Modified: trunk/sword.bpr
===================================================================
--- trunk/sword.bpr 2006-10-05 07:52:07 UTC (rev 450)
+++ trunk/sword.bpr 2007-03-10 21:28:07 UTC (rev 451)
@@ -78,7 +78,7 @@
MajorVer=1
MinorVer=5
Release=9
-Build=4
+Build=6
Debug=0
PreRelease=0
Special=0
@@ -90,7 +90,7 @@
[Version Info Keys]
CompanyName=CrossWire Software & Bible Society
FileDescription=Windows User Interface to The SWORD Project
-FileVersion=1.5.9.4
+FileVersion=1.5.9.6
InternalName=biblecs
LegalCopyright=(c) 1990-2006 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
Modified: trunk/sword.res
===================================================================
(Binary files differ)
More information about the sword-cvs
mailing list