I usually prefer to put the project.res in the .ignore list to keep it out of version control. In some projects where it is under version control for some reason I just resolve the conflicts manually, "resolve using mine" or "resolve using theirs", depending on context. (There's not much more you can easily do with a binary file, anyway.)
By not having it in the SVC. Same for dproj and a variety of IDE files. For release builds, the .res is generated from scratch as part of the build process, so the .res isn't necessary.
I don't put the .res files into svn and don't let the ide generate them either. My icon goes into _icon.res the version info goes into _version.res, both are created externally in pre-build events. The .rc and .ico file for the icon goes into svn and also the .ini file used by dzprepbuild to generate the version resource. The version info generation in Delphi has been broken since Delphi 2005. :-(
Eric Grange Are you sure? IME you won't be able to compile your projects if they don't have .res files using MSBuild. And if you can't build with MSBuild then probably you can't do proper CI.
The IDE can recreate the .res on its own, what's in it only applies to the executable you build on dev machines, so it's not a problem if there is no icon or version info.
Eric Grange Sure IDE can recreate .res file but MSBuild can't. I don't know any professional software which doesn't have icon or version info. Personally I'm commiting .res and .dproj files to VCS because I want my project built successfully on the build server.
Recreating the .res is part of the build process as I said, MSBuild doesn't do it, it's just an autogenerated rc + brcc32 call, developers don't do release builds on their own machines. Also we don't use MSBuild for final builds anyway.
{$R filename.res filename.rc} doesn't work to well indeed, but you don't need it for the IDE to recreate it if you don't care about the contents. Just use {$R filename.res}, with no .rc or other IDE files.
Eric Grange - Using only the .res file sort of misses the point, since the point is that .rc files can be auto merged on changes, and committed to the VCS, avoiding the binary conflict situation.
What I'd like EMBT to do: - Ensure that the compiler is able to create the .res file from the .rc file if missing - using the {$R filename.res filename.rc} syntax.
- Move the Icon, Title, and Version content out of the .res file, and into an .rc file. {$R project_resources.res project_resources.rc}
I usually prefer to put the project.res in the .ignore list to keep it out of version control. In some projects where it is under version control for some reason I just resolve the conflicts manually, "resolve using mine" or "resolve using theirs", depending on context. (There's not much more you can easily do with a binary file, anyway.)
ReplyDeleteI have made a habit of reverting RES files on commit, or uncheck them. I wonder how others solved it
ReplyDeleteBy not having it in the SVC. Same for dproj and a variety of IDE files.
ReplyDeleteFor release builds, the .res is generated from scratch as part of the build process, so the .res isn't necessary.
I don't put the .res files into svn and don't let the ide generate them either. My icon goes into _icon.res the version info goes into _version.res, both are created externally in pre-build events. The .rc and .ico file for the icon goes into svn and also the .ini file used by dzprepbuild to generate the version resource. The version info generation in Delphi has been broken since Delphi 2005. :-(
ReplyDeleteEric Grange Are you sure? IME you won't be able to compile your projects if they don't have .res files using MSBuild. And if you can't build with MSBuild then probably you can't do proper CI.
ReplyDeleteThe IDE can recreate the .res on its own, what's in it only applies to the executable you build on dev machines, so it's not a problem if there is no icon or version info.
ReplyDeleteEric Grange Sure IDE can recreate .res file but MSBuild can't. I don't know any professional software which doesn't have icon or version info. Personally I'm commiting .res and .dproj files to VCS because I want my project built successfully on the build server.
ReplyDeleteRecreating the .res is part of the build process as I said, MSBuild doesn't do it, it's just an autogenerated rc + brcc32 call, developers don't do release builds on their own machines. Also we don't use MSBuild for final builds anyway.
ReplyDeleteI've had problems with a {$R filename.res filename.rc} statement failing from the IDE, if the .res file didn't already exists.
ReplyDelete{$R filename.res filename.rc} doesn't work to well indeed, but you don't need it for the IDE to recreate it if you don't care about the contents.
ReplyDeleteJust use {$R filename.res}, with no .rc or other IDE files.
Eric Grange - Using only the .res file sort of misses the point, since the point is that .rc files can be auto merged on changes, and committed to the VCS, avoiding the binary conflict situation.
ReplyDeleteWhat I'd like EMBT to do:
- Ensure that the compiler is able to create the .res file from the .rc file if missing - using the {$R filename.res filename.rc} syntax.
- Move the Icon, Title, and Version content out of the .res file, and into an .rc file.
{$R project_resources.res project_resources.rc}
That was already QC but iirc was closed as works as designed. Yes it does, but the design is bad.
ReplyDelete