|
From: <ge...@us...> - 2008-04-05 10:24:35
|
Revision: 5265
http://winmerge.svn.sourceforge.net/winmerge/?rev=5265&view=rev
Author: gerundt
Date: 2008-04-05 03:24:28 -0700 (Sat, 05 Apr 2008)
Log Message:
-----------
PATCH: [ 1934897 ] Web: Changes for new stable release 2.8.0
Modified Paths:
--------------
trunk/Web/2.8/index.php
trunk/Web/WinMergePAD.xml
trunk/Web/downloads/index.php
trunk/Web/history.php
trunk/Web/index.php
trunk/Web/page.inc
Modified: trunk/Web/2.8/index.php
===================================================================
--- trunk/Web/2.8/index.php 2008-04-03 22:47:36 UTC (rev 5264)
+++ trunk/Web/2.8/index.php 2008-04-05 10:24:28 UTC (rev 5265)
@@ -5,7 +5,45 @@
$page->printHead('WinMerge 2.8', WINMERGE_2_8);
?>
<h2>WinMerge 2.8</h2>
-<p>Coming soon...</p>
+<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p>
+<?php $page->printDownloadNow(); ?>
+<h2>Features</h2>
+<ul>
+ <li>Visual differencing and merging of text files</li>
+ <li>Flexible editor with syntax highlighting, line numbers and word-wrap</li>
+ <li>Handles Windows, Unix and Mac text file formats</li>
+ <li>Unicode support</li>
+ <li>Difference pane shows current difference in two vertical panes</li>
+ <li>Location pane shows map of files compared</li>
+ <li>Highlights differences inside lines in file compare</li>
+ <li>Regular Expression based file filters in directory compare allow excluding and including items</li>
+ <li>Moved lines detection in file compare</li>
+ <li>Creates patch files</li>
+ <li>Resolve conflict files</li>
+ <li>Shell Integration (supports 64-bit Windows versions)</li>
+ <li>Rudimentary Visual SourceSafe and Rational ClearCase integration</li>
+ <li>Archive file support using 7-Zip</li>
+ <li>Plugin support</li>
+ <li>Localizable interface</li>
+ <li><a href="manual/index.html">Online manual</a> and installed HTML Help manual</li>
+</ul>
+
+<h2>Screenshots</h2>
+<p><a href="images/screenshot.png" target="_blank"><img class="thumbnail" src="images/screenshot_small.png" alt="File Comparison" border="0"></a>
+<a href="images/foldercmp.png" target="_blank"><img class="thumbnail" src="images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
+<p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p>
+
+<h2>Installation</h2>
+<p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.zip">binary zip package</a> into the desired location, and run
+<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
+<p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p>
+
+<h2>Using WinMerge</h2>
+<p>For information on using WinMerge, see our <a href="manual/index.html">online Manual</a>,
+or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p>
+
+<p>Here is the current <a href="changelog.php">change log</a>.</p>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2008-04-03 22:47:36 UTC (rev 5264)
+++ trunk/Web/WinMergePAD.xml 2008-04-05 10:24:28 UTC (rev 5265)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252" ?>
<XML_DIZ_INFO>
<MASTER_PAD_VERSION_INFO>
- <MASTER_PAD_VERSION>2.01</MASTER_PAD_VERSION>
+ <MASTER_PAD_VERSION>2.02</MASTER_PAD_VERSION>
<MASTER_PAD_EDITOR>PADGen 2.0.1.22 http://www.padgen.org</MASTER_PAD_EDITOR>
<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://www.asp-shareware.org/pad</MASTER_PAD_INFO>
</MASTER_PAD_VERSION_INFO>
@@ -34,35 +34,26 @@
</Company_Info>
<Program_Info>
<Program_Name>WinMerge</Program_Name>
- <Program_Version>2.6.14</Program_Version>
- <Program_Release_Month>01</Program_Release_Month>
- <Program_Release_Day>17</Program_Release_Day>
+ <Program_Version>2.8.0</Program_Version>
+ <Program_Release_Month>04</Program_Release_Month>
+ <Program_Release_Day>02</Program_Release_Day>
<Program_Release_Year>2008</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code />
<Program_Cost_Other />
<Program_Type>Freeware</Program_Type>
- <Program_Release_Status>Minor Update</Program_Release_Status>
+ <Program_Release_Status>Major Update</Program_Release_Status>
<Program_Install_Support>Install and Uninstall</Program_Install_Support>
- <Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP</Program_OS_Support>
- <Program_Language>English,ChineseSimplified,ChineseTraditional,Czech,Danish,French,German,Hungarian,Italian,Japanese,Korean,Polish,PortugueseBrazilian,Romanian,Russian,Spanish,Swedish,Turkish</Program_Language>
+ <Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP,Windows2003,Windows Vista Starter,Windows Vista Home Basic,Windows Vista Home Premium,Windows Vista Business,Windows Vista Enterprise,Windows Vista Ultimate,Windows Vista Home Basic x64,Windows Vista Home Premium x64,Windows Vista Business x64,Windows Vista Enterprise x64,Windows Vista Ultimate x64</Program_OS_Support>
+ <Program_Language>Bulgarian,Catalan,ChineseSimplified,ChineseTraditional,Croatian,Czech,Danish,Dutch,English,French,German,Hungarian,Italian,Japanese,Korean,Norwegian,Polish,Portuguese,Russian,Slovak,Spanish,Swedish,Turkish</Program_Language>
<Program_Change_Info />
<Program_Specific_Category>Utilities</Program_Specific_Category>
- <Program_Category_Class>System Utilities::Other</Program_Category_Class>
- <Program_Categories>File Syncronizing, Differencing</Program_Categories>
+ <Program_Category_Class>System Utilities::File Compression</Program_Category_Class>
<Program_System_Requirements />
- <Includes_JAVA_VM>N</Includes_JAVA_VM>
- <Includes_VB_Runtime>N</Includes_VB_Runtime>
- <Includes_DirectX>N</Includes_DirectX>
<File_Info>
- <Filename_Versioned>WinMerge-2.6.14-Setup.exe</Filename_Versioned>
- <Filename_Previous>WinMerge-2.6.12-Setup.exe</Filename_Previous>
- <Filename_Generic>WinMergeSetup.exe</Filename_Generic>
- <Filename_Long>WinMergeSetup.exe</Filename_Long>
-
- <File_Size_Bytes>3036206</File_Size_Bytes>
- <File_Size_K>2965</File_Size_K>
- <File_Size_MB>2.90</File_Size_MB>
+ <File_Size_Bytes>2972014</File_Size_Bytes>
+ <File_Size_K>2902</File_Size_K>
+ <File_Size_MB>3</File_Size_MB>
</File_Info>
<Expire_Info>
<Has_Expire_Info>N</Has_Expire_Info>
@@ -86,14 +77,14 @@
</Program_Descriptions>
<Web_Info>
<Application_URLs>
- <Application_Info_URL>http://winmerge.org/2.6/</Application_Info_URL>
- <Application_Order_URL>http://winmerge.org/2.6/</Application_Order_URL>
- <Application_Screenshot_URL>http://winmerge.org/2.6/images/screenshot.png</Application_Screenshot_URL>
- <Application_Icon_URL>http://winmerge.org/2.6/images/icon.gif</Application_Icon_URL>
+ <Application_Info_URL>http://winmerge.org/2.8/</Application_Info_URL>
+ <Application_Order_URL>http://winmerge.org/2.8/</Application_Order_URL>
+ <Application_Screenshot_URL>http://winmerge.org/2.8/images/screenshot.png</Application_Screenshot_URL>
+ <Application_Icon_URL>http://winmerge.org/2.8/images/icon.gif</Application_Icon_URL>
<Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
</Application_URLs>
<Download_URLs>
- <Primary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-Setup.exe</Primary_Download_URL>
+ <Primary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe</Primary_Download_URL>
<Secondary_Download_URL />
<Additional_Download_URL_1 />
<Additional_Download_URL_2 />
Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php 2008-04-03 22:47:36 UTC (rev 5264)
+++ trunk/Web/downloads/index.php 2008-04-05 10:24:28 UTC (rev 5265)
@@ -15,7 +15,7 @@
</ul>
<h3><a name="current">Current Version</a></h3>
<?php $page->printDownloadNow(); ?>
-<p>The current version is <strong><?php echo $stablerelease->getVersionNumber();?></strong> and was released at <strong><?php echo $stablerelease->getDate();?></strong>. For detailed info on what's new, read the <a href="/2.6/changes.php">changelog</a> and the <a href="http://sourceforge.net/project/shownotes.php?release_id=569358">release notes</a>.</p>
+<p>The current version is <strong><?php echo $stablerelease->getVersionNumber();?></strong> and was released at <strong><?php echo $stablerelease->getDate();?></strong>. For detailed info on what's new, read the <a href="/2.8/changelog.php">change log</a> and the <a href="/2.8/releasenotes.php">release notes</a>.</p>
<div class="downloadmatrix">
<ul>
<li><strong>Installer</strong>
@@ -43,7 +43,7 @@
</li>
</ul>
</div>
-<p>The easiest way to install WinMerge is to download and run the Installer. Read the <a href="2.6/manual/Installing.html">online manual</a> for help using it.</p>
+<p>The easiest way to install WinMerge is to download and run the Installer. Read the <a href="2.8/manual/Installing.html">online manual</a> for help using it.</p>
<h3><a name="other">Other Versions</a></h3>
<ul>
<li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248">Stable Versions</a></li>
@@ -58,12 +58,12 @@
<ul>
<li><strong>Installer</strong>
<ul>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0026-432-457.exe">Exe-Format (1.05 MB)</a></li>
+ <li><a href="http://downloads.sourceforge.net/winmerge/Merge7zInstaller0026-432-457.exe">Exe-Format (1.05 MB)</a></li>
</ul>
</li>
<li><strong>Binaries</strong>
<ul>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/Merge7z0026-432-457.7z">7z-Format (0.91 MB)</a></li>
+ <li><a href="http://downloads.sourceforge.net/winmerge/Merge7z0026-432-457.7z">7z-Format (0.91 MB)</a></li>
</ul>
</li>
</ul>
@@ -76,8 +76,8 @@
<dl class="headinglist">
<dt>Developer Version</dt>
<dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk">https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk</a></dd>
- <dt>WinMerge 2.6</dt>
- <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_6">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_6</a></dd>
+ <dt>WinMerge 2.8</dt>
+ <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_8">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_8</a></dd>
</dl>
<?php
$page->printFoot();
Modified: trunk/Web/history.php
===================================================================
--- trunk/Web/history.php 2008-04-03 22:47:36 UTC (rev 5264)
+++ trunk/Web/history.php 2008-04-05 10:24:28 UTC (rev 5265)
@@ -5,6 +5,14 @@
$page->printHead('WinMerge: History', TAB_HOME);
?>
<h2>History</h2>
+<h3>WinMerge 2.8</h3>
+<ul>
+ <li>WinMerge 2.8.0 (2008-04-02)</li>
+</ul>
+<ul class="inline">
+ <li><a href="/2.8/manual/index.html">Manual</a></li>
+ <li><a href="/2.8/changelog.php">Change Log</a></li>
+</ul>
<h3>WinMerge 2.6</h3>
<ul>
<li>WinMerge 2.6.14 (2008-01-17)</li>
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2008-04-03 22:47:36 UTC (rev 5264)
+++ trunk/Web/index.php 2008-04-05 10:24:28 UTC (rev 5265)
@@ -19,34 +19,35 @@
<li>Regular Expression based file filters in directory compare allow excluding and including items</li>
<li>Moved lines detection in file compare</li>
<li>Creates patch files</li>
+ <li>Resolve conflict files</li>
<li>Shell Integration (supports 64-bit Windows versions)</li>
<li>Rudimentary Visual SourceSafe and Rational ClearCase integration</li>
<li>Archive file support using 7-Zip</li>
<li>Plugin support</li>
- <li>Localizable interface via resource DLL</li>
- <li><a href="2.6/manual/index.html">Online manual</a> and installed HTML Help manual</li>
+ <li>Localizable interface</li>
+ <li><a href="2.8/manual/index.html">Online manual</a> and installed HTML Help manual</li>
</ul>
<h2>Screenshots</h2>
-<p><a href="2.6/images/screenshot.png" target="_blank"><img class="thumbnail" src="2.6/images/screenshot_small.png" alt="File Comparison" border="0"></a>
-<a href="2.6/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.6/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
-<p>See the <a href="2.6/screenshots.php">screenshots page</a> for more screenshots.</p>
+<p><a href="2.8/images/screenshot.png" target="_blank"><img class="thumbnail" src="2.8/images/screenshot_small.png" alt="File Comparison" border="0"></a>
+<a href="2.8/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.8/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
+<p>See the <a href="2.8/screenshots.php">screenshots page</a> for more screenshots.</p>
<h2>WinMerge <?php echo $stablerelease->getVersionNumber();?> - latest stable version</h2>
-<p><a href="2.6/index.php">WinMerge <?php echo $stablerelease->getVersionNumber();?></a> is the latest stable version, and is recommended for most users.</p>
+<p><a href="2.8/index.php">WinMerge <?php echo $stablerelease->getVersionNumber();?></a> is the latest stable version, and is recommended for most users.</p>
<p><a href="<?php echo $stablerelease->getDownload('setup.exe');?>">Download WinMerge <?php echo $stablerelease->getVersionNumber();?> Installer</a></p>
<h2>Installation</h2>
<p>Just download the <a href="<?php echo $stablerelease->getDownload('setup.exe');?>">installer</a> and double-click it.</p>
<p>Or you may simply unzip the <a href="<?php echo $stablerelease->getDownload('exe.zip');?>">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
-<p>For more information, please see the <a href="2.6/manual/Installing.html">Installation section</a> of the <a href="2.6/manual/index.html">Manual</a>.</p>
+<p>For more information, please see the <a href="2.8/manual/Installing.html">Installation section</a> of the <a href="2.8/manual/index.html">Manual</a>.</p>
<h2>Using WinMerge</h2>
-<p>For information on using WinMerge, see our <a href="2.6/manual/index.html">online Manual</a>,
+<p>For information on using WinMerge, see our <a href="2.8/manual/index.html">online Manual</a>,
or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p>
-<p>Here is the current <a href="2.6/changes.php">change history</a>.</p>
+<p>Here is the current <a href="2.8/changelog.php">change log</a>.</p>
<h2>Support</h2>
<p>If you need support, look at our <a href="support/index.php">support page</a> for more information how you can get it.</p>
@@ -55,7 +56,7 @@
<p>WinMerge is an open source project, which means that the program is maintained and developed by
volunteers. If you''re interested in contributing work to the project, see our <a href="http://winmerge.org/Wiki/index.php?title=Help_Needed">developer page</a>
for further information on how you may contribute.</p>
-<p>In addition, WinMerge is translated into a number of different languages. See our <a href="http://winmerge.org/Wiki/index.php?title=Translations">information on translating WinMerge</a> into your own language.</p>
+<p>In addition, WinMerge is translated into a number of different languages. See our <a href="/translations">information on translating WinMerge</a> into your own language.</p>
<p><a href="http://winmerge.org/Wiki/index.php?title=Developers">The WinMerge Development Team</a></p>
<?php
$page->printFoot();
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2008-04-03 22:47:36 UTC (rev 5264)
+++ trunk/Web/page.inc 2008-04-05 10:24:28 UTC (rev 5265)
@@ -43,15 +43,15 @@
$this->_tab = WINMERGE_2_6;
/* _Stable Release */
$this->_stablerelease = new Release;
- $this->_stablerelease->setVersionNumber('2.6.14');
- $this->_stablerelease->setDate('2008-01-17');
- $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-Setup.exe', 3036206);
- $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-exe.zip', 5439408);
- $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-exe.7z', 1768345);
- $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.6.14.zip', 1287952);
- $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.6.14.7z', 753483);
- $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-src.zip', 5318782);
- $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-src.7z', 2929765);
+ $this->_stablerelease->setVersionNumber('2.8.0');
+ $this->_stablerelease->setDate('2008-04-02');
+ $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe', 2972014);
+ $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.zip', 3234729);
+ $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.7z', 1762030);
+ $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.0.zip', 1287510);
+ $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.0.7z', 753830);
+ $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-src.zip', 8449662);
+ $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-src.7z', 4299223);
}
/**
@@ -138,6 +138,7 @@
case WINMERGE_2_0: //if WinMerge 2.0 ...
case WINMERGE_2_2: //if WinMerge 2.2 ...
case WINMERGE_2_4: //if WinMerge 2.4 ...
+ case WINMERGE_2_6: //if WinMerge 2.6 ...
$temp .= "<p class=\"important\">This is an old version of WinMerge, for the latest version go to the <a href=\"/index.php\">main site</a>.</p>\n";
break;
}
@@ -191,15 +192,12 @@
if ($this->_tab == WINMERGE_2_8) { //if WinMerge 2.8 ...
$temp .= " <li><a href=\"/2.8/index.php\" id=\"current\">WinMerge 2.8</a></li>\n";
}
-// else { //if NOT WinMerge 2.8 ...
-// $temp .= " <li><a href=\"/2.8/index.php\">WinMerge 2.8</a></li>\n";
-// }
+ else { //if NOT WinMerge 2.8 ...
+ $temp .= " <li><a href=\"/2.8/index.php\">WinMerge 2.8</a></li>\n";
+ }
if ($this->_tab == WINMERGE_2_6) { //if WinMerge 2.6 ...
$temp .= " <li><a href=\"/2.6/index.php\" id=\"current\">WinMerge 2.6</a></li>\n";
}
- else { //if NOT WinMerge 2.6 ...
- $temp .= " <li><a href=\"/2.6/index.php\">WinMerge 2.6</a></li>\n";
- }
if ($this->_tab == WINMERGE_2_4) { //if WinMerge 2.4 ...
$temp .= " <li><a href=\"/2.4/index.php\" id=\"current\">WinMerge 2.4</a></li>\n";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
