#26 distribution archive conflict between source and data

[kiri]

There are files in the source and data archives which collide and are different and incompatible. I examined the TAr files. In particular, they both have CMakeLists.txt in the top directory and the CMakeLists.txt is different. Here is a list of files with same full path name between the archives. They are all in the upper most directory.

CMakeLists.txt
editor.ico
g3dviewer.ico
glest.ico
glestkeys.ini
megaglest.bmp
megaglest.desktop
megaglest.ico
megaglest.png
megaglest.xpm
servers.ini

[Mark Vejvoda]

Please explain exactly which files are different?

[kiri]

CMakeLists.txt is different. I don't know about the rest.
Usually, there shouldn't be any repeated files (with the same content).
In that case, I would run a duplicate finder to find out which are duplicates.
However, there are a large number of duplicates in the data directories,
which is another problem which would be good to resolve.

[Mark Vejvoda]

Ok there are some duplicates in the root folder because the source and data package can be installed individually and thus require enough files to be able to work stand alone.

I suggest you delete the duplicated files from the data package if you want to merge the two.

[kiri]

Deleting pure duplicates would be good.

There would still be the problem of name collisions.
Certainly both archives currently need their own unique CMakeLists.txt.
A result of that is some files overwriting others inappropriately when both archives are extracted.

In the Svn repository, the data is under a directory data/glest_game .
The files in the 'data' archive could be moved to a subdirectory, such as
'glest_game' or 'data/glest_game'.