meta-diff-devel Mailing List for meta-diff (Page 2)
Brought to you by:
undees
Menu
▾
▴
meta-diff-devel — For developers; includes CVS checkin notices
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(12) |
Aug
(26) |
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Sebastian S. <ey...@us...> - 2005-08-18 21:19:29
|
Update of /cvsroot/meta-diff/CompareShellEx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17718/CompareShellEx Modified Files: CompareShellEx.dpr Log Message: Improved shell extension registration code, especially for Windows NT and above. Index: CompareShellEx.dpr =================================================================== RCS file: /cvsroot/meta-diff/CompareShellEx/CompareShellEx.dpr,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CompareShellEx.dpr 17 Aug 2005 06:49:10 -0000 1.4 --- CompareShellEx.dpr 17 Aug 2005 21:57:14 -0000 1.5 *************** *** 337,341 **** begin for i:=Low(FGlyphs) to High(FGlyphs) do ! if FGlyphs[i]<>0 then DeleteObject(FGlyphs[i]); inherited; end; --- 337,342 ---- begin for i:=Low(FGlyphs) to High(FGlyphs) do ! if FGlyphs[i]<>0 then ! DeleteObject(FGlyphs[i]); inherited; end; *************** *** 375,385 **** else s:=RegKeys[i]; if not Reg.OpenKey(s,True) then RaiseLastOSError; if i=Low(RegKeys) then begin Reg.WriteString('',LibraryName); Reg.CloseKey; s:=s+'\InProcServer32'; ! if not Reg.OpenKey(s,True) then RaiseLastOSError; Reg.WriteString('',DllLoc); Reg.WriteString('ThreadingModel','Apartment'); --- 376,389 ---- else s:=RegKeys[i]; + if not Reg.OpenKey(s,True) then RaiseLastOSError; + if i=Low(RegKeys) then begin Reg.WriteString('',LibraryName); Reg.CloseKey; s:=s+'\InProcServer32'; ! if not Reg.OpenKey(s,True) then ! RaiseLastOSError; Reg.WriteString('',DllLoc); Reg.WriteString('ThreadingModel','Apartment'); *************** *** 388,394 **** --- 392,407 ---- Reg.CloseKey; end; + + // For Windows NT and above, add oneself to the list of + // approved shell extensions. + Reg.RootKey:=HKEY_LOCAL_MACHINE; + if not Reg.OpenKey('Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved',True) then + RaiseLastOSError; + Reg.WriteString(GUIDs,LibraryName); + Reg.CloseKey; finally Reg.Free; end; + SHChangeNotify(SHCNE_ASSOCCHANGED,SHCNF_IDLIST,nil,nil); {$IFDEF UnInstallMsgBox} MessageBox(0,'Installation successful.',Libraryname+' '+VersionStr,0); *************** *** 422,436 **** else s:=RegKeys[i]; if Reg.DeleteKey(s) then Inc(RemoveCount); end; finally - Reg.CloseKey; Reg.Free; end; {$IFDEF UnInstallMsgBox} MessageBox(0,PChar( ! IntToStr(RemoveCount)+' keys have been removed from the registry. '+ ! 'Please remove files manually.'), Libraryname+' '+VersionStr,0 ); --- 435,459 ---- else s:=RegKeys[i]; + if Reg.DeleteKey(s) then Inc(RemoveCount); + + // For Windows NT and above, remove oneself from the list of + // approved shell extensions. + Reg.RootKey:=HKEY_LOCAL_MACHINE; + if not Reg.OpenKey('Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved',True) then + RaiseLastOSError; + if Reg.DeleteValue(GUIDs) then + Inc(RemoveCount); + Reg.CloseKey; end; finally Reg.Free; end; + SHChangeNotify(SHCNE_ASSOCCHANGED,SHCNF_IDLIST,nil,nil); {$IFDEF UnInstallMsgBox} MessageBox(0,PChar( ! IntToStr(RemoveCount)+' entries have been removed from the registry. '+ ! 'Please remove any files manually.'), Libraryname+' '+VersionStr,0 ); |
|
From: Sebastian S. <ey...@us...> - 2005-08-18 20:55:17
|
Update of /cvsroot/meta-diff/CompareShellEx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28046/CompareShellEx Removed Files: CSE-Install.bat CSE-License.txt CSE-ReadMe.txt CSE-Uninstall.bat Log Message: "Renamed" from CSE-something. --- CSE-Uninstall.bat DELETED --- --- CSE-License.txt DELETED --- --- CSE-Install.bat DELETED --- --- CSE-ReadMe.txt DELETED --- |
|
From: Sebastian S. <ey...@us...> - 2005-08-18 20:26:04
|
Update of /cvsroot/meta-diff/InstallerScripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20348/InstallerScripts Modified Files: metadiff.iss Log Message: Ask the user whether to overwrite existing configuration files. Index: metadiff.iss =================================================================== RCS file: /cvsroot/meta-diff/InstallerScripts/metadiff.iss,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** metadiff.iss 18 Aug 2005 20:16:03 -0000 1.4 --- metadiff.iss 18 Aug 2005 20:24:58 -0000 1.5 *************** *** 84,88 **** [Files] ; meta-diff ! Source: ..\meta-diff\.metadiff; DestDir: {app}; Components: main Source: ..\meta-diff\license.txt; DestDir: {app}; DestName: metadiff-license.txt; Components: main Source: ..\meta-diff\metadiff.exe; DestDir: {app}; Components: main --- 84,88 ---- [Files] ; meta-diff ! Source: ..\meta-diff\.metadiff; DestDir: {app}; Components: main; Flags: confirmoverwrite Source: ..\meta-diff\license.txt; DestDir: {app}; DestName: metadiff-license.txt; Components: main Source: ..\meta-diff\metadiff.exe; DestDir: {app}; Components: main *************** *** 96,100 **** ; LVDiff ! Source: ..\lv-diff\.lvdiff; DestDir: {app}; Components: lvdiff Source: ..\lv-diff\license.txt; DestDir: {app}; DestName: lvdiff-license.txt; Components: lvdiff Source: ..\lv-diff\lvdiff.exe; DestDir: {app}; Components: lvdiff --- 96,100 ---- ; LVDiff ! Source: ..\lv-diff\.lvdiff; DestDir: {app}; Components: lvdiff; Flags: confirmoverwrite Source: ..\lv-diff\license.txt; DestDir: {app}; DestName: lvdiff-license.txt; Components: lvdiff Source: ..\lv-diff\lvdiff.exe; DestDir: {app}; Components: lvdiff |
|
From: Sebastian S. <ey...@us...> - 2005-08-18 20:16:43
|
Update of /cvsroot/meta-diff/InstallerScripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18193/InstallerScripts Modified Files: metadiff.iss Log Message: Added Delphi project file to the source component. Index: metadiff.iss =================================================================== RCS file: /cvsroot/meta-diff/InstallerScripts/metadiff.iss,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** metadiff.iss 18 Aug 2005 20:08:54 -0000 1.3 --- metadiff.iss 18 Aug 2005 20:16:03 -0000 1.4 *************** *** 115,118 **** --- 115,119 ---- Source: ..\CompareShellEx\CompareShellEx-Uninstall.bat; DestDir: {app}; Components: cse + Source: ..\CompareShellEx\CompareShellEx.bdsproj; DestDir: {app}\source\CompareShellEx; Components: src Source: ..\CompareShellEx\CompareShellEx.dpr; DestDir: {app}\source\CompareShellEx; Components: src Source: ..\CompareShellEx\CompareShellEx.lc; DestDir: {app}\source\CompareShellEx; Components: src |
|
From: Sebastian S. <ey...@us...> - 2005-08-18 20:10:22
|
Update of /cvsroot/meta-diff/CompareShellEx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16662/CompareShellEx Modified Files: CompareShellEx-ReadMe.txt Log Message: Minor updates. Index: CompareShellEx-ReadMe.txt =================================================================== RCS file: /cvsroot/meta-diff/CompareShellEx/CompareShellEx-ReadMe.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CompareShellEx-ReadMe.txt 18 Aug 2005 19:02:30 -0000 1.1 --- CompareShellEx-ReadMe.txt 18 Aug 2005 20:10:12 -0000 1.2 *************** *** 33,40 **** Then, at the command prompt, enter: ! rundll32 CompareShellEx,Install Note that "Install" is case sensitive. For your convenience, a simple batch file ! named "CSE-Install.bat" has been added to perform the installation. _________ --- 33,40 ---- Then, at the command prompt, enter: ! RunDLL32 CompareShellEx,Install Note that "Install" is case sensitive. For your convenience, a simple batch file ! named "CompareShellEx-Install.bat" has been added to perform the installation. _________ *************** *** 43,49 **** To uninstall CompareShellEx, type the following at command prompt: ! rundll32 CompareShellEx,Uninstall ! Again, "Uninstall" is case sensitive. Alternatively, use "CSE-Uninstall.bat". ______________________________ --- 43,50 ---- To uninstall CompareShellEx, type the following at command prompt: ! RunDLL32 CompareShellEx,Uninstall ! Again, "Uninstall" is case sensitive. Alternatively, use ! "CompareShellEx-Uninstall.bat". ______________________________ *************** *** 52,57 **** v1.3 - Added support for meta-diff (http://meta-diff.sourceforge.net/). ! - Made CompareShellEx Open Source (thanks to Karsten who agreed on this). It is now hosted at the meta-diff site. v1.2 --- 53,59 ---- v1.3 - Added support for meta-diff (http://meta-diff.sourceforge.net/). ! - Made CompareShellEx Open Source (thanks to Karsten who agreed to this). It is now hosted at the meta-diff site. + - Various minor improvements regarding the shell extension registration. v1.2 *************** *** 75,83 **** - Minor bug fixes ! V1.1 - Enhances installation/uninstallation functions - Minor bug fixes ! V1.0 - Initial release --- 77,85 ---- - Minor bug fixes ! v1.1 - Enhances installation/uninstallation functions - Minor bug fixes ! v1.0 - Initial release *************** *** 91,93 **** E-mail : eyebex at users.sourceforge.net Web : http://threekings.tk/layouts/craquelure/index.php?section=sundries&anchor=cse ! Date : 2005.Jul.29 --- 93,95 ---- E-mail : eyebex at users.sourceforge.net Web : http://threekings.tk/layouts/craquelure/index.php?section=sundries&anchor=cse ! Date : 2005.Aug.18 |
|
From: Sebastian S. <ey...@us...> - 2005-08-18 20:09:08
|
Update of /cvsroot/meta-diff/InstallerScripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16335/InstallerScripts Modified Files: metadiff.iss Log Message: - Adjusted to changed file names. - Added batch files to (un-)install CompareShellEx. Index: metadiff.iss =================================================================== RCS file: /cvsroot/meta-diff/InstallerScripts/metadiff.iss,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** metadiff.iss 30 Jul 2005 14:05:56 -0000 1.2 --- metadiff.iss 18 Aug 2005 20:08:54 -0000 1.3 *************** *** 69,73 **** DefaultGroupName=meta-diff suite DisableStartupPrompt=yes ! LicenseFile=..\CompareShellEx\CSE-License.txt [Types] --- 69,73 ---- DefaultGroupName=meta-diff suite DisableStartupPrompt=yes ! LicenseFile=..\CompareShellEx\CompareShellEx-License.txt [Types] *************** *** 110,115 **** ; CompareShellEx Source: ..\CompareShellEx\CompareShellEx.dll; DestDir: {app}; Components: cse; Flags: uninsrestartdelete ! Source: ..\CompareShellEx\CSE-License.txt; DestDir: {app}; DestName: CompareShellEx-License.txt; Components: cse ! Source: ..\CompareShellEx\CSE-ReadMe.txt; DestDir: {app}; DestName: CompareShellEx-ReadMe.txt; Components: cse Source: ..\CompareShellEx\CompareShellEx.dpr; DestDir: {app}\source\CompareShellEx; Components: src --- 110,117 ---- ; CompareShellEx Source: ..\CompareShellEx\CompareShellEx.dll; DestDir: {app}; Components: cse; Flags: uninsrestartdelete ! Source: ..\CompareShellEx\CompareShellEx-Install.bat; DestDir: {app}; Components: cse ! Source: ..\CompareShellEx\CompareShellEx-License.txt; DestDir: {app}; Components: cse ! Source: ..\CompareShellEx\CompareShellEx-ReadMe.txt; DestDir: {app}; Components: cse ! Source: ..\CompareShellEx\CompareShellEx-Uninstall.bat; DestDir: {app}; Components: cse Source: ..\CompareShellEx\CompareShellEx.dpr; DestDir: {app}\source\CompareShellEx; Components: src *************** *** 121,128 **** [Run] ! Filename: {sys}\RunDLL32.exe; Parameters: {app}\CompareShellEx.dll,Install; Components: cse; Flags: runhidden [UninstallRun] ! Filename: {sys}\RunDLL32.exe; Parameters: {app}\CompareShellEx.dll,Uninstall; Components: cse; Flags: runhidden [Messages] --- 123,132 ---- [Run] ! ;Filename: {sys}\RunDLL32.exe; Parameters: {app}\CompareShellEx.dll,Install; Components: cse; Flags: runhidden ! Filename: {app}\CompareShellEx-Install.bat; Components: cse; Flags: runhidden [UninstallRun] ! ;Filename: {sys}\RunDLL32.exe; Parameters: {app}\CompareShellEx.dll,Uninstall; Components: cse; Flags: runhidden ! Filename: {app}\CompareShellEx-Uninstall.bat; Components: cse; Flags: runhidden [Messages] |
|
From: Sebastian S. <ey...@us...> - 2005-08-18 20:05:09
|
Update of /cvsroot/meta-diff/meta-diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15358/meta-diff Modified Files: metadiff.cpp Log Message: Fixed a bug if the items to compare contain path names with spaces. Index: metadiff.cpp =================================================================== RCS file: /cvsroot/meta-diff/meta-diff/metadiff.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** metadiff.cpp 30 Jul 2005 10:52:58 -0000 1.9 --- metadiff.cpp 18 Aug 2005 20:04:33 -0000 1.10 *************** *** 158,162 **** itemName2 = "\"" + itemName2 + "\""; ! spawnlp(P_WAIT, program.c_str(), program.c_str(), itemName1.c_str(), itemName2.c_str(), NULL); #else --- 158,162 ---- itemName2 = "\"" + itemName2 + "\""; ! spawnlp(P_WAIT, program.c_str(), ("\"" + program + "\"").c_str(), itemName1.c_str(), itemName2.c_str(), NULL); #else |
|
From: Sebastian S. <ey...@us...> - 2005-08-18 19:02:49
|
Update of /cvsroot/meta-diff/CompareShellEx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29718/CompareShellEx Added Files: CompareShellEx-Install.bat CompareShellEx-License.txt CompareShellEx-ReadMe.txt CompareShellEx-Uninstall.bat Log Message: "Renamed" from CSE-*.* --- NEW FILE: CompareShellEx-Uninstall.bat --- rem Batch File Command Reference for Windows 2000 rem http://labmice.techtarget.com/articles/batchcmds.htm @RunDLL32.exe "%~dp0CompareShellEx.dll",Uninstall --- NEW FILE: CompareShellEx-License.txt --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 --- NEW FILE: CompareShellEx-ReadMe.txt --- CompareShellEx is based upon BCShellEx 1.2 by Karsten Strobel <st...@ai...> ___________________________ What is CompareShellEx for? CompareShellEx is a Shell Extension DLL that adds the ability to start Visual Comparer (http://www.visual-comparer.com/) or meta-diff (http://meta-diff.sourceforge.net/) from within Windows Explorer. __________ How to use 1) Select two files and then choose "Visual Comparer" from the context menu. Visual Comparer will be launched comparing these two files. or 2) Select one file and choose "Link for Visual Comparer". This will make CompareShellEx remeber this file. Then, select another file (not neccessarily in the same folder or on the same drive) and choose "Visual Compare with <First File>". Again, Visual Comparer will be launched to compare these two files. When compiled for meta-diff, selection of two directories is also suppored, and the context menu item is named "meta-diff" respectively. ____________ Installation To install CompareShellEx, just place CompareShellEx.dll into the folder where Visual Comparer (VisCmp.exe) or meta-diff (metadiff.exe) is located. Then, at the command prompt, enter: rundll32 CompareShellEx,Install Note that "Install" is case sensitive. For your convenience, a simple batch file named "CSE-Install.bat" has been added to perform the installation. _________ Uninstall To uninstall CompareShellEx, type the following at command prompt: rundll32 CompareShellEx,Uninstall Again, "Uninstall" is case sensitive. Alternatively, use "CSE-Uninstall.bat". ______________________________ CompareShellEx Version History v1.3 - Added support for meta-diff (http://meta-diff.sourceforge.net/). - Made CompareShellEx Open Source (thanks to Karsten who agreed on this). It is now hosted at the meta-diff site. v1.2 - Slight modifications to make the source code compile with Delphi 6 - Changed all references of BCShellEx and Beyond Compare to CompareShellEx and Visual Comparer - New Shell Extension icons which correspond to Visual Comparer - Removed Beyond Compare specific stuff (e.g. comparing folders) - Generated a new GUID to be able to use BCShellEx and CompareShellEx on the same machine _________________________ BCShellEx Version History v1.2 - Displays little icons in the contect menu - English, German and Frensh language support - CmdLineOption can be specified now - Bug in installation on Win95 fixed - Bug in comparing a directory with a file fixed - Minor bug fixes V1.1 - Enhances installation/uninstallation functions - Minor bug fixes V1.0 - Initial release __________ Disclaimer CompareShellEx is freeware. It comes to you as-is. Use it or do not use it, but if you use it, you do it on your own risk. Author : Sebastian Schuberth (based on work of Karsten Strobel) E-mail : eyebex at users.sourceforge.net Web : http://threekings.tk/layouts/craquelure/index.php?section=sundries&anchor=cse Date : 2005.Jul.29 --- NEW FILE: CompareShellEx-Install.bat --- rem Batch File Command Reference for Windows 2000 rem http://labmice.techtarget.com/articles/batchcmds.htm @RunDLL32.exe "%~dp0CompareShellEx.dll",Install |
|
From: Sebastian S. <ey...@us...> - 2005-08-17 06:49:22
|
Update of /cvsroot/meta-diff/CompareShellEx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2744/CompareShellEx Modified Files: CompareShellEx.dpr Log Message: - Undefined "UnInstallMsgBox" by default. - Temp. disabled hints for "Uninstall" method. Index: CompareShellEx.dpr =================================================================== RCS file: /cvsroot/meta-diff/CompareShellEx/CompareShellEx.dpr,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CompareShellEx.dpr 30 Jul 2005 12:32:08 -0000 1.3 --- CompareShellEx.dpr 17 Aug 2005 06:49:10 -0000 1.4 *************** *** 17,21 **** {$I CompareShellEx.lc} ! {$DEFINE UnInstallMsgBox} //{$DEFINE VC} --- 17,21 ---- {$I CompareShellEx.lc} ! //{$DEFINE UnInstallMsgBox} //{$DEFINE VC} *************** *** 401,404 **** --- 401,407 ---- end; + // Disable hint H2077 about the unused "RemoveCount" if "UnInstallMsgBox" is not + // defined. Unfortunately, Delphi has no way to disable only specific hints. + {$HINTS OFF} procedure Uninstall(hWnd:HWND;hInstance:HINST;lpszCmdLine:LPSTR;nCmdShow:Integer); stdcall; var *************** *** 437,440 **** --- 440,444 ---- end; end; + {$HINTS ON} var |
|
From: Sebastian S. <ey...@us...> - 2005-08-16 19:27:17
|
Update of /cvsroot/meta-diff/CompareShellEx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12733/CompareShellEx Modified Files: .cvsignore Added Files: CompareShellEx.bdsproj Log Message: Added a real project file which tunes some compiler settings. Index: .cvsignore =================================================================== RCS file: /cvsroot/meta-diff/CompareShellEx/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 27 Jul 2005 21:06:20 -0000 1.1 --- .cvsignore 16 Aug 2005 19:27:07 -0000 1.2 *************** *** 1 **** ! .cvsignore *.bdsproj* *.cfg \ No newline at end of file --- 1 ---- ! .cvsignore *.bdsproj.local *.cfg \ No newline at end of file --- NEW FILE: CompareShellEx.bdsproj --- (This appears to be a binary file; contents omitted.) |
|
From: Sebastian S. <ey...@us...> - 2005-07-30 14:06:05
|
Update of /cvsroot/meta-diff/InstallerScripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv649/InstallerScripts Modified Files: metadiff.iss Log Message: Fixed typos. Index: metadiff.iss =================================================================== RCS file: /cvsroot/meta-diff/InstallerScripts/metadiff.iss,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** metadiff.iss 30 Jul 2005 13:53:28 -0000 1.1 --- metadiff.iss 30 Jul 2005 14:05:56 -0000 1.2 *************** *** 5,9 **** procedure InitializeWizard; begin ! // Use a monospaced font in the license dialog. //WizardForm.LicenseMemo.Font.Name:='Courier New'; //WizardForm.LicenseMemo.Font.Size:=8; --- 5,9 ---- procedure InitializeWizard; begin ! // Use a mono spaced font in the license dialog. //WizardForm.LicenseMemo.Font.Name:='Courier New'; //WizardForm.LicenseMemo.Font.Size:=8; *************** *** 18,22 **** ProgramPage.Add( ! 'Program to use for directory comparisions:', 'Executable files (*.exe)|*.exe|All files (*.*)|*.*', '*.exe' --- 18,22 ---- ProgramPage.Add( ! 'Program to use for directory comparisons:', 'Executable files (*.exe)|*.exe|All files (*.*)|*.*', '*.exe' *************** *** 24,28 **** ProgramPage.Add( ! 'Program to use for file comparisions:', 'Executable files (*.exe)|*.exe|All files (*.*)|*.*', '*.exe' --- 24,28 ---- ProgramPage.Add( ! 'Program to use for file comparisons:', 'Executable files (*.exe)|*.exe|All files (*.*)|*.*', '*.exe' *************** *** 34,42 **** ConfigFile,DirProgram,FileProgram,lvdiff:string; begin ! if CurStep<>ssDone then Exit; ConfigFile:=ExpandConstant('{app}\.metadiff'); ! // Add the programs to the config file. DirProgram:=RemoveQuotes(Trim(ProgramPage.Values[0])); if Length(DirProgram)>0 then begin --- 34,43 ---- ConfigFile,DirProgram,FileProgram,lvdiff:string; begin ! if CurStep<>ssDone then ! Exit; ConfigFile:=ExpandConstant('{app}\.metadiff'); ! // Add the programs to the configuration file. DirProgram:=RemoveQuotes(Trim(ProgramPage.Values[0])); if Length(DirProgram)>0 then begin *************** *** 123,127 **** [UninstallRun] ! Filename: {sys}\RunDLL32.exe; Parameters: {app}\CompareShellEx.dll,Uninstall; Components: cse; Flags: runhidden [Messages] --- 124,128 ---- [UninstallRun] ! Filename: {sys}\RunDLL32.exe; Parameters: {app}\CompareShellEx.dll,Uninstall; Components: cse; Flags: runhidden [Messages] |
|
From: Sebastian S. <ey...@us...> - 2005-07-30 13:53:36
|
Update of /cvsroot/meta-diff/InstallerScripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30951/InstallerScripts Added Files: metadiff.iss Log Message: Added an Inno Setup script to install meta-diff, LVDiff and CompareShellEx (incl. sources). --- NEW FILE: metadiff.iss --- [Code] var ProgramPage:TInputFileWizardPage; procedure InitializeWizard; begin // Use a monospaced font in the license dialog. //WizardForm.LicenseMemo.Font.Name:='Courier New'; //WizardForm.LicenseMemo.Font.Size:=8; // Create a custom page to specify comparison programs. ProgramPage:=CreateInputFilePage( wpInstalling, 'Specify comparison programs', 'One this page you can browse for comparison programs you want meta-diff to launch.', 'You can skip this step by leaving the boxes blank and editing the ".metadiff" configuration file manually afterwards, which gives you access to more options and examples.' ); ProgramPage.Add( 'Program to use for directory comparisions:', 'Executable files (*.exe)|*.exe|All files (*.*)|*.*', '*.exe' ); ProgramPage.Add( 'Program to use for file comparisions:', 'Executable files (*.exe)|*.exe|All files (*.*)|*.*', '*.exe' ); end; procedure CurStepChanged(CurStep:TSetupStep); var ConfigFile,DirProgram,FileProgram,lvdiff:string; begin if CurStep<>ssDone then Exit; ConfigFile:=ExpandConstant('{app}\.metadiff'); // Add the programs to the config file. DirProgram:=RemoveQuotes(Trim(ProgramPage.Values[0])); if Length(DirProgram)>0 then begin SaveStringToFile(ConfigFile,#13#10+'/ '+DirProgram+#13#10,True); end; lvdiff:=ExpandConstant('{app}\lvdiff.exe'); if FileExists(lvdiff) then begin SaveStringToFile(ConfigFile,#13#10+'*.vi '+lvdiff+#13#10,True); end; FileProgram:=RemoveQuotes(Trim(ProgramPage.Values[1])); if Length(FileProgram)>0 then begin SaveStringToFile(ConfigFile,#13#10+'*.* '+FileProgram+#13#10,True); end; end; [Setup] ; Compiler-related InternalCompressLevel=max OutputBaseFilename=meta-diff-suite-v2.1 SolidCompression=yes ; Installer-related AllowNoIcons=yes AppName=meta-diff suite AppVerName=meta-diff suite 2.1 DefaultDirName={pf}\meta-diff DefaultGroupName=meta-diff suite DisableStartupPrompt=yes LicenseFile=..\CompareShellEx\CSE-License.txt [Types] Name: full; Description: Full installation Name: min; Description: Minimal installation Name: custom; Description: Custom installation; Flags: iscustom [Components] Name: main; Description: meta-diff (main application); Types: full min custom; Flags: fixed Name: lvdiff; Description: LVDiff (LabVIEW virtual instrument comparison); Types: full custom Name: cse; Description: CompareShellEx (Windows Explorer shell extension); Types: full custom Name: src; Description: Full C++ / Delphi source code; Types: full [Files] ; meta-diff Source: ..\meta-diff\.metadiff; DestDir: {app}; Components: main Source: ..\meta-diff\license.txt; DestDir: {app}; DestName: metadiff-license.txt; Components: main Source: ..\meta-diff\metadiff.exe; DestDir: {app}; Components: main Source: ..\meta-diff\readme.txt; DestDir: {app}; DestName: metadiff-readme.txt; Components: main; Flags: isreadme Source: ..\meta-diff\GNUmakefile; DestDir: {app}\source\meta-diff; Components: src Source: ..\meta-diff\metadiff.bpr; DestDir: {app}\source\meta-diff; Components: src Source: ..\meta-diff\metadiff.cpp; DestDir: {app}\source\meta-diff; Components: src Source: ..\meta-diff\metadiff.sln; DestDir: {app}\source\meta-diff; Components: src Source: ..\meta-diff\metadiff.vcproj; DestDir: {app}\source\meta-diff; Components: src ; LVDiff Source: ..\lv-diff\.lvdiff; DestDir: {app}; Components: lvdiff Source: ..\lv-diff\license.txt; DestDir: {app}; DestName: lvdiff-license.txt; Components: lvdiff Source: ..\lv-diff\lvdiff.exe; DestDir: {app}; Components: lvdiff Source: ..\lv-diff\lvdiff.vi; DestDir: {app}; Components: lvdiff Source: ..\lv-diff\readme.txt; DestDir: {app}; DestName: lvdiff-readme.txt; Components: lvdiff Source: ..\lv-diff\GNUmakefile; DestDir: {app}\source\lv-diff; Components: src Source: ..\lv-diff\lvdiff.bpr; DestDir: {app}\source\lv-diff; Components: src Source: ..\lv-diff\lvdiff.cpp; DestDir: {app}\source\lv-diff; Components: src Source: ..\lv-diff\lvdiff.sln; DestDir: {app}\source\lv-diff; Components: src Source: ..\lv-diff\lvdiff.vcproj; DestDir: {app}\source\lv-diff; Components: src ; CompareShellEx Source: ..\CompareShellEx\CompareShellEx.dll; DestDir: {app}; Components: cse; Flags: uninsrestartdelete Source: ..\CompareShellEx\CSE-License.txt; DestDir: {app}; DestName: CompareShellEx-License.txt; Components: cse Source: ..\CompareShellEx\CSE-ReadMe.txt; DestDir: {app}; DestName: CompareShellEx-ReadMe.txt; Components: cse Source: ..\CompareShellEx\CompareShellEx.dpr; DestDir: {app}\source\CompareShellEx; Components: src Source: ..\CompareShellEx\CompareShellEx.lc; DestDir: {app}\source\CompareShellEx; Components: src Source: ..\CompareShellEx\CompareShellEx.res; DestDir: {app}\source\CompareShellEx; Components: src [Icons] Name: {group}\Uninstall meta-diff; Filename: {uninstallexe} [Run] Filename: {sys}\RunDLL32.exe; Parameters: {app}\CompareShellEx.dll,Install; Components: cse; Flags: runhidden [UninstallRun] Filename: {sys}\RunDLL32.exe; Parameters: {app}\CompareShellEx.dll,Uninstall; Components: cse; Flags: runhidden [Messages] BeveledLabel=http://meta-diff.sourceforge.net/ |
|
From: Sebastian S. <ey...@us...> - 2005-07-30 13:52:41
|
Update of /cvsroot/meta-diff/meta-diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30833/meta-diff Modified Files: .metadiff Log Message: Added more example programs, removed all real entries as they get added by the setup. Index: .metadiff =================================================================== RCS file: /cvsroot/meta-diff/meta-diff/.metadiff,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .metadiff 23 Jul 2005 11:52:01 -0000 1.3 --- .metadiff 30 Jul 2005 13:52:32 -0000 1.4 *************** *** 14,23 **** # filter for "*.*" as the final line. ! # http://www.xs4all.nl/~lploeger/TreeComp3.htm ! / D:\Programme\TreeComp\TreeComp.exe ! ! # http://meta-diff.sourceforge.net/ ! *.vi C:\Program Files\LVDiff\LVDiff.exe ! # http://winmerge.sourceforge.net/ ! *.* C:\Program Files\WinMerge\WinMerge.exe --- 14,33 ---- # filter for "*.*" as the final line. ! # Examples for free directoy comparison utilities: ! # ! # - TreeComp ! # http://www.xs4all.nl/~lploeger/TreeComp3.htm ! # ! # - PathSync ! # http://www.cockos.com/pathsync/ ! # Examples for free directoy comparison utilities: ! # ! # - WinMerge ! # http://winmerge.sourceforge.net/ ! # ! # - ExamDiff ! # http://www.prestosoft.com/ps.asp?page=edp_examdiff ! # ! # - CSDiff ! # http://www.componentsoftware.com/products/CSDiff/index.htm |
|
From: Sebastian S. <ey...@us...> - 2005-07-30 13:51:25
|
Update of /cvsroot/meta-diff/InstallerScripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30638/InstallerScripts Log Message: Directory /cvsroot/meta-diff/InstallerScripts added to the repository |
|
From: Sebastian S. <ey...@us...> - 2005-07-30 12:32:25
|
Update of /cvsroot/meta-diff/CompareShellEx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17380/CompareShellEx Modified Files: CompareShellEx.dpr Log Message: Added an option to hide the messages boxed upon successful (un-)installation if used in the installer. Index: CompareShellEx.dpr =================================================================== RCS file: /cvsroot/meta-diff/CompareShellEx/CompareShellEx.dpr,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CompareShellEx.dpr 29 Jul 2005 21:49:56 -0000 1.2 --- CompareShellEx.dpr 30 Jul 2005 12:32:08 -0000 1.3 *************** *** 17,20 **** --- 17,22 ---- {$I CompareShellEx.lc} + {$DEFINE UnInstallMsgBox} + //{$DEFINE VC} {$DEFINE MD} *************** *** 389,393 **** --- 391,397 ---- Reg.Free; end; + {$IFDEF UnInstallMsgBox} MessageBox(0,'Installation successful.',Libraryname+' '+VersionStr,0); + {$ENDIF} end else MessageBox(0,'Can''t locate '+LibraryName+'.dll','Error',0); *************** *** 422,425 **** --- 426,430 ---- Reg.Free; end; + {$IFDEF UnInstallMsgBox} MessageBox(0,PChar( IntToStr(RemoveCount)+' keys have been removed from the registry. '+ *************** *** 427,430 **** --- 432,436 ---- Libraryname+' '+VersionStr,0 ); + {$ENDIF} except on E:Exception do MessageBox(0,PChar(E.Message),'Exception',0); |
|
From: Sebastian S. <ey...@us...> - 2005-07-30 11:13:04
|
Update of /cvsroot/meta-diff/lv-diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3313/lv-diff Modified Files: readme.txt Log Message: Fixed line endings and added copyright as in metadiff. Index: readme.txt =================================================================== RCS file: /cvsroot/meta-diff/lv-diff/readme.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** readme.txt 23 May 2005 08:26:23 -0000 1.4 --- readme.txt 30 Jul 2005 11:12:39 -0000 1.5 *************** *** 1,29 **** ! LVDiff - a tool to launch LabVIEW and compare two VIs. ! v2.1 ! (c) 2001, 2005 Ian Dees ! undees at users.sourceforge.net ! ! Overview ! ! This program was written to take advantage of the "external diff tool" option of many source code control systems. LVDiff can be launched at the command line, just like any other diff program. ! ! New in v2.1 ! Added Jan Klostermann's error-checking code. ! ! New in v2.0 ! Added Jim Kring's LabVIEW code to call the comparison VI dynamically (thanks, Jim!). ! Added LabVIEW code to delete lvdiff.ini after the diff is done. ! Added C++ code to keep the executable running until LabVIEW deletes lvdiff.ini (or until a minute passes), so that the source code control program doesn't delete any files too soon. ! ! ! Usage ! ! LVDiff starts LabVIEW and uses the native VI comparison tools built into LabVIEW. Therefore, LVDiff requires the LabVIEW Professional Development System. ! ! To use LVDiff, edit the .lvdiff file to point to your installations of LabVIEW and LVDiff. Do not put whitespace around the equals sign, and do not enclose your path names in quotes. Then, run "lvdiff file1 file2", where file1 and file2 are the full paths to the two files you are comparing. ! ! If you are using a source code control program and want to use LVDiff along with a text-based diff utility, check out meta-diff at ! ! http://meta-diff.sourceforge.net ! ! Enjoy! --- 1,42 ---- ! // LVDiff - a tool to launch LabVIEW and compare two VIs. ! v2.1 ! (c) 2001-2005 Ian Dees ! undees at users.sourceforge.net ! (c) 2005 Sebastian Schuberth ! eyebex at users.sourceforge.net ! ! ! Overview ! ! This program was written to take advantage of the "external diff tool" option of ! many source code control systems. LVDiff can be launched at the command line, ! just like any other diff program. ! ! New in v2.1 ! Added Jan Klostermann's error-checking code. ! ! New in v2.0 ! Added Jim Kring's LabVIEW code to call the comparison VI dynamically (thanks, ! Jim!). ! Added LabVIEW code to delete lvdiff.ini after the diff is done. ! Added C++ code to keep the executable running until LabVIEW deletes lvdiff.ini ! (or until a minute passes), so that the source code control program doesn't ! delete any files too soon. ! ! ! Usage ! ! LVDiff starts LabVIEW and uses the native VI comparison tools built into LabVIEW. ! Therefore, LVDiff requires the LabVIEW Professional Development System. ! ! To use LVDiff, edit the .lvdiff file to point to your installations of LabVIEW ! and LVDiff. Do not put whitespace around the equals sign, and do not enclose ! your path names in quotes. Then, run "lvdiff file1 file2", where file1 and file2 ! are the full paths to the two files you are comparing. ! ! If you are using a source code control program and want to use LVDiff along with ! a text-based diff utility, check out meta-diff at ! ! http://meta-diff.sourceforge.net ! ! Enjoy! |
|
From: Sebastian S. <ey...@us...> - 2005-07-30 11:09:58
|
Update of /cvsroot/meta-diff/meta-diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3008/meta-diff Modified Files: readme.txt Log Message: Wrapped long lines. Index: readme.txt =================================================================== RCS file: /cvsroot/meta-diff/meta-diff/readme.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** readme.txt 28 Jul 2005 16:00:34 -0000 1.4 --- readme.txt 30 Jul 2005 11:09:50 -0000 1.5 *************** *** 9,23 **** Overview ! Many source-code control systems (such as TortoiseCVS) allow you to use your own file comparison tool to examine the differences between various versions of your source code. But what if you want to use more than one diff tool? For example, you might use ExamDiff to compare all your C++ source code, LVDiff to compare virtual instrument (VI) files written in LabVIEW, and CSDiff to compare word processor files. meta-diff will automatically launch whichever diff program you've specified for the file type you're comparing. So point your version control system to meta-diff and enjoy the flexibility! What's new in v2.0 ! Divided process-launching code into Win32 and UN*X variants in order to tolerate the quirks of various platforms. Usage ! To use metadiff, edit the .metadiff file as directed in the instructions in that file. Basically, for each file extension you want to compare, you'll want to add a line telling metadiff which diff tool to use for that type of file. Do not enclose your path names in quotes. ! Then, run "metadiff file1 file2", where file1 and file2 are the full paths to the two files you are comparing. Enjoy! --- 9,35 ---- Overview ! Many source-code control systems (such as TortoiseCVS) allow you to use your own ! file comparison tool to examine the differences between various versions of your ! source code. But what if you want to use more than one diff tool? For example, ! you might use ExamDiff to compare all your C++ source code, LVDiff to compare ! virtual instrument (VI) files written in LabVIEW, and CSDiff to compare word ! processor files. meta-diff will automatically launch whichever diff program ! you've specified for the file type you're comparing. So point your version control ! system to meta-diff and enjoy the flexibility! What's new in v2.0 ! Divided process-launching code into Win32 and UN*X variants in order to ! tolerate the quirks of various platforms. Usage ! To use metadiff, edit the .metadiff file as directed in the instructions in that ! file. Basically, for each file extension you want to compare, you'll want to add ! a line telling metadiff which diff tool to use for that type of file. Do not ! enclose your path names in quotes. ! Then, run "metadiff file1 file2", where file1 and file2 are the full paths to ! the two files you are comparing. Enjoy! |
|
From: Sebastian S. <ey...@us...> - 2005-07-30 10:59:06
|
Update of /cvsroot/meta-diff/lv-diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1151/lv-diff Modified Files: lvdiff.cpp Added Files: GNUmakefile lvdiff.sln lvdiff.vcproj Log Message: Added support for MSVC and GCC. Index: lvdiff.cpp =================================================================== RCS file: /cvsroot/meta-diff/lv-diff/lvdiff.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lvdiff.cpp 7 Aug 2003 21:13:25 -0000 1.3 --- lvdiff.cpp 30 Jul 2005 10:58:55 -0000 1.4 *************** *** 24,49 **** #include <time.h> ! #ifdef __WIN32__ ! #include <io.h> ! #include <process.h> ! #include <windows.h> ! #else ! #include <unistd.h> ! #endif ! ! #ifdef __BORLANDC__ ! #pragma hdrstop ! #include <condefs.h> #endif ! using namespace std; ! #ifdef __WIN32__ ! #define DELIMITER "\\" #else ! #define DELIMITER "/" #endif ! #ifdef __WIN32__ #pragma argsused WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) --- 24,52 ---- #include <time.h> ! // Borland compilers define "__WIN32__" whereas Microsoft compilers define ! // "_WIN32" for Windows applications. ! #if defined(__WIN32__) || defined(_WIN32) ! #define LVDIFF_WIN32 #endif ! #ifdef LVDIFF_WIN32 ! #include <io.h> ! #include <process.h> ! #include <windows.h> ! #define PATH_DELIMITER "\\" ! #define LVDIFF_ERROR(msg) MessageBox(NULL,msg,"metadiff error",MB_OK|MB_ICONERROR); #else ! #include <unistd.h> ! ! #define PATH_DELIMITER "/" ! #define LVDIFF_ERROR(msg) cerr << msg << endl; #endif ! using namespace std; ! ! #ifdef __BORLANDC__ ! // Use the Windows entry point to get rid of the console window. Borland C++ ! // automagically defines "_argc" and "_argv". #pragma argsused WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) *************** *** 54,65 **** if (_argc < 3) { ! cerr << "Usage: lvdiff file1 file2" << endl; ! return 0; } ! //Load the path to lvdiff.vi and the path to LabVIEW ! //from the .lvdiff file. string inFileName = _argv[0]; ! unsigned int lastDelim = inFileName.rfind(DELIMITER); if (lastDelim != string::npos) inFileName = inFileName.substr(0, lastDelim + 1) + ".lvdiff"; --- 57,68 ---- if (_argc < 3) { ! LVDIFF_ERROR("Usage: lvdiff <file1> <file2>") ! return -1; } ! // Load the path to lvdiff.vi and the path to LabVIEW ! // from the .lvdiff file. string inFileName = _argv[0]; ! unsigned int lastDelim = (unsigned int)inFileName.rfind(PATH_DELIMITER); if (lastDelim != string::npos) inFileName = inFileName.substr(0, lastDelim + 1) + ".lvdiff"; *************** *** 77,81 **** continue; string line = lineBuf; ! unsigned int location = line.find('='); if (location == string::npos) continue; --- 80,84 ---- continue; string line = lineBuf; ! unsigned int location = (unsigned int)line.find('='); if (location == string::npos) continue; *************** *** 92,98 **** return 0; ! //Write the paths to the two files to lvdiff.ini, which ! //will be used inside LabVIEW. ! string outFileName = pathToLVDiff + DELIMITER + "lvdiff.ini"; ofstream outFile(outFileName.c_str()); if (!outFile) --- 95,101 ---- return 0; ! // Write the paths to the two files to lvdiff.ini, which ! // will be used inside LabVIEW. ! string outFileName = pathToLVDiff + PATH_DELIMITER + "lvdiff.ini"; ofstream outFile(outFileName.c_str()); if (!outFile) *************** *** 105,121 **** ! //Prepare to run lvdiff.vi inside LabVIEW. ! string parameter = pathToLVDiff + DELIMITER + "lvdiff.vi"; ! #ifdef __WIN32__ parameter = "\"" + parameter + "\""; ! string command = pathToLV + DELIMITER + "labview.exe"; #else ! string command = pathToLV + DELIMITER + "labview"; #endif ! //Don't wait for the LabVIEW process to exit; most users ! //continue working in LabVIEW after doing a diff. ! #ifdef __WIN32__ spawnlp(P_NOWAITO, command.c_str(), command.c_str(), parameter.c_str(), NULL); --- 108,124 ---- ! // Prepare to run lvdiff.vi inside LabVIEW. ! string parameter = pathToLVDiff + PATH_DELIMITER + "lvdiff.vi"; ! #ifdef LVDIFF_WIN32 parameter = "\"" + parameter + "\""; ! string command = pathToLV + PATH_DELIMITER + "labview.exe"; #else ! string command = pathToLV + PATH_DELIMITER + "labview"; #endif ! // Don't wait for the LabVIEW process to exit; most users ! // continue working in LabVIEW after doing a diff. ! #ifdef LVDIFF_WIN32 spawnlp(P_NOWAITO, command.c_str(), command.c_str(), parameter.c_str(), NULL); *************** *** 127,141 **** { execlp(command.c_str(), command.c_str(), parameter.c_str(), NULL); ! return 0; } #endif ! //Exit once we're sure LabVIEW has read and deleted the .ini ! //file, or after a minute has passed. time_t start = time(NULL); while (access(outFileName.c_str(), 0) == 0 && difftime(time(NULL), start) < 60.0) { ! #ifdef __WIN32__ Sleep(500); #else --- 130,144 ---- { execlp(command.c_str(), command.c_str(), parameter.c_str(), NULL); ! return 0; } #endif ! // Exit once we're sure LabVIEW has read and deleted the .ini ! // file, or after a minute has passed. time_t start = time(NULL); while (access(outFileName.c_str(), 0) == 0 && difftime(time(NULL), start) < 60.0) { ! #ifdef LVDIFF_WIN32 Sleep(500); #else --- NEW FILE: lvdiff.sln --- Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lvdiff", "lvdiff.vcproj", "{43E5FDFD-81AB-40F3-ABC3-BE618761B92C}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {43E5FDFD-81AB-40F3-ABC3-BE618761B92C}.Debug.ActiveCfg = Debug|Win32 {43E5FDFD-81AB-40F3-ABC3-BE618761B92C}.Debug.Build.0 = Debug|Win32 {43E5FDFD-81AB-40F3-ABC3-BE618761B92C}.Release.ActiveCfg = Release|Win32 {43E5FDFD-81AB-40F3-ABC3-BE618761B92C}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal --- NEW FILE: GNUmakefile --- CPP = g++ CPPFLAGS = -pipe -Os -fomit-frame-pointer -mwindows -mno-cygwin %.o: %.cpp $(CPP) $(CPPFLAGS) -c $< -o $@ lvdiff: lvdiff.o $(CPP) $(CPPFLAGS) $^ -o $@ strip -s $@.exe .PHONY: clean cleanall clean: -rm -f *.exe *.o cleanall: clean -rm -f *.suo *.ncb *.tds *.obj -rm -fr Debug/ Release/ --- NEW FILE: lvdiff.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="lvdiff" ProjectGUID="{43E5FDFD-81AB-40F3-ABC3-BE618761B92C}" RootNamespace="lvdiff" Keyword="Win32Proj"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="Debug" IntermediateDirectory="Debug" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="4"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile="$(OutDir)/lvdiff.exe" LinkIncremental="2" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/lvdiff.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="Release" IntermediateDirectory="Release" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="4" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile="$(OutDir)/lvdiff.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" EntryPointSymbol="mainCRTStartup" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <File RelativePath=".\lvdiff.cpp"> </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Sebastian S. <ey...@us...> - 2005-07-30 10:55:39
|
Update of /cvsroot/meta-diff/lv-diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv684/lv-diff Added Files: .cvsignore Log Message: Added to ignore intermediate files. --- NEW FILE: .cvsignore --- .cvsignore *.ncb *.suo *.tds |
|
From: Sebastian S. <ey...@us...> - 2005-07-30 10:53:07
|
Update of /cvsroot/meta-diff/meta-diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv308/meta-diff Modified Files: metadiff.cpp Log Message: Added argsused pragma for Borland. Index: metadiff.cpp =================================================================== RCS file: /cvsroot/meta-diff/meta-diff/metadiff.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** metadiff.cpp 26 Jul 2005 06:19:28 -0000 1.8 --- metadiff.cpp 30 Jul 2005 10:52:58 -0000 1.9 *************** *** 52,55 **** --- 52,56 ---- // Use the Windows entry point to get rid of the console window. Borland C++ // automagically defines "_argc" and "_argv". + #pragma argsused WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) #else |
|
From: Sebastian S. <ey...@us...> - 2005-07-29 21:50:24
|
Update of /cvsroot/meta-diff/CompareShellEx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6290/CompareShellEx Modified Files: CSE-ReadMe.txt CompareShellEx.dpr Log Message: Updated Sebastian's e-mail address to the one from SF. Index: CompareShellEx.dpr =================================================================== RCS file: /cvsroot/meta-diff/CompareShellEx/CompareShellEx.dpr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CompareShellEx.dpr 27 Jul 2005 21:03:28 -0000 1.1 --- CompareShellEx.dpr 29 Jul 2005 21:49:56 -0000 1.2 *************** *** 1,7 **** { ! Original BCShellEx library by Karsten Strobel <st...@ai...> Modified and renamed to CompareShellEx for Visual Comparer and meta-diff by ! Sebastian Schuberth <s.s...@tu...> } --- 1,7 ---- { ! Original BCShellEx library by Karsten Strobel <strobel at ait-augsburg.de> Modified and renamed to CompareShellEx for Visual Comparer and meta-diff by ! Sebastian Schuberth <eyebex at users.sourceforge.net> } Index: CSE-ReadMe.txt =================================================================== RCS file: /cvsroot/meta-diff/CompareShellEx/CSE-ReadMe.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CSE-ReadMe.txt 27 Jul 2005 21:24:24 -0000 1.2 --- CSE-ReadMe.txt 29 Jul 2005 21:49:56 -0000 1.3 *************** *** 89,93 **** Author : Sebastian Schuberth (based on work of Karsten Strobel) ! E-mail : s.s...@tu... Web : http://threekings.tk/layouts/craquelure/index.php?section=sundries&anchor=cse ! Date : 2005.Jul.27 --- 89,93 ---- Author : Sebastian Schuberth (based on work of Karsten Strobel) ! E-mail : eyebex at users.sourceforge.net Web : http://threekings.tk/layouts/craquelure/index.php?section=sundries&anchor=cse ! Date : 2005.Jul.29 |
|
From: Ian D. <un...@us...> - 2005-07-28 16:00:42
|
Update of /cvsroot/meta-diff/meta-diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22441 Modified Files: readme.txt Log Message: Cosmetic change. Index: readme.txt =================================================================== RCS file: /cvsroot/meta-diff/meta-diff/readme.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** readme.txt 28 Jul 2005 15:54:23 -0000 1.3 --- readme.txt 28 Jul 2005 16:00:34 -0000 1.4 *************** *** 6,9 **** --- 6,10 ---- eyebex at users.sourceforge.net + Overview |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X