File	Date	Author	Commit
adm	2015-07-09	Alexandre Feblot	[b599c3] Fix osx packaging stuff: only strip fat framewo...
bin	2015-08-03	Martin Blais	[8b39ff] Clarified docs for encrypted merge.
bugs	2006-04-03	blais	[f9ffc5] Fixed bugs
doc	2017-06-16	Martin Blais	[824ea0] Updated link to bug tracker
etc	2016-01-03	Martin Blais	[cf9236] Applied Debian patch: debian/patches/01_script_...
lib	2016-01-03	Martin Blais	[95c5b7] Applied Debian patch: debian/patches/08_516143_...
old	2010-10-09	Alexandre Feblot	[a82946] Merge Martin changes from official 3.2 to dev v...
ports	2010-11-17	Alexandre Feblot	[2dfc55] Merge the import of the port to Qt4 svn history
src	2017-06-23	Martin Blais	[5e5f88] Applied patch from Vadim Zhukov <persgray at gm...
test	2013-09-04	Martin Blais	[dec18f] Applied suggested patch from <etienne at egdn d...
tools	2017-04-21	Martin Blais	[ac8376] Added xx-git-resolve.
.cvsignore	2005-10-31	blais	[e5dfaf] Committing version xxdiff-1.10 (imported from /...
.hgignore	2012-08-24	Martin Blais	[3f7c9e] Misc. changes on top of Rene Bertin's Windows p...
CHANGES	2017-06-23	Martin Blais	[5e5f88] Applied patch from Vadim Zhukov <persgray at gm...
COPYING	2013-03-09	Martin Blais	[6a86d8] .
PKGINFO	2005-10-31	blais	[cddf7c] Committing (imported from /home/blais/tmp/x/trunk)
README	2017-06-16	Martin Blais	[824ea0] Updated link to bug tracker
README.build	2010-11-09	Alexandre Feblot	[8cc090] Update CHANGES with my own changes, update READ...
TODO	2010-11-17	Alexandre Feblot	[2dfc55] Merge the import of the port to Qt4 svn history
VERSION	2016-11-12	Alexandre Feblot	[03eb6e] Bump version to 5.0b1
index.html	2017-06-16	Martin Blais	[824ea0] Updated link to bug tracker
setup.py	2016-01-03	Martin Blais	[1bb1cf] Applied Debian patch: debian/patches/04_build_s...
style.css	2005-10-31	blais	[cddf7c] Committing (imported from /home/blais/tmp/x/trunk)

Read Me

====================================
xxdiff: Build Notes and Instructions
====================================

xxdiff is a graphical file and directories comparison and merge tool.

Official home page:
    http://xxdiff.sourceforge.net
Original author:
    Martin Blais <blais@furius.ca>

Full documentation is available from the Help menu or web site.
Various integration tools are available under the tools subdirectory
(CVS, ClearCase, etc.)


Building from source
====================

Requirements
------------

- GNU make.  You will need GNU make.  Don't waste your time with other makes,
  many are known not to work (Sun's, as well as OSF1).

- A C++ compiler with a decent STL

- flex >=2.5.31

- bison

- Qt >=4.5

Compiling
---------

Compiling xxdiff::

   cd xxdiff/src
   make -f Makefile.bootstrap # Generate the 'Makefile' file.
   make                       # Build xxdiff


Notes
~~~~~

* For a long time, xxdiff was based on qt3, but was finally ported to
  qt4 in november 2010 by Alexandre Feblot.

* Note: xxdiff used to require the obsolete tmake tool, but has been ported to
  use qmake in may 2006.

* Depending on your platform, you may have to set your QTDIR manually
  (e.g. to /usr/lib/qt4)

* You may have to edit CONFIG to include the option 'thread' or not, depending
  on if you have only the multi-threaded version of qt installed or not
  (libqt-mt).  xxdiff does not specifically need it and can build and run
  without the multi-threaded version of Qt.  Re-run take after making the
  change.


Installation
------------

::

    su -
    install xxdiff/src/xxdiff /usr/X11R6/bin

You can generate HTML documentation with ``xxdiff --help-html`` if you want.


Packaging
=========

* Source packaging:
  adm/release_src

* Simple binary packaging (all platforms):
  adm/release_bin

* Redhat Linux packaging:
  adm/release_i386_rpm

* Debian Linux packaging:
  See web page for link to current port.

* OpenBSD packaging:
  In the ports tree.

* SGI packaging:
  adm/release_mips_tardist

  Note: to install the SGI package you'll need fw_qt and it's
  prerequisites. Installing from tardist package::

    inst -f xxdiff-<version>.mips.tardist
    > go


The author's own release process
--------------------------------

0) check
   1a) the doc files have been generated.
   1b) the version number is correct

1) apply release tag to cvs files

2) build (see instructions above)
   2a) run tests in xxdiff/test

3) build packages (see instructions above)

4) distribute
   - add release to sourceforge project
   - upload to sourceforge htdocs (secondary download location)
   - upload to sourceforge web page
   - upload to rhcontrib.bero.org

5) announce
   - sourceforge project release announcement
   - update web site
   - freshmeat
   - rh-contrib (bero)
   - qt-interest
   - cervisia list
   - wincvs list
   - sgi freeware
   - discreet