73467 2004-01-25 15:39:10 +0000 Incomplete make clean for parts/appwizard/common 2004-01-25 21:22:24 +0000 1 1 2 Applications kdevelop general git master Debian stable Linux RESOLVED FIXED NOR wishlist --- 1 elendil kdevelop-devel 0 oldest_to_newest 198720 0 elendil 2004-01-25 15:39:10 +0000 Version: 3.0.0b2 (kdevelop-040106cvs) (using KDE KDE 3.1.4) Installed from: Debian stable Packages OS: Linux 'make clean' does not remove the *.tar.gz files created in the parts/appwizard/common direcory. Will attach a patch that fixes this. 198722 1 4345 elendil 2004-01-25 15:43:30 +0000 Created attachment 4345 Patch (adds CLEANFILES to Makefile.am) Alternatively the files to be removed could be listed individually in CLEANFILES: - admin.tar.gz - gnome.tar.gz - gnu.tar.gz - incadmin.tar.gz - wxwindows.tar.gz 198763 2 a.lucas 2004-01-25 18:07:03 +0000 Thanks again!!! 198814 3 amilcar 2004-01-25 21:22:25 +0000 Subject: kdevelop CVS commit by aclu: This patch fixes: Bug 71003 : Cannot translate project due to srcdir != builddir. Bug 73467: Incomplete make clean for parts/appwizard/common 1. buildtools/autotools/addtranslationdlg.cpp Problem here was that a make was called in <projectDir>/po, but when Build configuration is debug there is no makefile in that directory. So the make has to be called from <buildDir>/po. The 'force-reedit' works fine because it changes internally to <projectDir>/po for most of it's actual work. 2. parts/appwizard/common/kde-Makefile.am This patch is slightly different from the patch proposed earlier. 'make-messages' has to work in the <projectDir> tree, taking the source from <projectDir>/src and writing the .pot file to <projectDir>/po. 3. parts/appwizard/common/admin/am_edit The '$(MAKE) -C po merge' form 'make messages' again needs to work in the <projectDir>/po directory, merging the .pot file into the .po files. 4. parts/appwizard/common/Makefile.am 'make clean' does not remove the *.tar.gz files created in the parts/appwizard/common directory. To make this patch work you need to: cd parts/appwizard/common make clean Thanks to Frans Pop <aragorn IN tiscali.nl> for the patch. CCMAIL: 71003-done@bugs.kde.org CCMAIL: 73467-done@bugs.kde.org M +1 -0 buildtools/autotools/addtranslationdlg.cpp 1.8 M +2 -0 parts/appwizard/common/Makefile.am 1.14 M +1 -1 parts/appwizard/common/kde-Makefile.am 1.3 M +2 -2 parts/appwizard/common/admin/am_edit 1.6 --- kdevelop/buildtools/autotools/addtranslationdlg.cpp #1.7:1.8 @@ -100,4 +100,5 @@ void AddTranslationDialog::accept() f.close(); + dir = m_part->buildDirectory() + "/po"; m_part->startMakeCommand(dir, QString::fromLatin1("force-reedit")); --- kdevelop/parts/appwizard/common/admin/am_edit #1.5:1.6 @@ -1612,5 +1612,5 @@ if (!$lang) { - appendLines("merge:\n\t\$(MAKE) -f \$(top_srcdir)/admin/Makefile.common package-merge POFILES=\"\${POFILES}\" PACKAGE=\${PACKAGE}\n\n"); + appendLines("merge:\n\t\$(MAKE) -C \$(top_srcdir)/po -f \$(top_srcdir)/admin/Makefile.common package-merge POFILES=\"\${POFILES}\" PACKAGE=\${PACKAGE}\n\n"); } --- kdevelop/parts/appwizard/common/Makefile.am #1.13:1.14 @@ -1,2 +1,4 @@ +CLEANFILES = *.tar.gz + admin.tar.gz: $(TAR) -cf admin.tar -C $(srcdir) admin --- kdevelop/parts/appwizard/common/kde-Makefile.am #1.2:1.3 @@ -13,5 +13,5 @@ package-messages: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common package-messages + cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-messages $(MAKE) -C po merge 4345 2004-01-25 15:43:30 +0000 2004-01-25 15:43:30 +0000 Patch (adds CLEANFILES to Makefile.am) clean_tar.gz.diff text/plain 287 elendil LS0tIGtkZXZlbG9wMy0zLjAtMDFjdnMvcGFydHMvYXBwd2l6YXJkL2NvbW1vbi9NYWtlZmlsZS5h bQlUaHUgT2N0ICAyIDAwOjQ2OjMyIDIwMDMKKysrIGtkZXZlbG9wMy0zLjAtMDFjdnMuZmpwL3Bh cnRzL2FwcHdpemFyZC9jb21tb24vTWFrZWZpbGUuYW0JU2F0IEphbiAyNCAxOToyNjo0MSAyMDA0 CkBAIC0xLDMgKzEsNSBAQAorQ0xFQU5GSUxFUyA9ICoudGFyLmd6CisKIGFkbWluLnRhci5nejoK IAkkKFRBUikgLWNmIGFkbWluLnRhciAtQyAkKHNyY2RpcikgYWRtaW4KIAlnemlwIGFkbWluLnRh cgo=