New 2.12.x stable release

Main development forum.

Re: New 2.12.x stable release

Postby kimmov » Fri Jun 03, 2011 12:20 pm

I don't know, really. I guess there were some open questions about MS runtimes used etc?

And I've totally lost my track of what there is and what is not in R2_14 already. And I doubt nobody really knows anymore? Has anybody build and tested it?

From my point of view we should just release 2.14 if it is in usable state. And given the current development state I'd just skip further experimental/beta releases and go directly to 2.14.0 stable release.
kimmov
 
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: New 2.12.x stable release

Postby gerundt » Fri Jun 03, 2011 1:21 pm

kimmov wrote:I don't know, really. I guess there were some open questions about MS runtimes used etc?


Switching to VS2008 runtimes should fix bug #3056008 right? I don't know other open questions about MS runtimes.

kimmov wrote:And I've totally lost my track of what there is and what is not in R2_14 already.


The wiki page should be (more or less) up-to-date:
http://wiki.winmerge.org/wiki/R2_14

kimmov wrote:Has anybody build and tested it?


I build and test at least the x64 version for me. But I think the x86 version should work too. :)

kimmov wrote:From my point of view we should just release 2.14 if it is in usable state. And given the current development state I'd just skip further experimental/beta releases and go directly to 2.14.0 stable release.


+1 from me too!
gerundt
Site Admin
 
Posts: 192
Joined: Wed Sep 24, 2008 8:47 am
Location: Germany

Re: New 2.12.x stable release

Postby kimmov » Fri Jun 03, 2011 2:00 pm

gerundt wrote:
kimmov wrote:I don't know, really. I guess there were some open questions about MS runtimes used etc?

Switching to VS2008 runtimes should fix bug #3056008 right? I don't know other open questions about MS runtimes.

Hopefully so. I was just remembering we had some issues with VS2008 runtimes? The installer was huge?
kimmov
 
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: New 2.12.x stable release

Postby gerundt » Sat Jun 04, 2011 12:36 pm

kimmov wrote:Hopefully so. I was just remembering we had some issues with VS2008 runtimes? The installer was huge?


Since the MSI is only a bonus, it should be no problem if the setup is larger. And we can switch to WiX 3.5. The setup with WiX 3.5 and VS2008 was 60% smaller then WiX 3.0 and VS2008.
gerundt
Site Admin
 
Posts: 192
Joined: Wed Sep 24, 2008 8:47 am
Location: Germany

Re: New 2.12.x stable release

Postby gerundt » Sat Jun 04, 2011 12:58 pm

gerundt wrote:And we can switch to WiX 3.5. The setup with WiX 3.5 and VS2008 was 60% smaller then WiX 3.0 and VS2008.


I submitted the patch #3311485 for that!
gerundt
Site Admin
 
Posts: 192
Joined: Wed Sep 24, 2008 8:47 am
Location: Germany

Re: New 2.12.x stable release

Postby kimmov » Sat Jun 04, 2011 1:06 pm

Ah, right. WiX was "nice to have" feature. I've just forgotten these things.. :(
kimmov
 
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: New 2.12.x stable release

Postby gerundt » Tue Jun 14, 2011 6:03 am

Ok, I switched to WiX 3.5 (r7543), updated the release notes from WinMerge 2.14 (r7541) and updated the version number from the manual (r7545)...
gerundt
Site Admin
 
Posts: 192
Joined: Wed Sep 24, 2008 8:47 am
Location: Germany

Re: New 2.12.x stable release

Postby gerundt » Mon Jun 27, 2011 10:20 am

I compiled the current R2_14 branch and it works for me. We have anything not so big changes since the last 2.12 version. But hopefully something the users helps:

