--------------Boundary-00=_7ECLV7KUKC4V1BSDDZXN Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Patch file: automake_dir_var_name.patch Affected files: kdevelop/kdevelop/cproject.{h,cpp} CVS Sync: Jun 27 14:33 Branch: KDEVELOP_1_4 Generated by: Lorenzo Delana Generated with: patch -u --new-file Short Descr.: apply nameing convention for automake directory variables Long Descr.: (from automake manual) /** How derived variables are named (...from GNU automake manual) * Sometimes a Makefile variable name is derived from some text the user * supplies. For instance program names are rewritten into Makefile macro * names. Automake canonicalizes this text, so that it does not have to * follow Makefile variable naming rules. All characters in the name except * for letters, numbers, and the underscore are turned into underscores when * making macro references. E.g., if your program is named sniff-glue, the * derived variable name would be sniff_glue_SOURCES, not sniff-glue_SOURCES. */ Backward Compatibility: all (y have to touch bugged Makefile.am to let KDevelop recreate it) Test rule: create a project, add a folder with name "test-one.org" and create into it a class "test", then try.... to apply this patch, from outside source tree of kdevelop: patch -p0 < automake_dir_var_name.patch Note: CVS Sync in the report, refers to my CVS snapshot that I have used to make the patch. bye Lore --------------Boundary-00=_7ECLV7KUKC4V1BSDDZXN Content-Type: text/x-c++; charset="iso-8859-1"; name="automake_dir_var_name.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="automake_dir_var_name.patch" LS0tIC91c3Ivc3JjNC9rZGV2ZWxvcC9rZGV2ZWxvcC9jcHJvamVjdC5oCVdlZCBKdW4gMjcgMTQ6 MzM6NTQgMjAwMQorKysga2RldmVsb3Ava2RldmVsb3AvY3Byb2plY3QuaAlXZWQgSnVuIDI3IDE1 OjIyOjU0IDIwMDEKQEAgLTUyNSw2ICs1MjUsMTcgQEAKICAgUVN0cmluZyBnZXREaXIoY29uc3Qg UVN0cmluZyYgcmVsX25hbWUpOwogICBRU3RyaW5nIGdldE5hbWUoY29uc3QgUVN0cmluZyYgcmVs X25hbWUpOwogCitwcm90ZWN0ZWQ6IC8vIFByb3RlY3RlZCBtZXRob2RzCisgIC8qKiBIb3cgZGVy aXZlZCB2YXJpYWJsZXMgYXJlIG5hbWVkICguLi5mcm9tIEdOVSBhdXRvbWFrZSBtYW51YWwpCisg ICAqIFNvbWV0aW1lcyBhIE1ha2VmaWxlIHZhcmlhYmxlIG5hbWUgaXMgZGVyaXZlZCBmcm9tIHNv bWUgdGV4dCB0aGUgdXNlcgorICAgKiBzdXBwbGllcy4gRm9yIGluc3RhbmNlIHByb2dyYW0gbmFt ZXMgYXJlIHJld3JpdHRlbiBpbnRvIE1ha2VmaWxlIG1hY3JvCisgICAqIG5hbWVzLiBBdXRvbWFr ZSBjYW5vbmljYWxpemVzIHRoaXMgdGV4dCwgc28gdGhhdCBpdCBkb2VzIG5vdCBoYXZlIHRvCisg ICAqIGZvbGxvdyBNYWtlZmlsZSB2YXJpYWJsZSBuYW1pbmcgcnVsZXMuIEFsbCBjaGFyYWN0ZXJz IGluIHRoZSBuYW1lIGV4Y2VwdAorICAgKiBmb3IgbGV0dGVycywgbnVtYmVycywgYW5kIHRoZSB1 bmRlcnNjb3JlIGFyZSB0dXJuZWQgaW50byB1bmRlcnNjb3JlcyB3aGVuCisgICAqIG1ha2luZyBt YWNybyByZWZlcmVuY2VzLiBFLmcuLCBpZiB5b3VyIHByb2dyYW0gaXMgbmFtZWQgc25pZmYtZ2x1 ZSwgdGhlCisgICAqIGRlcml2ZWQgdmFyaWFibGUgbmFtZSB3b3VsZCBiZSBzbmlmZl9nbHVlX1NP VVJDRVMsIG5vdCBzbmlmZi1nbHVlX1NPVVJDRVMuICovCQorICBRU3RyaW5nIGNhbm9uaWNhbERp ck5hbWUoUVN0cmluZyBkaXJfbmFtZSk7CisKIHByaXZhdGU6IC8vIFByb3RlY3RlZCBhdHRyaWJ1 dGVzCiAKICAgLyoqIFRoZSBhY3R1YWwgcHJvamVjdCBmaWxlLiAqLwotLS0gL3Vzci9zcmM0L2tk ZXZlbG9wL2tkZXZlbG9wL2Nwcm9qZWN0LmNwcAlXZWQgSnVuIDI3IDE0OjMzOjUzIDIwMDEKKysr IGtkZXZlbG9wL2tkZXZlbG9wL2Nwcm9qZWN0LmNwcAlXZWQgSnVuIDI3IDE1OjIyOjUzIDIwMDEK QEAgLTg1MiwxMyArODUyLDEzIEBACiAgICAgICAgICAgICBzdHJlYW0gPDwgIlxuSU5DTFVERVMg PSAkKGFsbF9pbmNsdWRlcylcblxuIjsKIAogICAgICAgICAgIGlmIChRRmlsZUluZm8oZ2V0UHJv amVjdERpcigpICsgImFtX2VkaXQiKS5leGlzdHMoKSB8fFFGaWxlSW5mbyhnZXRQcm9qZWN0RGly KCkgKyAiYWRtaW4vYW1fZWRpdCIpLmV4aXN0cygpKQotICAgICAgICAgICAgc3RyZWFtIDw8ICJs aWIiIDw8IGRpci5kaXJOYW1lKCkgPDwgIl9hX01FVEFTT1VSQ0VTID0gQVVUT1xuXG4iOworICAg ICAgICAgICAgc3RyZWFtIDw8ICJsaWIiIDw8IGNhbm9uaWNhbERpck5hbWUoZGlyLmRpck5hbWUo KSkgPDwgIl9hX01FVEFTT1VSQ0VTID0gQVVUT1xuXG4iOwogICAgICAgICAgIGVsc2UKICAgICAg ICAgICAgIGlmIChRRmlsZUluZm8oZ2V0UHJvamVjdERpcigpICsgImF1dG9tb2MiKS5leGlzdHMo KSkKLSAgICAgICAgICAgICAgc3RyZWFtIDw8ICJsaWIiIDw8IGRpci5kaXJOYW1lKCkgPDwgIl9h X01FVEFTT1VSQ0VTID0gVVNFX0FVVE9NT0NcblxuIjsKKyAgICAgICAgICAgICAgc3RyZWFtIDw8 ICJsaWIiIDw8IGNhbm9uaWNhbERpck5hbWUoZGlyLmRpck5hbWUoKSkgPDwgIl9hX01FVEFTT1VS Q0VTID0gVVNFX0FVVE9NT0NcblxuIjsKIAogICAgICAgICAgIHN0cmVhbSA8PCAibm9pbnN0X0xJ QlJBUklFUyA9IGxpYiIgPDwgZGlyLmRpck5hbWUoKSA8PCAiLmFcblxuIjsKLSAgICAgICAgICBz dHJlYW0gPDwgImxpYiIgPDwgZGlyLmRpck5hbWUoKSA8PCAiX2FfU09VUkNFUyA9ICIgPDwgc291 cmNlcyA8PCAiXG4iOworICAgICAgICAgIHN0cmVhbSA8PCAibGliIiA8PCBjYW5vbmljYWxEaXJO YW1lKGRpci5kaXJOYW1lKCkpIDw8ICJfYV9TT1VSQ0VTID0gIiA8PCBzb3VyY2VzIDw8ICJcbiI7 CiAgICAgICAgICAgaWYoaXNRdDJQcm9qZWN0KCkpCiAgICAgICAgICAgICAvLyBhbV9lZGl0IHVz ZWQgb25seSBmb3IgcXQgYXBwcyByZXF1aXJlcyB0aGlzIHN3aXRjaCBpbiBNYWtlZmlsZS5hbbRz IHRvIHVzZSB0ciBpbnN0ZWFkIG9mIGkxOG4gYW5kIG90aGVyIHNwZWNpZmljIHN0dWZmCiAgICAg ICAgICAgICBzdHJlYW0gPDwgIktERV9PUFRJT05TID0gcXRvbmx5XG4iOwpAQCAtMTkxMCw0ICsx OTEwLDE0IEBACiB7CiAgIENLRGV2ZWxvcCogZ2tkZXZlbG9wID0gZHluYW1pY19jYXN0PENLRGV2 ZWxvcCo+KHFBcHAtPm1haW5XaWRnZXQoKSk7CiAgIHJldHVybiBna2RldmVsb3A/Z2tkZXZlbG9w LT5nZXRQcm9qZWN0KCk6MEw7Cit9CisKK1FTdHJpbmcgQ1Byb2plY3Q6OmNhbm9uaWNhbERpck5h bWUoUVN0cmluZyBkaXJfbmFtZSkKK3sKKyAgUVN0cmluZyBjYW5vbmljYWxfZGlyX25hbWUgPSBk aXJfbmFtZTsKKwkKKyAgLy8gcmVwbGFjZXMgYWxsIGNoYXJhY3RlciwgZXhjZXB0IGZvciBbQS1a YS16MC05X10gY2xhc3MsIHdpdGggdW5kZXJzY29yZQorICBjYW5vbmljYWxfZGlyX25hbWUucmVw bGFjZShRUmVnRXhwKCJbXkEtWmEtejAtOV9dIiksICJfIik7CisJCisgIHJldHVybiBjYW5vbmlj YWxfZGlyX25hbWU7CiB9Cg== --------------Boundary-00=_7ECLV7KUKC4V1BSDDZXN-- - to unsubscribe from this list send an email to kdevelop-devel-request@kdevelop.org with the following body: unsubscribe »your-email-address«