Changeset 467


Ignore:
Timestamp:
06/01/08 07:57:27 (11 years ago)
Author:
Eoin
Message:

Reverting to Boost 1.34.1 for the 0.3.1 release.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Halite.iss

    r410 r467  
    22 
    33#define MyAppName "Halite" 
    4 #define MyAppVerName "Halite 0.3.0.5" 
     4#define MyAppVerName "Halite 0.3.0.7" 
    55#define MyAppPublisher "BinaryNotions.com" 
    66#define MyAppURL "http://www.binarynotions.com/halite.php" 
     
    1919AllowNoIcons=yes 
    2020LicenseFile=LICENSE_1_0.txt 
    21 OutputBaseFilename=Halite.0_3_0_5_dev408.setup 
     21OutputBaseFilename=Halite.0_3_0_7_dev465.setup 
    2222Compression=lzma 
    2323SolidCompression=true 
     
    3838Source: Release\Halite.exe; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    3939 
    40 Source: lang\bin\x86\Dutch.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    41 Source: lang\bin\x86\French.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    42 Source: lang\bin\x86\German.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    43 Source: lang\bin\x86\Italian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    44 Source: lang\bin\x86\Norwegian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    45 Source: lang\bin\x86\Polish.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    46 Source: lang\bin\x86\Russian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    47 Source: lang\bin\x86\Slovenian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    48 Source: lang\bin\x86\Spanish.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    49 Source: lang\bin\x86\Turkish.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    50 Source: lang\bin\x86\Japanese.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    51 Source: lang\bin\x86\Portuguese.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     40Source: lang\bin\Dutch.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     41Source: lang\bin\French.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     42Source: lang\bin\German.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     43Source: lang\bin\Italian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     44Source: lang\bin\Japanese.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     45Source: lang\bin\Norwegian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     46Source: lang\bin\Polish.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     47Source: lang\bin\Portuguese.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     48Source: lang\bin\Russian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     49Source: lang\bin\Serbian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     50Source: lang\bin\Serbian (Cyrillic).dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     51Source: lang\bin\Slovenian.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     52Source: lang\bin\Spanish.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     53Source: lang\bin\Swedish.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     54Source: lang\bin\Turkish.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
     55Source: lang\bin\Japanese.dll; DestDir: {app}; Check: not Is64BitInstallMode; Flags: ignoreversion 32bit 
    5256 
    5357Source: x64\Release\Halite.exe; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
     
    5761Source: lang\bin\x64\German.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    5862Source: lang\bin\x64\Italian.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
     63Source: lang\bin\x64\Japanese.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    5964Source: lang\bin\x64\Norwegian.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    6065Source: lang\bin\x64\Polish.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
     66Source: lang\bin\x64\Portuguese.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    6167Source: lang\bin\x64\Russian.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
     68Source: lang\bin\x64\Serbian.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
     69Source: lang\bin\x64\Serbian (Cyrillic).dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    6270Source: lang\bin\x64\Slovenian.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    6371Source: lang\bin\x64\Spanish.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
     72Source: lang\bin\x64\Swedish.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    6473Source: lang\bin\x64\Turkish.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    6574Source: lang\bin\x64\Japanese.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    66 Source: lang\bin\x64\Portuguese.dll; DestDir: {app}; Check: Is64BitInstallMode; Flags: ignoreversion 64bit 
    6775 
    6876Source: Readme.txt; DestDir: {app}; Flags: ignoreversion isreadme 
  • trunk/Halite.sln

    r463 r467  
    2222        GlobalSection(SolutionConfigurationPlatforms) = preSolution 
    2323                Debug|Any CPU = Debug|Any CPU 
    24                 Debug|Mixed Platforms = Debug|Mixed Platforms 
    2524                Debug|Win32 = Debug|Win32 
    2625                Debug|x64 = Debug|x64 
    2726                Release Logging|Any CPU = Release Logging|Any CPU 
    28                 Release Logging|Mixed Platforms = Release Logging|Mixed Platforms 
    2927                Release Logging|Win32 = Release Logging|Win32 
    3028                Release Logging|x64 = Release Logging|x64 
    3129                Release|Any CPU = Release|Any CPU 
    32                 Release|Mixed Platforms = Release|Mixed Platforms 
    3330                Release|Win32 = Release|Win32 
    3431                Release|x64 = Release|x64 
     
    3633        GlobalSection(ProjectConfigurationPlatforms) = postSolution 
    3734                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Debug|Any CPU.ActiveCfg = Debug|x64 
    38                 {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 
    39                 {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Debug|Mixed Platforms.Build.0 = Debug|x64 
    4035                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Debug|Win32.ActiveCfg = Debug|Win32 
    4136                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Debug|Win32.Build.0 = Debug|Win32 
     
    4338                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Debug|x64.Build.0 = Debug|x64 
    4439                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release Logging|Any CPU.ActiveCfg = Release Logging|x64 
    45                 {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release Logging|Mixed Platforms.ActiveCfg = Release Logging|x64 
    46                 {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release Logging|Mixed Platforms.Build.0 = Release Logging|x64 
    4740                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release Logging|Win32.ActiveCfg = Release Logging|Win32 
    4841                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release Logging|Win32.Build.0 = Release Logging|Win32 
     
    5043                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release Logging|x64.Build.0 = Release Logging|x64 
    5144                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release|Any CPU.ActiveCfg = Release|x64 
    52                 {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release|Mixed Platforms.ActiveCfg = Release|x64 
    53                 {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release|Mixed Platforms.Build.0 = Release|x64 
    5445                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release|Win32.ActiveCfg = Release|Win32 
    5546                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release|Win32.Build.0 = Release|Win32 
     
    5748                {ED987C84-FFF9-4656-8F27-2A65FC0847FD}.Release|x64.Build.0 = Release|x64 
    5849                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Debug|Any CPU.ActiveCfg = Debug|x64 
    59                 {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 
    60                 {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Debug|Mixed Platforms.Build.0 = Debug|x64 
    6150                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Debug|Win32.ActiveCfg = Debug|Win32 
    6251                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Debug|Win32.Build.0 = Debug|Win32 
     
    6453                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Debug|x64.Build.0 = Debug|x64 
    6554                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release Logging|Any CPU.ActiveCfg = Release Logging|x64 
    66                 {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release Logging|Mixed Platforms.ActiveCfg = Release Logging|x64 
    67                 {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release Logging|Mixed Platforms.Build.0 = Release Logging|x64 
    6855                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release Logging|Win32.ActiveCfg = Release Logging|Win32 
    6956                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release Logging|Win32.Build.0 = Release Logging|Win32 
     
    7158                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release Logging|x64.Build.0 = Release Logging|x64 
    7259                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release|Any CPU.ActiveCfg = Release|x64 
    73                 {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release|Mixed Platforms.ActiveCfg = Release|x64 
    74                 {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release|Mixed Platforms.Build.0 = Release|x64 
    7560                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release|Win32.ActiveCfg = Release|Win32 
    7661                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release|Win32.Build.0 = Release|Win32 
     
    7863                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8}.Release|x64.Build.0 = Release|x64 
    7964                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Debug|Any CPU.ActiveCfg = Debug|x64 
    80                 {85145293-5491-4BA8-892C-F5A0C4AC9208}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 
    81                 {85145293-5491-4BA8-892C-F5A0C4AC9208}.Debug|Mixed Platforms.Build.0 = Debug|x64 
    8265                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Debug|Win32.ActiveCfg = Debug|Win32 
    8366                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Debug|Win32.Build.0 = Debug|Win32 
     
    8568                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Debug|x64.Build.0 = Debug|x64 
    8669                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release Logging|Any CPU.ActiveCfg = Release Logging|x64 
    87                 {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release Logging|Mixed Platforms.ActiveCfg = Release Logging|x64 
    88                 {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release Logging|Mixed Platforms.Build.0 = Release Logging|x64 
    8970                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release Logging|Win32.ActiveCfg = Release Logging|Win32 
    9071                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release Logging|Win32.Build.0 = Release Logging|Win32 
     
    9273                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release Logging|x64.Build.0 = Release Logging|x64 
    9374                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release|Any CPU.ActiveCfg = Release|x64 
    94                 {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release|Mixed Platforms.ActiveCfg = Release|x64 
    95                 {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release|Mixed Platforms.Build.0 = Release|x64 
    9675                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release|Win32.ActiveCfg = Release|Win32 
    9776                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release|Win32.Build.0 = Release|Win32 
     
    9978                {85145293-5491-4BA8-892C-F5A0C4AC9208}.Release|x64.Build.0 = Release|x64 
    10079                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Debug|Any CPU.ActiveCfg = Debug|Win32 
    101                 {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 
    102                 {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 
    10380                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Debug|Win32.ActiveCfg = Debug|Win32 
    10481                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Debug|Win32.Build.0 = Debug|Win32 
    10582                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Debug|x64.ActiveCfg = Debug|Win32 
    10683                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release Logging|Any CPU.ActiveCfg = Release Logging|Win32 
    107                 {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release Logging|Mixed Platforms.ActiveCfg = Release Logging|Win32 
    108                 {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release Logging|Mixed Platforms.Build.0 = Release Logging|Win32 
    10984                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release Logging|Win32.ActiveCfg = Release Logging|Win32 
    11085                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release Logging|Win32.Build.0 = Release Logging|Win32 
    11186                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release Logging|x64.ActiveCfg = Release Logging|Win32 
    11287                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release|Any CPU.ActiveCfg = Release|Win32 
    113                 {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release|Mixed Platforms.ActiveCfg = Release|Win32 
    114                 {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release|Mixed Platforms.Build.0 = Release|Win32 
    11588                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release|Win32.ActiveCfg = Release|Win32 
    11689                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release|Win32.Build.0 = Release|Win32 
    11790                {00A33D18-879A-4143-BCAD-45993CCB5A8C}.Release|x64.ActiveCfg = Release|Win32 
    11891                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 
    119                 {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Debug|Any CPU.Build.0 = Debug|Any CPU 
    120                 {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 
    12192                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Debug|Win32.ActiveCfg = Debug|Any CPU 
    12293                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Debug|x64.ActiveCfg = Debug|Any CPU 
    123                 {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release Logging|Any CPU.ActiveCfg = Release|Any CPU 
    124                 {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release Logging|Any CPU.Build.0 = Release|Any CPU 
    125                 {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release Logging|Mixed Platforms.ActiveCfg = Release|Any CPU 
     94                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release Logging|Any CPU.ActiveCfg = Release64|Any CPU 
     95                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release Logging|Any CPU.Build.0 = Release64|Any CPU 
    12696                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release Logging|Win32.ActiveCfg = Release|Any CPU 
    12797                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release Logging|x64.ActiveCfg = Release|Any CPU 
    12898                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release|Any CPU.ActiveCfg = Release|Any CPU 
    12999                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release|Any CPU.Build.0 = Release|Any CPU 
    130                 {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 
    131                 {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release|Mixed Platforms.Build.0 = Release|Any CPU 
    132100                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release|Win32.ActiveCfg = Release|Any CPU 
    133101                {B9C9CB3A-22F4-466B-9AEA-79C621DCD40A}.Release|x64.ActiveCfg = Release|Any CPU 
  • trunk/Readme.txt

    r410 r467  
    11Halite: A Free Open-Source BitTorrent client 
    22 
    3 Version: 0.3.0.5 dev 408 released 26th March 2008 
     3Version: 0.3.0.7 dev 465 released 30th May 2008 
    44 
    5 WWW: http://www.binarynotions.com/halite.php Forum: 
    6 http://www.binarynotions.com/forum.php 
     5WWW:   http://www.binarynotions.com/halite-bittorrent-client  
     6Forum: http://www.binarynotions.com/forum.php 
    77 
    88Developer: Eóin O'Callaghan 
     
    3131  + Ability to edit trackers specified in the torrent. 
    3232  + Transfer rate and connection limits both global and per-torrent. 
     33  + Torrent file creation. 
    3334 
    3435Requirements: Windows 2000, XP, Server 2003 and Vista (Note currently 
     
    4950Changes: 
    5051 
     52 - from v 0.3.0.5 to 0.3.0.7:  
     53   1) Adds ability to create torrent files. 
     54   2) A lot of small improvements and bug fixes. 
     55 
    5156 - from v 0.3.0.2 to 0.3.0.5:  
    5257   1) Right-click context menu option to 'Open download folder'. 
     
    5459   3) Option to move seeding torrent to another folder. 
    5560   4) Fixed a bug with tracker logins. 
    56  
    57  - from v 0.3 to 0.3.0.2:  
    58    Mainly a bugfix release. 
    59    1) Fixed a bug with Tray Icon rmeaining after window was restored. 
    60    2) Torrent Connection and Transfer setting mapped to incorrect editbox. 
    61    3) Subtle bug where some settings didn't register straight away. 
    6261 
    6362 - from v 0.3 to 0.3.0.2:  
  • trunk/sln/HalWiX/HalWiX.wixproj

    r463 r467  
    55    <ProjectGuid>{b9c9cb3a-22f4-466b-9aea-79c621dcd40a}</ProjectGuid> 
    66    <SchemaVersion>2.0</SchemaVersion> 
    7     <OutputName>HalWiX</OutputName> 
     7    <OutputName>Halite</OutputName> 
    88    <OutputType>Package</OutputType> 
    99    <WixToolPath>$(ProgramFiles)\Windows Installer XML v3\bin\</WixToolPath> 
     
    4040    <SuppressValidation>False</SuppressValidation> 
    4141    <LinkerTreatWarningsAsErrors>False</LinkerTreatWarningsAsErrors> 
    42     <LinkerVerboseOutput>False</LinkerVerboseOutput> 
     42    <LinkerVerboseOutput>True</LinkerVerboseOutput> 
    4343    <WixVariables> 
    4444    </WixVariables> 
     45    <IncludeSearchPaths> 
     46    </IncludeSearchPaths> 
     47    <Pedantic>False</Pedantic> 
     48    <ShowSourceTrace>False</ShowSourceTrace> 
     49    <SuppressSchemaValidation>False</SuppressSchemaValidation> 
     50    <SuppressSpecificWarnings> 
     51    </SuppressSpecificWarnings> 
     52    <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 
     53    <VerboseOutput>True</VerboseOutput> 
    4554  </PropertyGroup> 
    4655  <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> 
     
    7786    <WixVariables> 
    7887    </WixVariables> 
     88    <DefineConstants>Platform=Intel;ProgramFilesFolder=ProgramFilesFolder;Win64Ans=no;ReleaseFolder=</DefineConstants> 
     89    <IncludeSearchPaths> 
     90    </IncludeSearchPaths> 
     91    <Pedantic>False</Pedantic> 
     92    <ShowSourceTrace>False</ShowSourceTrace> 
     93    <SuppressSchemaValidation>False</SuppressSchemaValidation> 
     94    <SuppressSpecificWarnings> 
     95    </SuppressSpecificWarnings> 
     96    <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 
     97    <VerboseOutput>False</VerboseOutput> 
     98  </PropertyGroup> 
     99  <PropertyGroup Condition=" '$(Configuration)' == 'Release64' "> 
     100    <IntermediateOutputPath>obj\Release64\</IntermediateOutputPath> 
     101    <AllowIdenticalRows>False</AllowIdenticalRows> 
     102    <CabinetCachePath> 
     103    </CabinetCachePath> 
     104    <CabinetCreationThreadCount>-1</CabinetCreationThreadCount> 
     105    <Cultures>en-US</Cultures> 
     106    <LeaveTemporaryFiles>False</LeaveTemporaryFiles> 
     107    <LinkerPedantic>False</LinkerPedantic> 
     108    <ReuseCabinetCache>False</ReuseCabinetCache> 
     109    <SetMsiAssemblyNameFileVersion>False</SetMsiAssemblyNameFileVersion> 
     110    <SuppressAclReset>False</SuppressAclReset> 
     111    <SuppressAssemblies>False</SuppressAssemblies> 
     112    <SuppressDefaultAdminSequenceActions>False</SuppressDefaultAdminSequenceActions> 
     113    <SuppressDefaultAdvSequenceActions>False</SuppressDefaultAdvSequenceActions> 
     114    <SuppressDefaultUISequenceActions>False</SuppressDefaultUISequenceActions> 
     115    <SuppressDroppingUnrealTables>False</SuppressDroppingUnrealTables> 
     116    <SuppressFileHashAndInfo>False</SuppressFileHashAndInfo> 
     117    <SuppressFiles>False</SuppressFiles> 
     118    <SuppressIces> 
     119    </SuppressIces> 
     120    <LinkerSuppressIntermediateFileVersionMatching>False</LinkerSuppressIntermediateFileVersionMatching> 
     121    <SuppressLayout>False</SuppressLayout> 
     122    <SuppressMsiAssemblyTableProcessing>False</SuppressMsiAssemblyTableProcessing> 
     123    <LinkerSuppressSchemaValidation>False</LinkerSuppressSchemaValidation> 
     124    <LinkerSuppressSpecificWarnings> 
     125    </LinkerSuppressSpecificWarnings> 
     126    <SuppressValidation>False</SuppressValidation> 
     127    <LinkerTreatWarningsAsErrors>False</LinkerTreatWarningsAsErrors> 
     128    <LinkerVerboseOutput>False</LinkerVerboseOutput> 
     129    <WixVariables> 
     130    </WixVariables> 
     131    <DefineConstants>Platform=x64;ProgramFilesFolder=ProgramFiles64Folder;Win64Ans=yes;ReleaseFolder=x64\</DefineConstants> 
     132    <IncludeSearchPaths> 
     133    </IncludeSearchPaths> 
     134    <Pedantic>False</Pedantic> 
     135    <ShowSourceTrace>False</ShowSourceTrace> 
     136    <SuppressSchemaValidation>False</SuppressSchemaValidation> 
     137    <SuppressSpecificWarnings> 
     138    </SuppressSpecificWarnings> 
     139    <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 
     140    <VerboseOutput>False</VerboseOutput> 
     141    <OutputPath>bin\Release64\</OutputPath> 
    79142  </PropertyGroup> 
    80143  <ItemGroup> 
    81     <Compile Include="HalWiX.wxs" /> 
     144    <WixExtension Include="D:\Program Files (x86)\Windows Installer XML v3\bin\WixUIExtension.dll" /> 
    82145  </ItemGroup> 
    83146  <ItemGroup> 
    84     <WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll" /> 
     147    <ProjectReference Include="..\Halite\Halite.vcproj"> 
     148      <Name>Halite</Name> 
     149      <Project>{ed987c84-fff9-4656-8f27-2a65fc0847fd}</Project> 
     150      <Private>True</Private> 
     151    </ProjectReference> 
     152  </ItemGroup> 
     153  <ItemGroup> 
     154    <Compile Include="HalWiX.wxs" /> 
    85155  </ItemGroup> 
    86156  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" /> 
  • trunk/sln/HalWiX/HalWiX.wxs

    r464 r467  
    44             Manufacturer="BinaryNotions.com" UpgradeCode="8cac0e8f-e307-450f-8aa4-af2bd341c69b"> 
    55 
    6       <Package InstallerVersion="200" Compressed="yes" Platforms="Intel64,Intel"/> 
     6      <Package InstallerVersion="200" Compressed="yes" Platforms="$(var.Platform)" /> 
     7 
    78      <Media Id="1" Cabinet="HalWiX.cab" EmbedCab="yes" /> 
    89       
     
    2728        </Directory> 
    2829 
    29         <Directory Id="ProgramFilesFolder"> 
     30        <Directory Id="$(var.ProgramFilesFolder)"> 
    3031          <Directory Id="HALITE_PRODUCTDIR" Name="Halite"> 
    3132 
    32             <Component Id='ReadMeText' Guid='0E8E2FD3-7658-4429-BBD1-BBDF76E99D71'> 
     33            <Component Id='ReadMeText' Win64='$(var.Win64Ans)' Guid='0E8E2FD3-7658-4429-BBD1-BBDF76E99D71'> 
    3334              <File Id='Readme' Name='readme.txt' DiskId='1' Source='..\..\Readme.txt' /> 
    3435            </Component> 
    35           
    36             <Component Id='HaliteExe' Guid='{601CEE5B-5AE0-462f-BB19-A6FDBD520E40}'> 
    37               <File Id='HaliteFile' Name='Halite.exe' DiskId='1' Source='..\..\release\Halite.exe'> 
     36 
     37            <Component Id='HaliteExe' Win64='$(var.Win64Ans)' Guid='{601CEE5B-5AE0-462f-BB19-A6FDBD520E40}'> 
     38              <File Id='HaliteFile' Name='Halite.exe' DiskId='1' Source='..\..\$(var.ReleaseFolder)release\Halite.exe'> 
    3839                <Shortcut Id="desktopHaliteFile" Directory="DesktopFolder" Name="Halite" 
    3940                    WorkingDirectory='INSTALLDIR' Advertise="yes" Icon="HaliteIcon.exe" IconIndex="0" /> 
     
    4142                    WorkingDirectory='INSTALLDIR' Advertise="yes" Icon="HaliteIcon.exe" IconIndex="0" /> 
    4243              </File> 
     44 
     45              <ProgId Id='Halite.torrent' Advertise="no" Description='BitTorrent Torrent File'> 
     46                <Extension Id='torrent' ContentType='application/torrent'> 
     47                  <Verb Id='open' Command='Open' TargetFile='HaliteFile' Argument='"%1"' /> 
     48                </Extension> 
     49              </ProgId> 
     50               
    4351            </Component> 
    4452 
    45             <Component Id='LangDutch' Guid='{EA0BF907-8BF8-41b2-9014-34DAC36D207F}'> 
    46               <File Id='LangDutchFile' Name='Dutch.dll' DiskId='1' Source='..\..\lang\bin\x86\Dutch.dll' /> 
     53            <Component Id='LangDutch' Win64='$(var.Win64Ans)' Guid='{EA0BF907-8BF8-41b2-9014-34DAC36D207F}'> 
     54              <File Id='LangDutchFile' Name='Dutch.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Dutch.dll' /> 
    4755            </Component> 
    48              
     56            <Component Id='LangFrench' Win64='$(var.Win64Ans)' Guid='{D3CF978A-780A-43ac-A242-9829EDD29E61}'> 
     57              <File Id='LangFrenchFile' Name='French.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)French.dll' /> 
     58            </Component> 
     59            <Component Id='LangGerman' Win64='$(var.Win64Ans)' Guid='{D2EF1864-BA16-4e36-812D-390B785DB9E4}'> 
     60              <File Id='LangGermanFile' Name='German.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)German.dll' /> 
     61            </Component> 
     62            <Component Id='LangItalian' Win64='$(var.Win64Ans)' Guid='{49AA9062-1A15-418a-B59C-6A773670B170}'> 
     63              <File Id='LangItalianFile' Name='Italian.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Italian.dll' /> 
     64            </Component> 
     65            <Component Id='LangJapanese' Win64='$(var.Win64Ans)' Guid='{BF6ACE52-5323-4ccc-AF4F-C1F88544B6EC}'> 
     66              <File Id='LangJapaneseFile' Name='Japanese.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Japanese.dll' /> 
     67            </Component> 
     68            <Component Id='LangNorwegian' Win64='$(var.Win64Ans)' Guid='{5D3DA0B0-F843-4bb4-BA91-38C239CED2E6}'> 
     69              <File Id='LangNorwegianFile' Name='Norwegian.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Norwegian.dll' /> 
     70            </Component> 
     71            <Component Id='LangPolish' Win64='$(var.Win64Ans)' Guid='{42EF2371-5CA5-4b3a-9379-9605CE8DBD53}'> 
     72              <File Id='LangPolishFile' Name='Polish.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Polish.dll' /> 
     73            </Component> 
     74            <Component Id='LangPortuguese' Win64='$(var.Win64Ans)' Guid='{A50F41C9-D0F7-4d1e-8F1B-B313DA274959}'> 
     75              <File Id='LangPortugueseFile' Name='Portuguese.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Portuguese.dll' /> 
     76            </Component> 
     77            <Component Id='LangRussian' Win64='$(var.Win64Ans)' Guid='{A5C00F77-2962-41aa-9D99-7D02E2AB47A7}'> 
     78              <File Id='LangRussianFile' Name='Russian.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Russian.dll' /> 
     79            </Component> 
     80            <Component Id='LangSerbian' Win64='$(var.Win64Ans)' Guid='{71AC45DA-3100-4afa-81E1-3E2BC13CC527}'> 
     81              <File Id='LangSerbianFile' Name='Serbian.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Serbian.dll' /> 
     82            </Component> 
     83            <Component Id='LangSerbianCyrillic' Win64='$(var.Win64Ans)' Guid='{0E628306-A9E6-44c8-8965-84CED816A805}'> 
     84              <File Id='LangSerbianCyrillicFile' Name='Serbian (Cyrillic).dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Serbian (Cyrillic).dll' /> 
     85            </Component> 
     86            <Component Id='LangSlovenian' Win64='$(var.Win64Ans)' Guid='{4ADFC8FB-17FE-4b79-99A5-B29AA46EAE0D}'> 
     87              <File Id='LangSlovenianFile' Name='Slovenian.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Slovenian.dll' /> 
     88            </Component> 
     89            <Component Id='LangSpanish' Win64='$(var.Win64Ans)' Guid='{2BD4FAAF-D480-46d3-8F0F-B3927F8DD148}'> 
     90              <File Id='LangSpanishFile' Name='Spanish.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Spanish.dll' /> 
     91            </Component> 
     92            <Component Id='LangSwedish' Win64='$(var.Win64Ans)' Guid='{2CA63BAF-667B-478b-8946-34296E671652}'> 
     93              <File Id='LangSwedishFile' Name='Swedish.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Swedish.dll' /> 
     94            </Component> 
     95            <Component Id='LangTurkish' Win64='$(var.Win64Ans)' Guid='{7CE0EC96-C977-4704-A525-B26B2FAE5A83}'> 
     96              <File Id='LangTurkishFile' Name='Turkish.dll' DiskId='1' Source='..\..\lang\bin\$(var.ReleaseFolder)Turkish.dll' /> 
     97            </Component> 
     98 
    4999          </Directory> 
    50100        </Directory> 
    51  
     101<!-- 
    52102        <Directory Id="ProgramFiles64Folder"> 
    53103          <Directory Id="HALITE_PRODUCTDIR64" Name="Halite"> 
    54104             
    55             <Component Id='ReadMeText64' Win64="yes" Guid='{5DEB2C02-9FD5-46bb-A6F2-2D97CBE09BD6}'> 
     105            <Component Id='ReadMeText64' Win64='yes' Guid='{5DEB2C02-9FD5-46bb-A6F2-2D97CBE09BD6}'> 
    56106              <File Id='Readme64' Name='readme.txt' DiskId='1' Source='..\..\Readme.txt' /> 
    57107            </Component> 
     
    68118          </Directory> 
    69119        </Directory> 
     120-->         
    70121      </Directory> 
    71        
    72       <Feature Id="x86Components" Title="Halite (Core 32bit)" Level="1" 
     122      <Feature Id="x86Components" Title="Halite (Core)" Level="1" Absent="disallow" AllowAdvertise='no' 
    73123               ConfigurableDirectory="HALITE_PRODUCTDIR"> 
    74124        <ComponentRef Id="HaliteExe" /> 
    75125        <ComponentRef Id="HaliteExeStartMenuFolder" /> 
    76126        <ComponentRef Id="ReadMeText" /> 
    77         <Condition Level="0">VersionNT64</Condition> 
    78127      </Feature> 
    79128 
    80       <Feature Id="Languages" Title="Languages" Level="1"> 
    81         <Feature Id="FeatLangDutch" Title="Dutch" Level="1"> 
     129      <Feature Id="Languages" Title="Languages" Level="1" AllowAdvertise='no'> 
     130         
     131        <Feature Id="FeatLangDutch" Title="Dutch" Level="1" AllowAdvertise='no'> 
    82132          <ComponentRef Id="LangDutch" /> 
    83133        </Feature> 
    84         <Condition Level="0">VersionNT64</Condition>  
     134        <Feature Id="FeatLangFrench" Title="French" Level="1" AllowAdvertise='no'> 
     135          <ComponentRef Id="LangFrench" /> 
     136        </Feature> 
     137        <Feature Id="FeatLangGerman" Title="German" Level="1" AllowAdvertise='no'> 
     138          <ComponentRef Id="LangGerman" /> 
     139        </Feature> 
     140        <Feature Id="FeatLangItalian" Title="Italian" Level="1" AllowAdvertise='no'> 
     141          <ComponentRef Id="LangItalian" /> 
     142        </Feature> 
     143        <Feature Id="FeatLangJapanese" Title="Japanese" Level="1" AllowAdvertise='no'> 
     144          <ComponentRef Id="LangJapanese" /> 
     145        </Feature> 
     146        <Feature Id="FeatLangNorwegian" Title="Norwegian" Level="1" AllowAdvertise='no'> 
     147          <ComponentRef Id="LangNorwegian" /> 
     148        </Feature> 
     149        <Feature Id="FeatLangPolish" Title="Polish" Level="1" AllowAdvertise='no'> 
     150          <ComponentRef Id="LangPolish" /> 
     151        </Feature> 
     152        <Feature Id="FeatLangPortuguese" Title="Portuguese" Level="1" AllowAdvertise='no'> 
     153          <ComponentRef Id="LangPortuguese" /> 
     154        </Feature> 
     155        <Feature Id="FeatLangRussian" Title="Russian" Level="1" AllowAdvertise='no'> 
     156          <ComponentRef Id="LangRussian" /> 
     157        </Feature> 
     158        <Feature Id="FeatLangSerbianCyrillic" Title="Serbian (Cyrillic)" Level="1" AllowAdvertise="no"> 
     159          <ComponentRef Id="LangSerbianCyrillic" /> 
     160        </Feature> 
     161        <Feature Id="FeatLangSerbian" Title="Serbian" Level="1" AllowAdvertise='no'> 
     162          <ComponentRef Id="LangSerbian" /> 
     163        </Feature> 
     164        <Feature Id="FeatLangSlovenian" Title="Slovenian" Level="1" AllowAdvertise='no'> 
     165          <ComponentRef Id="LangSlovenian" /> 
     166        </Feature> 
     167        <Feature Id="FeatLangSpanish" Title="Spanish" Level="1" AllowAdvertise='no'> 
     168          <ComponentRef Id="LangSpanish" /> 
     169        </Feature> 
     170        <Feature Id="FeatLangSwedish" Title="Swedish" Level="1" AllowAdvertise='no'> 
     171          <ComponentRef Id="LangSwedish" /> 
     172        </Feature> 
     173        <Feature Id="FeatLangTurkish" Title="Turkish" Level="1" AllowAdvertise='no'> 
     174          <ComponentRef Id="LangTurkish" /> 
     175        </Feature> 
    85176      </Feature> 
    86  
    87       <Feature Id="x64Components" Title="Halite (Core 64bit)" Level="1" 
     177<!-- 
     178      <Feature Id="x64Components" Title="Halite (Core 64bit)" Level="1" Absent="disallow"  
    88179               ConfigurableDirectory="HALITE_PRODUCTDIR64"> 
    89180        <ComponentRef Id="HaliteExe64" /> 
     
    92183        <Condition Level="0">NOT VersionNT64</Condition> 
    93184      </Feature> 
    94  
     185--> 
    95186      <Icon Id="HaliteIcon.exe" SourceFile="..\..\release\Halite.exe" /> 
    96187 
  • trunk/src/HaliteListView.cpp

    r460 r467  
    119119LRESULT HaliteListViewCtrl::OnResume(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) 
    120120{ 
    121         typedef winstl::listview_sequence::sequence_value_type lv_val; 
    122         winstl::listview_sequence lv_seq(*this); 
    123  
    124 /*      std::for_each(make_filter_iterator(&is_selected, lv_seq.begin(), lv_seq.end()), 
    125                                   make_filter_iterator(&is_selected, lv_seq.end(), lv_seq.end()), 
    126                                   bind((void (hal::bit::*)(const std::wstring&))&hal::bit::resumeTorrent,  
    127                                       &hal::bittorrent(),  
    128                                           bind(&hal::to_wstr_shim<const lv_val>, _1))); 
    129 */       
     121        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
     122                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::resumeTorrent,  
     123                        &hal::bittorrent(), _1)); 
     124         
    130125        return 0; 
    131126} 
     
    133128LRESULT HaliteListViewCtrl::OnPause(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) 
    134129{        
    135         typedef winstl::listview_sequence::sequence_value_type lv_val; 
    136         winstl::listview_sequence lv_seq(*this); 
    137  
    138 /*      std::for_each(make_filter_iterator(&is_selected, lv_seq.begin(), lv_seq.end()), 
    139                                   make_filter_iterator(&is_selected, lv_seq.end(), lv_seq.end()), 
    140                                   bind((void (hal::bit::*)(const std::wstring&))&hal::bit::pauseTorrent,  
    141                                       &hal::bittorrent(),  
    142                                           bind(&hal::to_wstr_shim<const lv_val>, _1))); 
    143 */       
     130        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
     131                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::pauseTorrent,  
     132                        &hal::bittorrent(), _1)); 
     133         
    144134        return 0; 
    145135} 
     
    147137LRESULT HaliteListViewCtrl::OnStop(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) 
    148138{ 
    149         typedef winstl::listview_sequence::sequence_value_type lv_val; 
    150         winstl::listview_sequence lv_seq(*this); 
    151  
    152 /*      std::for_each(make_filter_iterator(&is_selected, lv_seq.begin(), lv_seq.end()), 
    153                                   make_filter_iterator(&is_selected, lv_seq.end(), lv_seq.end()), 
    154                                   bind((void (hal::bit::*)(const std::wstring&))&hal::bit::stopTorrent,  
    155                                       &hal::bittorrent(),  
    156                                           bind(&hal::to_wstr_shim<const lv_val>, _1))); 
    157 */ 
     139        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
     140                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::stopTorrent,  
     141                        &hal::bittorrent(), _1)); 
     142 
    158143        return 0; 
    159144} 
     
    169154LRESULT HaliteListViewCtrl::OnRemove(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) 
    170155{ 
    171 /*      std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
     156        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
    172157                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::removeTorrent,  
    173158                        &hal::bittorrent(), _1)); 
    174 */ 
     159 
    175160        clearSelected();         
    176161        return 0; 
     
    179164LRESULT HaliteListViewCtrl::OnRecheck(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) 
    180165{ 
    181 /*      std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
     166        std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
    182167                bind((void (hal::bit::*)(const std::wstring&))&hal::bit::recheckTorrent,  
    183168                        &hal::bittorrent(), _1));        
    184 */ 
     169 
    185170        return 0; 
    186171} 
     
    191176                                hal::app().res_wstr(HAL_HALITE).c_str(), MB_YESNO) == IDYES) 
    192177        { 
    193 /*              std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
     178                std::for_each(manager().allSelected().begin(), manager().allSelected().end(), 
    194179                        bind((void (hal::bit::*)(const std::wstring&))&hal::bit::removeTorrentWipeFiles,  
    195180                                &hal::bittorrent(), _1)); 
    196181                 
    197 */              clearSelected(); 
     182                clearSelected(); 
    198183        } 
    199184        return 0; 
  • trunk/src/halTorrentInternal.hpp

    r459 r467  
    77#pragma once 
    88 
    9 #define HALITE_VERSION                                  0, 3, 0, 437 
    10 #define HALITE_VERSION_STRING                   "v 0.3.0.6 dev 437" 
    11 #define HALITE_FINGERPRINT                              "HL", 0, 3, 0, 6 
     9#define HALITE_VERSION                                  0, 3, 0, 465 
     10#define HALITE_VERSION_STRING                   "v 0.3.0.7 dev 465" 
     11#define HALITE_FINGERPRINT                              "HL", 0, 3, 0, 7 
    1212 
    1313#ifndef HAL_NA 
Note: See TracChangeset for help on using the changeset viewer.