GNOME Bugzilla – Bug 478704
Unshipped files in Git trunk
Last modified: 2017-08-29 12:20:19 UTC
With GNOME 2.22 development just now getting under way, this seems like a good time for some fall cleaning. There's quite a few files still living in Subversion trunk that we do not ship in Evolution releases. The purpose of this bug is to sort out which of those files we *should* be shipping and which should be deleted. I'm of the opinion that, in general, trunk should only contain what we ship. If we need to resurrect a file down the road we can always fetch it from SCM archives. Keeping dead, unshipped source code files in trunk is especially detrimental to developers because someone will inevitably waste time maintaining them, not realizing or forgetting they're dead. I've lost track of the number of times this has happened to me. Here are the unshipped Evolution files currently in Subversion trunk: addressbook/gui/contact-editor/test-editor.c addressbook/gui/widgets/e-addressbook-treeview-adapter.c addressbook/gui/widgets/e-addressbook-treeview-adapter.h addressbook/gui/widgets/gal-view-factory-treeview.c addressbook/gui/widgets/gal-view-factory-treeview.h addressbook/gui/widgets/gal-view-treeview.c addressbook/gui/widgets/gal-view-treeview.h addressbook/gui/widgets/test-reflow.c addressbook/gui/printing/e-contact-print-envelope.c addressbook/gui/printing/e-contact-print-envelope.h addressbook/gui/tools/evolution-addressbook-abuse.c addressbook/gui/tools/evolution-addressbook-import.c calendar/gui/dialogs/calendar-setup.glade calendar/gui/dialogs/meeting-page.etspec calendar/gui/dialogs/new-calendar.glade calendar/gui/dialogs/new-task-list.glade calendar/gui/dialogs/url-editor-dialog.c calendar/gui/dialogs/url-editor-dialog.glade calendar/gui/dialogs/url-editor-dialog.h calendar/gui/e-pub-utils.c calendar/gui/e-pub-utils.h calendar/gui/gnome-calendar-conduit.png calendar/importers/main.c composer/bad-icon.xpm composer/e-msg-composer-attachment-bar.c composer/e-msg-composer-attachment-bar.h composer/e-msg-composer-attachment.c composer/e-msg-composer-attachment.glade composer/e-msg-composer-attachment.h designs/* } devel-docs/* } Move this stuff to the wiki or project page? doc/* } e-util/e-categories-master-list-wombat.c e-util/e-categories-master-list-wombat.h help/C/figures/Screenshot-Evolution-mailer-Preferences.png help/C/figures/evo_mail_callout_a.eps help/C/figures/evo_mail_callout_a.gif help/C/figures/evo_restore.png help/de/figures/Screenshot-Evolution-mailer-Preferences.png help/de/figures/evo_cal_prop_a.png help/es/README help/es/evolution-1.4-es.omf help/es/evolution-doc-1.4.po help/es/evolution-doc-2.6.po help/fr/figures/evo_cal_prop_a.png help/no/* } Oversight? help/quickref/hu/* } help/COPYING-DOCS help/ChangeLog.pre-1-4 help/README_Translations mail/importers/evolution-outlook-importer.c mail/importers/mozilla-status-headers.h mail/importers/netscape-importer.c mail/README.async mail/message-tags.glade plugins/attachment-reminder/apps-evolution-attachment-reminder-2.12.schemas plugins/bbdb/test-evobuddy.c plugins/ipod-sync/sync.c plugins/mono/Camel.cs plugins/mono/Evolution.cs plugins/select-one-source/mark-calendar-offline.c po/ChangeLog.pre-1-4 po/as.po } Oversight? shell/importer/* smime/tests/Makefile.am smime/tests/import-cert.c sounds/* tools/evolution-launch-composer.c widgets/misc/pixmaps/Makefile.am widgets/misc/test-charset-picker.c widgets/misc/test-color.c widgets/misc/test-error.c widgets/table/clip.png widgets/table/e-table-column.c widgets/table/e-table-config-field.c widgets/table/e-table-config-field.h widgets/table/e-table-example-1.c widgets/table/e-table-example-2.c widgets/table/e-table-size-test.c widgets/table/e-table-tree.h widgets/table/e-table.dia widgets/table/e-tree-simple.c widgets/table/e-tree-simple.h widgets/table/e-tree-sorted-variable.c widgets/table/e-tree-sorted-variable.h widgets/table/image1.png widgets/table/image2.png widgets/table/image3.png widgets/table/sample.table widgets/table/spec.xml widgets/table/table-test.c widgets/table/table-test.h widgets/table/test-check.c widgets/table/test-cols.c widgets/table/test-table.c widgets/text/e-entry-test.c widgets/text/e-text-model-test.c widgets/text/e-text-test.c widgets/LICENSE README.translators (I used meld to compare a Subversion checkout against the latest tarball.)
See also bug #478670, bug #478680 and bug #478692.
The mail/README.async contains useful information and should be shipped, as Jeff pointed out on evolution-hackers.
I found ChangeLog entries verifying the composer files listed above are dead. Removing those from Subversion...
The Netscape and Outlook importers have been dead since July, 2005. Removing those as well.
The sounds directory and its contents should be shipped. calendar/importers/icalendar-importer.c still refers to "default_alarm.wav" and configure.in still defines "soundsdir".
plugins/mono/Camel.cs plugins/mono/Evolution.cs cannot be removed. They are needed. we need to have the schema: plugins/attachment-reminder/apps-evolution-attachment-reminder-2.12.schemas I am not sure if the version should be hard-coded. This was done during hack-week. We missed something then.
(In reply to comment #6) > plugins/mono/Camel.cs > plugins/mono/Evolution.cs So these files should be shipped then? Looks like the schema file was fixed as part of bug #468159.
(In reply to comment #7) > (In reply to comment #6) > > plugins/mono/Camel.cs > > plugins/mono/Evolution.cs > > So these files should be shipped then? I will be making some changes to this directory soon. I'll be adding these files then. We need to update a few things in these files before shipping.
In bug #476926 I proposed removing the doc and devel-docs. I know there's some obsolete Camel docs in there that can be deleted. There's also the "Evolution Developer Guide" which, depending on how relevant the content still is, I may move to the project website via the gnomeweb-wml Subversion module.
Bug #489661 addresses the unshipped files in addressbook/gui/widgets.
I removed the following dead files from trunk. The dates below indicate when the file was removed from Makefile.am, according to source control history. addressbook/printing/e-contact-print-envelope.c (Apr 2007) addressbook/printing/e-contact-print-envelope.h (Apr 2007) addressbook/tools/evolution-addressbook-abuse.c (May 2004) addressbook/tools/evolution-addressbook-import.c (no history) calendar/gui/dialogs/calendar-setup.glade (Nov 2004) calendar/gui/dialogs/meeting-page.etspec (Sep 2003) calendar/gui/dialogs/new-calendar.glade (Jan 2003) calendar/gui/dialogs/new-task-list.glade (Jan 2004) calendar/gui/dialogs/url-editor-dialog.c (Dec 2005) calendar/gui/dialogs/url-editor-dialog.glade (Dec 2005) calendar/gui/dialogs/url-editor-dialog.h (Dec 2005) calendar/gui/e-pub-utils.c (Dec 2005) calendar/gui/e-pub-utils.h (Dec 2005) calendar/gui/gnome-calendar-conduit.png (May 2000) * winner! * e-util/e-categories-master-list-wombat.c (Jun 2005) e-util/e-categories-master-list-wombat.h (Jun 2005) tools/evolution-launch-composer.c (Jun 2003)
Do we still have more work to be done to close the bug ?
Let's wait until kill-bonobo is merged and then reevaluate. Lots of old files being replaced by new files, and I will probably forget to delete some of the old files.
Matthew, ping
Comparing the 3.2.0 tarball versus the gnome-3-2 branch: (Skipping the files obviously for git only...) addressbook/gui/contact-editor/test-editor.c capplet/settings/mail-autoconfig/gmail.com imap capplet/settings/mail-autoconfig/gmail.com pop capplet/settings/mail-autoconfig/jet.ne.jp imap capplet/settings/mail-autoconfig/jet.ne.jp pop capplet/settings/mail-autoconfig/t-online.de free capplet/settings/mail-autoconfig/t-online.de imap ssl capplet/settings/mail-autoconfig/t-online.de pop ssl capplet/settings/mail-autoconfig/wanadoo.fr imap capplet/settings/mail-autoconfig/wanadoo.fr pop data/evolution.1 designs/ devel-docs/ doc/devel/ doc/white-papers/ doc/COPYING-DOCS.CCBYSA doc/COPYING-DOCS.GFDL doc/Camel-Classes doc/Design doc/Keybindings doc/NAMESPACE mail/e-mail-pane.c mail/e-mail-pane.h plugins/bbdb/test-evobuddy.c smime/tests/Makefile.am smime/tests/import-cert.c widgets/table/e-table.dia widgets/table/sample.table widgets/table/spec.xml widgets/text/LICENSE COPYING-DOCS.CCBYSA COPYING-DOCS.GFDL README.translators
Since move to CMake evolution generates tarball using git, thus what's committed in git is in the tarball as well.