11266 2006-10-12 10:57:37 -0700 [S60] Both RnD and SDK icons are being used 2006-10-27 18:20:04 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ S60 Emulator S60 3rd edition CLOSED FIXED P2 Normal --- 1 bradley.morrison bradley.morrison S60webkit oldest_to_newest 53430 0 bradley.morrison 2006-10-12 10:57:37 -0700 Recent changes to WebKit\group\icons.mk are incorrect as icons are being created/checked for both RnD and SDK locations. Only one or the other should be created. Depending on the style of compilation. 53431 1 bradley.morrison 2006-10-12 11:01:32 -0700 The cleanest way to do this is to set an environment variable in the build script, and change icon.mk to generate/check the relevant type of icons depending on the value of that environment variable. I dumped the environment variable that the makefile has and while I could probably key it off something that already exists, it would probably be obscure and more difficult to maintain (like version numbers in MWCSym2Includes, for example). Therefore I think new environment variable BROWSER_SDK should be set. Surprising this has not been required before. 53433 2 11049 bradley.morrison 2006-10-12 11:29:32 -0700 Created attachment 11049 icons.mk queries envionment to determine which icons to create 53436 3 11049 zalan 2006-10-12 11:43:53 -0700 Comment on attachment 11049 icons.mk queries envionment to determine which icons to create r=me 53438 4 bradley.morrison 2006-10-12 11:51:40 -0700 (In reply to comment #3) > (From update of attachment 11049 [edit]) > r=me > Thanks - applied r17012 52416 5 krishnamurty.podipireddy 2006-10-16 10:50:18 -0700 TSW ID: KPOY-6UMLFN 49023 6 krishnamurty.podipireddy 2006-10-27 18:20:04 -0700 S60WebKitTrunkSDK\20061027161039 Also Closed. 11049 2006-10-12 11:29:32 -0700 2006-10-12 11:43:53 -0700 icons.mk queries envionment to determine which icons to create 11126.patch text/plain 3579 bradley.morrison SW5kZXg6IGJ1aWxkLmJhdA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIGJ1aWxkLmJhdAkocmV2aXNpb24gMTcw MDkpDQorKysgYnVpbGQuYmF0CSh3b3JraW5nIGNvcHkpDQpAQCAtMTAwLDEwICsxMDAsMTEgQEAN CiAgIC4gJEVOVntQQVRIfTsNCiBkZWxldGUgJEVOVnsnTVdTWU0yTElCUkFSSUVTJ307DQogJEVO VnsnQVJDSElWRVInfSA9ICdhcm0tbm9uZS1zeW1iaWFuZWxmLWFyJzsNCiskRU5WeydCUk9XU0VS X1NESyd9ID0gMTsgIyBxdWVyaWVkIGJ5IHRoZSBHTlUgbWFrZWZpbGVzDQogDQogaWYgKCAkb3B0 c3tlfSApIHsNCiAgICAgZm9yICgNCi0gICAgICAgIHF3IC9DV0ZvbGRlciBMTV9MSUNFTlNFX0ZJ TEUgRVBPQ1JPT1QgTVdDU3ltMkluY2x1ZGVzIE1XTGlicmFyaWVzIE1XU3ltMkxpYnJhcnlGaWxl cyBQQVRIIEFSQ0hJVkVSLw0KKyAgICAgICAgcXcgL0NXRm9sZGVyIExNX0xJQ0VOU0VfRklMRSBF UE9DUk9PVCBNV0NTeW0ySW5jbHVkZXMgTVdMaWJyYXJpZXMgTVdTeW0yTGlicmFyeUZpbGVzIFBB VEggQVJDSElWRVIgQlJPV1NFUl9TREsvDQogICAgICAgKQ0KICAgICB7DQogICAgICAgICBwcmlu dCAic2V0ICRfPSRFTlZ7JF99XG4iOw0KSW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0t IENoYW5nZUxvZwkocmV2aXNpb24gMTcwMTApDQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSw1ICsxLDEzIEBADQogMjAwNi0xMC0xMiAgYnJtb3JyaXMgIDx0aGlzaXNicmFkbGV5 QGdtYWlsLmNvbT4NCiANCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLg0KKyAg ICAgICAgREVTQzogR2VuZXJhdGUvY2hlY2sgb25seSB0aGUgY29ycmVjdCBXZWJLaXQgaWNvbnMg ZGVwZW5kaW5nIG9uIGJ1aWxkIGZsYXZvdXINCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExMjY2DQorDQorICAgICAgICAqIGJ1aWxkLmJhdDogc2V0IEJS T1dTRVJfU0RLIGVudmlyb25tZW50IHZhcmlhYmxlDQorDQorMjAwNi0xMC0xMiAgYnJtb3JyaXMg IDx0aGlzaXNicmFkbGV5QGdtYWlsLmNvbT4NCisNCiAgICAgICAgIFJldmlld2VkIGJ5IFphbGFu Lg0KICAgICAgICAgREVTQzogR2NjZSBjb21waWxhdGlvbiBpc3N1ZXMNCiAgICAgICAgIGh0dHA6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0MzUNCkluZGV4OiBXZWJLaXQvQ2hh bmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMTcwMTAp DQorKysgV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQ0KQEAgLTEsNSArMSwxMyBAQA0K IDIwMDYtMTAtMTIgIGJybW9ycmlzICA8dGhpc2lzYnJhZGxleUBnbWFpbC5jb20+DQogDQorICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4NCisgICAgICAgIERFU0M6IEdlbmVyYXRl L2NoZWNrIG9ubHkgdGhlIGNvcnJlY3QgV2ViS2l0IGljb25zIGRlcGVuZGluZyBvbiBidWlsZCBm bGF2b3VyDQorICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTI2Ng0KKw0KKyAgICAgICAgKiBncm91cC9pY29ucy5tazogV29yayBvZmYgQlJPV1NFUl9TREsg ZXZhciB0byBjaGVjay9jcmVhdGUgY29ycmVjdCBpY29ucy4NCisNCisyMDA2LTEwLTEyICBicm1v cnJpcyAgPHRoaXNpc2JyYWRsZXlAZ21haWwuY29tPg0KKw0KICAgICAgICAgUmV2aWV3ZWQgYnkg WmFsYW4uDQogICAgICAgICBERVNDOiBHY2NlIGNvbXBpbGF0aW9uIGZpeGVzDQogICAgICAgICBo dHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDM1DQpJbmRleDogV2ViS2l0 L2dyb3VwL2ljb25zLm1rDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2dyb3VwL2ljb25zLm1rCShy ZXZpc2lvbiAxNzAwOCkNCisrKyBXZWJLaXQvZ3JvdXAvaWNvbnMubWsJKHdvcmtpbmcgY29weSkN CkBAIC01MCwxNCArNTAsMTQgQEANCiBUQVJHRVRESVI9JChaRElSKVxSZXNvdXJjZVxBUFBTDQog SEVBREVSRElSPVxlcG9jMzJcaW5jbHVkZQ0KIA0KLSNDcmVhdGUgYWxsIGZvbGxvd2luZyBhcyBy ZXF1aXJlZCBpbiBTREsgJiBTNjANCitpZm5lcSAoLCQoZmluZHN0cmluZyAxLCQoQlJPV1NFUl9T REspKSkNCiBJQ09OVEFSR0VURklMRU5BTUU9JChUQVJHRVRESVIpXFdlYktpdEljb25zX3Nkay5N SUYNCiBIRUFERVJGSUxFTkFNRT0kKEhFQURFUkRJUilcV2ViS2l0SWNvbnNfc2RrLk1CRw0KK2Vs c2UNCitJQ09OVEFSR0VURklMRU5BTUU9JChUQVJHRVRESVIpXHdlYmtpdGljb25zLm1pZg0KK0hF QURFUkZJTEVOQU1FPSQoSEVBREVSRElSKVx3ZWJraXRpY29ucy5tYmcNCitlbmRpZg0KIA0KLUlD T05UQVJHRVRGSUxFTkFNRTE9JChUQVJHRVRESVIpXHdlYmtpdGljb25zLm1pZg0KLUhFQURFUkZJ TEVOQU1FMT0kKEhFQURFUkRJUilcd2Via2l0aWNvbnMubWJnDQotDQotDQogZG9fbm90aGluZyA6 DQogDQogTUFLTUFLRSA6IGRvX25vdGhpbmcNCkBAIC0xMDAsMjkgKzEwMCwxMiBAQA0KIC9jOCw4 IHFnbl9pbmRpX2FpX250X21lc3NhZ2Uuc3ZnDQogDQogDQotCW1pZmNvbnYgJChJQ09OVEFSR0VU RklMRU5BTUUxKSAvaCQoSEVBREVSRklMRU5BTUUxKSBcDQotL2M4LDEgcWduX2luZGlfd21sX2lt YWdlX25vdF9zaG93bi5zdmdcDQotL2M4LDEgcWduX3Byb3Bfd21sX3NlbGVjdGFycm93LnN2Z1wN Ci0vYzgsMSBxZ25fcHJvcF93bWxfb2JqZWN0LnN2Z1wNCi0vYzgsMSBxZ25fcHJvcF93bWxfcmFk aW9idXR0X29mZi5zdmdcDQotL2M4LDEgcWduX3Byb3Bfd21sX3JhZGlvYnV0dF9vbi5zdmdcDQot L2M4LDEgcWduX3Byb3Bfd21sX2NoZWNrYm94X29mZi5zdmdcDQotL2M4LDEgcWduX3Byb3Bfd21s X2NoZWNrYm94X29uLnN2Z1wNCi0vYzgsMSBxZ25fcHJvcF93bWxfc2VsZWN0ZmlsZS5zdmdcDQot L2M4LDggcWduX2luZGlfdmlld2VyX3BvaW50ZXIuc3ZnXA0KLS9jOCw4IHFnbl9pbmRpX3ZpZXdl cl9wb2ludGVyX2hhbmQuc3ZnXA0KLS9jOCw4IHFnbl9pbmRpX3ZpZXdlcl9wb2ludGVyX3dhaXQu c3ZnXA0KLS9jOCw4IHFnbl9wcm9wX25ydHlwX3Bob25lLnN2Z1wNCi0vYzgsOCBxZ25faW5kaV9h aV9udF9tZXNzYWdlLnN2Zw0KLQ0KIEZSRUVaRSA6IGRvX25vdGhpbmcNCiANCiBTQVZFU1BBQ0Ug OiBkb19ub3RoaW5nDQogDQogUkVMRUFTQUJMRVMgOg0KIAlAZWNobyAkKEhFQURFUkZJTEVOQU1F KSYmIFwNCi0JQGVjaG8gJChJQ09OVEFSR0VURklMRU5BTUUpIFwNCi0JQGVjaG8gJChIRUFERVJG SUxFTkFNRTEpJiYgXA0KLQlAZWNobyAkKElDT05UQVJHRVRGSUxFTkFNRTEpDQorCUBlY2hvICQo SUNPTlRBUkdFVEZJTEVOQU1FKQ0KIA0KIEZJTkFMIDogZG9fbm90aGluZw0K