Intel® Fortran Compiler
Build applications that can scale for the future with optimized code designed for Intel® Xeon® and compatible processors.

Project file merging

Andrew_Smith
Valued Contributor I
360 Views
I am part of a small software team and we frequently need to merge changes to project files. The fortran source is not a problem but xml project files have an issue which would be fantastic if it could be resolved by Intel. The problem is that the xml is not saved in any kind of order. Therefore two saves of the same project file can give hundreds of swapped lines making the two versions of the same file look very different. If two people add a new file to the project, the task of finding and merging these changes is very difficult. It can get impossible to do if more than a few changes are made.

Could the xml be sorted alphabetically when IVF saves it, or can you suggest an xml merge tool?
0 Kudos
3 Replies
Steven_L_Intel1
Employee
360 Views
Which version of Intel Visual Fortran are you using? In the examples I looked at, the source files were all listed alphabetically.
0 Kudos
Andrew_Smith
Valued Contributor I
360 Views

I am using 11.0

The parts that are non-alphabetical are the configuration settings. As well as the project configutations which can switch order, any file specific configrations come out in random order. The order seams consistent througout the saved xml though.

My project has hundreds of include files under different folders. Theoretically I dont need to have them listed as part of the project, but it makes the project easier to navigate if they are. Since I use .f90 for include files, I need to set these as do not compile for all configurations. I prefer to use .f90 since it makes it simpler to move files in and out of modules during development.
0 Kudos
Steven_L_Intel1
Employee
360 Views
Try 11.1. I think we already fixed this.
0 Kudos
Reply