Code: Select all
WinMerge 2.13.21
  Update PCRE to version 8.10
  Update SCEW to version 1.1.2
  Improve startup time (#2788142)
  Add menuitems for selecting automatic or manual prediffing (#2638608)
  Add accelerator keys for Shell context menu (#2823536)
  Improve editing of linefilter regular expressions (#3015416)
  Allow editing context line count in patch creator (#2092180)
  Improve color options organization (#2818451)
  Add /xq command line switch for closing WinMerge after identical files
    and not showing message (#2827836)
  Allow setting codepage from command line (#2725549)
  Allow giving encoding name as custom codepage (#2813825, #3010934)
  Add new options dialog panel for folder compare options (#2819626)
  Add options GUI for quick compare limit (#2825628)
  Write config log as UTF-8 file (r7057)
  Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
    in status bar (#3025855)
  Bugfix: Pane headers not updated after language change (#2923684)
  Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
  Bugfix: Compare by size always checked file times too (#2919510)
  Bugfix: Crash when pasting from clipboard (#3109525)
  Bugfix: Keeps verifing path even turned off in options (#3111581)
  Bugfix: Crash after deleting text (#3109521)
  Bugfix: Added EOL chars between copied file/path names (#2817546)
  Bugfix: Created new matching folder to wrong folder (#2890961)
  Bugfix: Strange scrolling effect in location pane (#2942869)
  Bugfix: Plugin error after interrupting folder compare (#2919475)
  Bugfix: "+" and "-" from the number block don't work in the editor (#3306182)
  Bugfix: Date format did not respect Regional Settings (#3175189)
  Bugfix: When selecting multiple files in Patch Generator dialog,
    "Swap" button led to an error.  (#3043635, #3066200)
  Bugfix: WinMerge contained a vulnerability in handling project files (#3185386)
    (http://www.zeroscience.mk/mk/vulnerabilities/ZSL-2011-4997.php)
  Translation updates:
  - Hungarian (#3164982)

WinMerge 2.13.20 - 2010-10-20 (r7319)
  Add missing keywords to Pascal highlighter (#2834192)
  Recognize .ascx files as ASP files (#3042393)
  Fix help locations (#2988974)
  Show only "Copy to other side" item in file compare
    context menu (#2600787)
  Expand/collapse folders from keyboard (#2203904)
  Improve detecting XML files in file compare (#2726531)
  Initialize folder selection dialog to currently selected folder in
    options dialog (r6570)
  New translation: Persian (#2877121, #3065119)
  New translation: Serbian (#3017674, #3065119)
  Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
    libraries installer (#3070254)
  Installer: Remove Uninstall shortcut from start menu folder (#3076909)
  Installer: Don't install quick launch icon for Windows 7 (#3079966)
  Installer: Add OpenCandy to the InnoSetup installer (#3088720)
  Bugfix: WinMerge was vulnerable to DLL hijacking as described in
    Microsoft Security Advisory (2269637)  (#33056008)
  Bugfix: Location pane focus enabled "Save" (#3022292)
  Bugfix: "Copy and advance" toolbar icons not automatically enabled (#3033325)
  Translation updates:
  - Bulgarian (#3082392)
  - Chinese (#3033324)
  - Dutch (#2804979)
  - French (#2850842, #2968200)
  - Slovenian (#2917796, #2932094, #2934354, #3070136)
  - Spanish (#2930734)
  - Turkish (#2825132, #2827817)
  - Ukrainian (#2817835)


Hope we get a WinMerge 2.14 at the start! :)
gerundt
Site Admin
 
Posts: 192
Joined: Wed Sep 24, 2008 8:47 am
Location: Germany

Re: New 2.12.x stable release

Postby nitnit » Mon Jul 25, 2011 6:00 am

I couldn't compile winmerge R2_14 since I could only have MS VS Express edition.

Is it possible to upload the compiled version so I will be able to use and test it ?

Regards
nitnit
 
Posts: 10
Joined: Mon Jul 25, 2011 5:55 am

Re: New 2.12.x stable release

Postby statm » Wed Aug 03, 2011 2:35 am

Any one willing to offer the compiled version of R2_14?
statm
 
Posts: 1
Joined: Wed Aug 03, 2011 1:49 am

PreviousNext

Return to Developers

Who is online

Users browsing this forum: No registered users and 1 guest