Mercurial > hg > easyhg-kdiff3
changeset 67:ec82d69e8b0c
0.9.86
| author | joachim99 |
|---|---|
| date | Thu, 16 Sep 2004 02:45:37 +0000 |
| parents | efe33e938730 |
| children | d7cafcda8c99 |
| files | kdiff3/Doxyfile kdiff3/README_WIN.txt kdiff3/src/Makefile.win_qt230 kdiff3/src/kdiff3.bat kdiff3/src/kdiff3.bmp kdiff3/src/kdiff3.nsi kdiff3/src/kdiff3_tmake.pro kdiff3/src/version.c |
| diffstat | 8 files changed, 236 insertions(+), 807 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kdiff3/Doxyfile Thu Sep 16 02:45:37 2004 +0000 @@ -0,0 +1,236 @@ +# Doxyfile 1.3.7-KDevelop + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +PROJECT_NAME = kdiff3 +PROJECT_NUMBER = 0.9.85 +OUTPUT_DIRECTORY = +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +DISTRIBUTE_GROUP_DOC = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +OPTIMIZE_OUTPUT_JAVA = NO +SUBGROUPING = YES +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = YES +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = /home/joachim/kdiff3 +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.idl \ + *.odl \ + *.C \ + *.H \ + *.tlh \ + *.diff \ + *.patch \ + *.moc \ + *.xpm +RECURSIVE = YES +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = * +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_SOURCE_FILES = NO +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = NO +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = NO +TREEVIEW_WIDTH = 250 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = NO +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = YES +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +MAX_DOT_GRAPH_WIDTH = 1024 +MAX_DOT_GRAPH_HEIGHT = 1024 +MAX_DOT_GRAPH_DEPTH = 0 +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO
--- a/kdiff3/README_WIN.txt Thu Sep 16 02:40:08 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +0,0 @@ -KDiff3-Readme for Windows -========================= - -Author: Joachim Eibl (joachim.eibl@gmx.de) -Copyright: (C) 2002-2003 by Joachim Eibl -KDiff3-Version: 0.9.80 -Homepage: http://kdiff3.sourceforge.net - -KDiff3 is a program that -- compares and merges two or three input files or directories, -- shows the differences line by line and character by character (!), -- provides an automatic merge-facility and -- an integrated editor for comfortable solving of merge-conflicts -- and has an intuitive graphical user interface. - -See the Changelog.txt for a list of fixed bugs and new features. - -Windows-specific information for the precompiled KDiff3 version: -================================================================ - -This executable is provided for the convenience of users who don't have a -VC6-compiler at hand. - -You may redistribute it under the terms of the GNU GENERAL PUBLIC LICENCE. - -Note that there is NO WARRANTY for this program. - -Installation: -- The installer was created by Sebastien Fricker (sebastien.fricker@web.de). - It is based on the Nullsoft Scriptable Install System (http://nsis.sourceforge.net) - -- You can place the directory where you want it. But don't separate the file - kdiff3.exe from the others, since they are needed for correct execution. - -- Integration with WinCVS: When selected the installer sets KDiff3 to be the - default diff-tool for WinCVS if available. - -- Integration with Explorer: When selected KDiff3 will be added to the "Send To" - menu in the context menu. If you then select two files or two directories and - choose "Send To"->"KDiff3" then KDiff3 will start and compare the specified files. - -Since this program was actually developed for GNU/Linux, there might be Windows -specific problems I don't know of yet. Please write me about problems you encounter. - -Known bugs: -- Links are not handled correctly. (This is because links in Windows are not - the same as under Un*x-filesystems.) - -Licence: - GNU GENERAL PUBLIC LICENSE, Version 2, June 1991 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - For details see file "COPYING". - -Exception from the GPL: - As a special exception, the copyright holder Joachim Eibl gives permission - to link this program with the Qt-library (commercial or non-commercial edition) - from Trolltech (www.trolltech.com), and he permits to distribute the resulting - executable, without including the source code for the Qt-library in the - source distribution. - - - -Start from commandline: -- Comparing 2 files: kdiff3 file1 file2 -- Merging 2 files: kdiff3 file1 file2 -o outputfile -- Comparing 3 files: kdiff3 file1 file2 file3 -- Merging 3 files: kdiff3 file1 file2 file3 -o outputfile - Note that file1 will be treated as base of file2 and file3. - -If all files have the same name but are in different directories, you can -reduce typework by specifying the filename only for the first file. E.g.: -- Comparing 3 files: kdiff3 dir1/filename dir2 dir3 -(This also works in the open-dialog.) - -- Comparing 2 directories: kdiff3 dir1 dir2 -- Merging 2 directories: kdiff3 dir1 dir2-o destinationdir -- Comparing 3 directories: kdiff3 dir1 dir2 dir3 -- Merging 3 directories: kdiff3 dir1 dir2 dir3 -o destinationdir -(Please read the documentation about comparing/merging directories, -especially before you start merging.) - -If you start without arguments, then a dialog will appear where you can -select your files and directories via a filebrowser. - -For more documentation, see the help-menu or the subdirectory doc. - -Have fun!
--- a/kdiff3/src/Makefile.win_qt230 Thu Sep 16 02:40:08 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,333 +0,0 @@ -############################################################################# -# Makefile for building kdiff3 -# Generated by tmake at 12:39, 2003/12/06 -# Project: kdiff3_tmake -# Template: app -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -MD -O1 -DQT_DLL -DQT_THREAD_SUPPORT -DNO_DEBUG -GX -GR -CXXFLAGS= -nologo -W3 -MD -O1 -DQT_DLL -DQT_THREAD_SUPPORT -DNO_DEBUG -GX -GR -INCPATH = -I"." -I".\kreplacements" -I"$(QTDIR)\include" -LINK = link -LFLAGS = /NOLOGO /SUBSYSTEM:windows -LIBS = $(QTDIR)\lib\qt-mt230nc.lib $(QTDIR)\lib\qtmain.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib kdiff3.res -MOC = $(QTDIR)\bin\moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = diff.h \ - kdiff3.h \ - merger.h \ - optiondialog.h \ - kreplacements\kreplacements.h \ - directorymergewindow.h \ - fileaccess.h \ - kdiff3_shell.h \ - kdiff3_part.h -SOURCES = diff.cpp \ - difftextwindow.cpp \ - kdiff3.cpp \ - main.cpp \ - merger.cpp \ - mergeresultwindow.cpp \ - optiondialog.cpp \ - pdiff.cpp \ - directorymergewindow.cpp \ - fileaccess.cpp \ - kdiff3_shell.cpp \ - kdiff3_part.cpp \ - kreplacements\kreplacements.cpp \ - gnudiff_analyze.cpp \ - gnudiff_io.cpp \ - gnudiff_xmalloc.cpp -OBJECTS = diff.obj \ - difftextwindow.obj \ - kdiff3.obj \ - main.obj \ - merger.obj \ - mergeresultwindow.obj \ - optiondialog.obj \ - pdiff.obj \ - directorymergewindow.obj \ - fileaccess.obj \ - kdiff3_shell.obj \ - kdiff3_part.obj \ - kreplacements\kreplacements.obj \ - gnudiff_analyze.obj \ - gnudiff_io.obj \ - gnudiff_xmalloc.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = moc_diff.cpp \ - moc_kdiff3.cpp \ - moc_optiondialog.cpp \ - kreplacements\moc_kreplacements.cpp \ - moc_directorymergewindow.cpp \ - moc_fileaccess.cpp \ - moc_kdiff3_shell.cpp \ - moc_kdiff3_part.cpp -OBJMOC = moc_diff.obj \ - moc_kdiff3.obj \ - moc_optiondialog.obj \ - kreplacements\moc_kreplacements.obj \ - moc_directorymergewindow.obj \ - moc_fileaccess.obj \ - moc_kdiff3_shell.obj \ - moc_kdiff3_part.obj -DIST = -TARGET = kdiff3.exe -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) kdiff3.res - $(LINK) $(LFLAGS) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) $(LIBS) -<< - -kdiff3.res: kdiff3.rc - rc kdiff3.rc - -moc: $(SRCMOC) - - -dist: - $(ZIP) kdiff3_tmake.zip kdiff3_tmake.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del diff.obj - -del difftextwindow.obj - -del kdiff3.obj - -del main.obj - -del merger.obj - -del mergeresultwindow.obj - -del optiondialog.obj - -del pdiff.obj - -del directorymergewindow.obj - -del fileaccess.obj - -del kdiff3_shell.obj - -del kdiff3_part.obj - -del kreplacements\kreplacements.obj - -del gnudiff_analyze.obj - -del gnudiff_io.obj - -del gnudiff_xmalloc.obj - -del moc_diff.cpp - -del moc_kdiff3.cpp - -del moc_optiondialog.cpp - -del kreplacements\moc_kreplacements.cpp - -del moc_directorymergewindow.cpp - -del moc_fileaccess.cpp - -del moc_kdiff3_shell.cpp - -del moc_kdiff3_part.cpp - -del moc_diff.obj - -del moc_kdiff3.obj - -del moc_optiondialog.obj - -del kreplacements\moc_kreplacements.obj - -del moc_directorymergewindow.obj - -del moc_fileaccess.obj - -del moc_kdiff3_shell.obj - -del moc_kdiff3_part.obj - -del $(TARGET) - -####### Compile - -diff.obj: diff.cpp \ - diff.h \ - common.h \ - fileaccess.h - -difftextwindow.obj: difftextwindow.cpp \ - diff.h \ - common.h \ - fileaccess.h \ - merger.h \ - optiondialog.h - -kdiff3.obj: kdiff3.cpp \ - diff.h \ - common.h \ - fileaccess.h \ - kdiff3.h \ - optiondialog.h \ - kdiff3_part.h \ - directorymergewindow.h \ - xpm\downend.xpm \ - xpm\currentpos.xpm \ - xpm\down1arrow.xpm \ - xpm\down2arrow.xpm \ - xpm\upend.xpm \ - xpm\up1arrow.xpm \ - xpm\up2arrow.xpm \ - xpm\prevunsolved.xpm \ - xpm\nextunsolved.xpm \ - xpm\iconA.xpm \ - xpm\iconB.xpm \ - xpm\iconC.xpm \ - xpm\autoadvance.xpm \ - xpm\showwhitespace.xpm \ - xpm\showlinenumbers.xpm - -main.obj: main.cpp \ - kdiff3_shell.h \ - version.h - -merger.obj: merger.cpp \ - merger.h \ - diff.h \ - common.h \ - fileaccess.h - -mergeresultwindow.obj: mergeresultwindow.cpp \ - diff.h \ - common.h \ - fileaccess.h \ - optiondialog.h - -optiondialog.obj: optiondialog.cpp \ - optiondialog.h \ - diff.h \ - common.h \ - fileaccess.h - -pdiff.obj: pdiff.cpp \ - diff.h \ - common.h \ - fileaccess.h \ - directorymergewindow.h \ - kdiff3.h \ - optiondialog.h \ - gnudiff_diff.h \ - gnudiff_system.h - -directorymergewindow.obj: directorymergewindow.cpp \ - directorymergewindow.h \ - common.h \ - fileaccess.h \ - optiondialog.h \ - xpm\equal.xpm \ - xpm\not_equal.xpm \ - xpm\not_everywhere.xpm \ - xpm\not_there.xpm \ - xpm\link_arrow.xpm \ - xpm\file.xpm \ - xpm\folder.xpm \ - xpm\startmerge.xpm - -fileaccess.obj: fileaccess.cpp \ - fileaccess.h \ - optiondialog.h \ - common.h - -kdiff3_shell.obj: kdiff3_shell.cpp \ - kdiff3_shell.h \ - kdiff3.h \ - diff.h \ - common.h \ - fileaccess.h - -kdiff3_part.obj: kdiff3_part.cpp \ - kdiff3_part.h \ - kdiff3.h \ - diff.h \ - common.h \ - fileaccess.h - -kreplacements\kreplacements.obj: kreplacements\kreplacements.cpp \ - kreplacements\kreplacements.h \ - kreplacements\..\xpm\fileopen.xpm \ - kreplacements\..\xpm\filesave.xpm - -gnudiff_analyze.obj: gnudiff_analyze.cpp \ - gnudiff_diff.h \ - gnudiff_system.h \ - gnudiff_xalloc.h - -gnudiff_io.obj: gnudiff_io.cpp \ - gnudiff_diff.h \ - gnudiff_system.h \ - gnudiff_xalloc.h - -gnudiff_xmalloc.obj: gnudiff_xmalloc.cpp \ - gnudiff_xalloc.h - -moc_diff.obj: moc_diff.cpp \ - diff.h \ - common.h \ - fileaccess.h - -moc_kdiff3.obj: moc_kdiff3.cpp \ - kdiff3.h \ - diff.h \ - common.h \ - fileaccess.h - -moc_optiondialog.obj: moc_optiondialog.cpp \ - optiondialog.h - -kreplacements\moc_kreplacements.obj: kreplacements\moc_kreplacements.cpp \ - kreplacements\kreplacements.h - -moc_directorymergewindow.obj: moc_directorymergewindow.cpp \ - directorymergewindow.h \ - common.h \ - fileaccess.h - -moc_fileaccess.obj: moc_fileaccess.cpp \ - fileaccess.h - -moc_kdiff3_shell.obj: moc_kdiff3_shell.cpp \ - kdiff3_shell.h - -moc_kdiff3_part.obj: moc_kdiff3_part.cpp \ - kdiff3_part.h - -moc_diff.cpp: diff.h - $(MOC) diff.h -o moc_diff.cpp - -moc_kdiff3.cpp: kdiff3.h - $(MOC) kdiff3.h -o moc_kdiff3.cpp - -moc_optiondialog.cpp: optiondialog.h - $(MOC) optiondialog.h -o moc_optiondialog.cpp - -kreplacements\moc_kreplacements.cpp: kreplacements\kreplacements.h - $(MOC) kreplacements\kreplacements.h -o kreplacements\moc_kreplacements.cpp - -moc_directorymergewindow.cpp: directorymergewindow.h - $(MOC) directorymergewindow.h -o moc_directorymergewindow.cpp - -moc_fileaccess.cpp: fileaccess.h - $(MOC) fileaccess.h -o moc_fileaccess.cpp - -moc_kdiff3_shell.cpp: kdiff3_shell.h - $(MOC) kdiff3_shell.h -o moc_kdiff3_shell.cpp - -moc_kdiff3_part.cpp: kdiff3_part.h - $(MOC) kdiff3_part.h -o moc_kdiff3_part.cpp -
--- a/kdiff3/src/kdiff3.bat Thu Sep 16 02:40:08 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -set DEBUG=1 -echo QTDIR=%QTDIR% -del Makefile -del kdiff3setup*.exe -del kdiff3.pdb -del kdiff3.exe -if %DEBUG%==1 ( - echo debug mode - qmake kdiff3.pro "CONFIG-=release" "CONFIG+=debug" -) else ( - qmake kdiff3.pro "CONFIG+=release" "DEFINES+=NO_DEBUG" -) - - nmake distclean - nmake clean -nmake -del kdiff3.zip -nmake dist -lupdate kdiff3.pro -lrelease kdiff3.pro -cl version.c -o version.exe -version nsis > version.nsi - del /S /Q tmp -md tmp -cd tmp - wget --mirror http://kdiff3.sourceforge.net/doc/index.html -md source -cd source -unzip -x ..\..\kdiff3.zip -cd .. -cd .. -if %DEBUG%==1 ( - makensis.exe /DQTDIR=%QTDIR% /DWINDOWS_DIR=%WINDIR% /DDEBUG=%DEBUG% kdiff3 -) else ( - makensis.exe /DQTDIR=%QTDIR% /DWINDOWS_DIR=%WINDIR% kdiff3 -) -pscp kdiff3setup*.exe friseb123@kdiff3.sourceforge.net:/home/groups/k/kd/kdiff3/htdocs
--- a/kdiff3/src/kdiff3.nsi Thu Sep 16 02:40:08 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,302 +0,0 @@ -;NSIS Modern User Interface version 1.63 -;MultiLanguage Example Script -;Written by Joost Verburg -!define MUI_PRODUCT "KDiff3" ;Define your own software name here -!include "version.nsi" -!ifndef MUI_VERSION -!define MUI_VERSION "" ;Define your own software version here -!endif -!ifndef QTDIR -!define QTDIR "f:\qt\3.2.2" -!endif -!ifndef WINDOWS_DIR -!define WINDOWS_DIR "c:\windows" -!endif -!include "MUI.nsh" - - - -;-------------------------------- -;Configuration - InstallDir "$PROGRAMFILES\KDiff3" - InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${MUI_PRODUCT}" "" - ;DirShow show ; (make this hide to not let the user change it) - ;DirText "Select the directory to install ${MUI_PRODUCT} in:" - - - ;General -!ifndef DEBUG - OutFile "KDiff3Setup_${MUI_VERSION}.exe" -!else - OutFile "KDiff3SetupDebug.exe" -!endif - setCompressor bzip2 - - - - ;Remember the installer language - !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" - !define MUI_LANGDLL_REGISTRY_KEY "Software\${MUI_PRODUCT}" - !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" - ;Remember the Start Menu Folder - !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" - !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${MUI_PRODUCT}" - !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${MUI_PRODUCT}" - !define TEMP $R0 - -;-------------------------------- -;Modern UI Configuration - - !define MUI_LICENSEPAGE - !define MUI_COMPONENTSPAGE - !define MUI_DIRECTORYPAGE - !define MUI_STARTMENUPAGE - - !define MUI_ABORTWARNING - - !define MUI_UNINSTALLER - !define MUI_UNCONFIRMPAGE - !define MUI_HEADERBITMAP "kdiff3.bmp" -;-------------------------------- -;Languages - - !insertmacro MUI_LANGUAGE "English" - !insertmacro MUI_LANGUAGE "French" - !insertmacro MUI_LANGUAGE "German" - !insertmacro MUI_LANGUAGE "Spanish" - !insertmacro MUI_LANGUAGE "SimpChinese" - !insertmacro MUI_LANGUAGE "TradChinese" - !insertmacro MUI_LANGUAGE "Japanese" - !insertmacro MUI_LANGUAGE "Korean" - !insertmacro MUI_LANGUAGE "Italian" - !insertmacro MUI_LANGUAGE "Dutch" - !insertmacro MUI_LANGUAGE "Danish" - !insertmacro MUI_LANGUAGE "Greek" - !insertmacro MUI_LANGUAGE "Russian" - !insertmacro MUI_LANGUAGE "PortugueseBR" - !insertmacro MUI_LANGUAGE "Polish" - !insertmacro MUI_LANGUAGE "Ukrainian" - !insertmacro MUI_LANGUAGE "Czech" - !insertmacro MUI_LANGUAGE "Slovak" - !insertmacro MUI_LANGUAGE "Croatian" - !insertmacro MUI_LANGUAGE "Bulgarian" - !insertmacro MUI_LANGUAGE "Hungarian" - !insertmacro MUI_LANGUAGE "Thai" - !insertmacro MUI_LANGUAGE "Romanian" - !insertmacro MUI_LANGUAGE "Macedonian" - !insertmacro MUI_LANGUAGE "Turkish" - -;-------------------------------- -;Language Strings - - ;Descriptions - LangString DESC_SecCopyUI ${LANG_ENGLISH} "Software: English description" - LangString DESC_SecCopyUI ${LANG_FRENCH} "Software: French description" - LangString DESC_SecCopyUI ${LANG_GERMAN} "Software: German description" - LangString DESC_SecCopyUI ${LANG_SPANISH} "Software: Spanish description" - LangString DESC_SecCopyUI ${LANG_SIMPCHINESE} "Software: Simplified Chinese description" - LangString DESC_SecCopyUI ${LANG_TRADCHINESE} "Software: Traditional Chinese description" - LangString DESC_SecCopyUI ${LANG_JAPANESE} "Software: Japanese description" - LangString DESC_SecCopyUI ${LANG_KOREAN} "Software: Korean description" - LangString DESC_SecCopyUI ${LANG_ITALIAN} "Software: Italian description" - LangString DESC_SecCopyUI ${LANG_DUTCH} "Software: Dutch description" - LangString DESC_SecCopyUI ${LANG_DANISH} "Software: Danish description" - LangString DESC_SecCopyUI ${LANG_GREEK} "Software: Greek description" - LangString DESC_SecCopyUI ${LANG_RUSSIAN} "Software: Russian description" - LangString DESC_SecCopyUI ${LANG_PORTUGUESEBR} "Software: Portuguese (Brasil) description" - LangString DESC_SecCopyUI ${LANG_POLISH} "Software: Polish description" - LangString DESC_SecCopyUI ${LANG_UKRAINIAN} "Software: Ukrainian description" - LangString DESC_SecCopyUI ${LANG_CZECH} "Software: Czechian description" - LangString DESC_SecCopyUI ${LANG_SLOVAK} "Software: Slovakian description" - LangString DESC_SecCopyUI ${LANG_CROATIAN} "Software: Slovakian description" - LangString DESC_SecCopyUI ${LANG_BULGARIAN} "Software: Bulgarian description" - LangString DESC_SecCopyUI ${LANG_HUNGARIAN} "Software: Hungarian description" - LangString DESC_SecCopyUI ${LANG_THAI} "Software: Thai description" - LangString DESC_SecCopyUI ${LANG_ROMANIAN} "Software: Romanian description" - LangString DESC_SecCopyUI ${LANG_MACEDONIAN} "Software: Macedonian description" - LangString DESC_SecCopyUI ${LANG_TURKISH} "Software: Turkish description" - -;-------------------------------- -;Data - - LicenseData /LANG=${LANG_ENGLISH} "..\COPYING" - LicenseData /LANG=${LANG_FRENCH} "..\COPYING" - LicenseData /LANG=${LANG_GERMAN} "..\COPYING" - LicenseData /LANG=${LANG_SPANISH} "..\COPYING" - LicenseData /LANG=${LANG_SIMPCHINESE} "..\COPYING" - LicenseData /LANG=${LANG_TRADCHINESE} "..\COPYING" - LicenseData /LANG=${LANG_JAPANESE} "..\COPYING" - LicenseData /LANG=${LANG_KOREAN} "..\COPYING" - LicenseData /LANG=${LANG_ITALIAN} "..\COPYING" - LicenseData /LANG=${LANG_DUTCH} "..\COPYING" - LicenseData /LANG=${LANG_DANISH} "..\COPYING" - LicenseData /LANG=${LANG_GREEK} "..\COPYING" - LicenseData /LANG=${LANG_RUSSIAN} "..\COPYING" - LicenseData /LANG=${LANG_PORTUGUESEBR} "..\COPYING" - LicenseData /LANG=${LANG_POLISH} "..\COPYING" - LicenseData /LANG=${LANG_UKRAINIAN} "..\COPYING" - LicenseData /LANG=${LANG_CZECH} "..\COPYING" - LicenseData /LANG=${LANG_SLOVAK} "..\COPYING" - LicenseData /LANG=${LANG_CROATIAN} "..\COPYING" - LicenseData /LANG=${LANG_BULGARIAN} "..\COPYING" - LicenseData /LANG=${LANG_HUNGARIAN} "..\COPYING" - LicenseData /LANG=${LANG_THAI} "..\COPYING" - LicenseData /LANG=${LANG_ROMANIAN} "..\COPYING" - LicenseData /LANG=${LANG_MACEDONIAN} "..\COPYING" - LicenseData /LANG=${LANG_TURKISH} "..\COPYING" - -;-------------------------------- -;Reserve Files - - ;Things that need to be extracted on first (keep these lines before any File command!) - ;Only useful for BZIP2 compression - !insertmacro MUI_RESERVEFILE_LANGDLL - -;-------------------------------- -;Installer Sections - -Section "Software" SecCopyUI 2 -SectionIn 2 RO - - SetOutPath "$INSTDIR" - ; add files / whatever that need to be installed here. - WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${MUI_PRODUCT}" "" "$INSTDIR" - WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}" "DisplayName" "${MUI_PRODUCT} (remove only)" - WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}" "UninstallString" '"$INSTDIR\uninst.exe"' - DetailPrint "Writing files" - File "kdiff3.exe" - File "..\binaries\windows\diff.exe" - File "..\COPYING" - File "${WINDOWS_DIR}\system32\msvcp70.dll" - File "${WINDOWS_DIR}\system32\msvcr70.dll" - File "${QTDIR}\lib\qt-mt*.dll" - ; File "*.qm" - - !insertmacro MUI_STARTMENU_WRITE_BEGIN - - DetailPrint "Creating shortcuts" - CreateDirectory "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}" - CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\KDiff3.lnk" "$INSTDIR\kdiff3.exe" - CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Uninstal.lnk" "$INSTDIR\uninst.exe" - - !insertmacro MUI_STARTMENU_WRITE_END - - - ; write out uninstaller - WriteUninstaller "$INSTDIR\uninst.exe" - - - ;Store install folder - WriteRegStr HKCU "Software\${MUI_PRODUCT}" "" $INSTDIR - CreateShortCut "$QUICKLAUNCH\KDiff3.lnk" "$INSTDIR\kdiff3.exe" - -SectionEnd - -Section "Documentation" - - DetailPrint "Writing the documentation" - SetOutPath "$INSTDIR" - File /r tmp\kdiff3.sourceforge.net\doc - SetOutPath "$INSTDIR" - CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Documentation.lnk" "$INSTDIR\doc\index.html" - WriteRegStr HKCR "Application\kdiff3.exe\shell\open\command" "" '"$INSTDIR\kdiff3.exe" "%1"' -SectionEnd - -SubSection "Integration" -Section "WinCVS" - DetailPrint "Integration to WinCVS" - MessageBox MB_OK "Please close WinCVS" - WriteRegStr HKCU "Software\WinCvs\wincvs\CVS settings" "P_Extdiff" '$INSTDIR\kdiff3.exe' - WriteRegBin HKCU "Software\WinCvs\wincvs\CVS settings" "P_DiffUseExtDiff" 01 - -SectionEnd -Section "Explorer" - DetailPrint "Integration to Explorer" -; WriteRegStr HKCR "Directory\shell}\KDiff3" "" '&KDiff3' -; WriteRegStr HKCR "Directory\shell\KDiff3\command" "" '"$INSTDIR\kdiff3.exe" "%1"' - CreateShortCut "$SMPROGRAMS\..\..\SendTo\KDiff3.lnk" '"$INSTDIR\kdiff3.exe"' -SectionEnd -SubSectionEnd - -!ifdef DEBUG -Section "Debug" - DetailPrint "Writing the Source Code" - SetOutPath "$INSTDIR\" - File /r tmp\source - DetailPrint "Writing debug information" - SetOutPath "$INSTDIR" - File /oname=kdiff3.pdb kdiff3.pdb -SectionEnd -!endif - -;Display the Finish header -;Insert this macro after the sections if you are not using a finish page -!insertmacro MUI_SECTIONS_FINISHHEADER - -;-------------------------------- -;Installer Functions - -Function .onInit -; SetOutPath $TEMP1 -; File /oname=spltmp.bmp "promotion.bmp" - -; optional -; File /oname=spltmp.wav "my_splashshit.wav" - -; advsplash::show 5000 600 40 0 $TEMP1\spltmp - -; Pop $0 ; $0 has '1' if the user closed the splash screen early, - ; '0' if everything closed normal, and '-1' if some error occured. - -; Delete $TEMP1\spltmp.bmp -; Delete $TEMP1\spltmp.wav - - !insertmacro MUI_LANGDLL_DISPLAY - -FunctionEnd - -;-------------------------------- -;Descriptions - -!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI) -!insertmacro MUI_FUNCTIONS_DESCRIPTION_END - -;-------------------------------- -;Uninstaller Section - -Section "Uninstall" - -; add delete commands to delete whatever files/registry keys/etc you installed here. - ReadRegStr ${TEMP} "${MUI_STARTMENUPAGE_REGISTRY_ROOT}" "${MUI_STARTMENUPAGE_REGISTRY_KEY}" "${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}" - StrCmp ${TEMP} "" noshortcuts - - RMDir /r "$SMPROGRAMS\${TEMP}" - - noshortcuts: - - RMDir "$INSTDIR" - Delete "$INSTDIR\uninst.exe" - DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}" - - Delete "$QUICKLAUNCH\KDiff3.lnk" - RMDir /r "$INSTDIR" - DetailPrint "Integration to Explorer" -; DeleteRegKey HKCR "Directory\shell\KDiff3\command" -; DeleteRegKey HKCR "Directory\shell\KDiff3" - Delete "$SMPROGRAMS\..\..\SendTo\KDiff3.lnk" - - !insertmacro MUI_UNFINISHHEADER - -SectionEnd - -;-------------------------------- -;Uninstaller Functions - -Function un.onInit - - ;Get language from registry - ReadRegStr $LANGUAGE HKCU "Software\${MUI_PRODUCT}" "Installer Language" - -FunctionEnd -
--- a/kdiff3/src/kdiff3_tmake.pro Thu Sep 16 02:40:08 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -TEMPLATE = app -CONFIG += qt warn-on release -HEADERS = diff.h kdiff3.h merger.h optiondialog.h kreplacements/kreplacements.h \ - directorymergewindow.h fileaccess.h kdiff3_shell.h kdiff3_part.h -SOURCES = diff.cpp difftextwindow.cpp kdiff3.cpp main.cpp merger.cpp mergeresultwindow.cpp \ - optiondialog.cpp pdiff.cpp directorymergewindow.cpp fileaccess.cpp \ - kdiff3_shell.cpp kdiff3_part.cpp kreplacements/kreplacements.cpp \ - gnudiff_analyze.cpp gnudiff_io.cpp gnudiff_xmalloc.cpp -TARGET = kdiff3 -INCLUDEPATH += . ./kreplacements -REQUIRES = full-config -win32:RC_FILE = kdiff3.rc -win32:TMAKE_CFLAGS = -GX -GR -win32:TMAKE_CXXFLAGS = -GX -GR \ No newline at end of file
--- a/kdiff3/src/version.c Thu Sep 16 02:40:08 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -#include <stdio.h> -#include "version.h" -main(int argv,char** argc) -{ - if (argv<=1) - { - printf("%s\n",VERSION); - } - else if (strcmp(argc[1],"dos")==0) - { - printf("set MUI_VERSION=\"%s\"\n",VERSION); - } - else if (strcmp(argc[1],"nsis")==0) - { - printf("!define MUI_VERSION \"%s\"\n",VERSION); - } - else if (strcmp(argc[1],"unix")==0) - { - printf("#define MUI_VERSION=\"%s\"\n",VERSION); - } -}