Closed Bug 365785 Opened 16 years ago Closed 16 years ago

Mac: Remove extra UTF-16 to UTF-8 conversion of InfoPlist.strings.in

Categories

(Calendar :: General, defect)

PowerPC
macOS
defect
Not set
minor

Tracking

(Not tracked)

RESOLVED FIXED
Sunbird 0.5

People

(Reporter: mattwillis, Assigned: mattwillis)

References

Details

Attachments

(1 file, 2 obsolete files)

There's an unneeded UTF-16 to UTF-8 conversion of InfoPlist.strings.in when we build Mac Sunbird.

Simplifying would allow the file to remain in CVS as UTF-8, where it could be indexed by LXR and human-readable in cvs diff.
Attached patch Removes extra iconv step (obsolete) — Splinter Review
Special note:

Since InfoPlist.strings.in is currently UTF-16, and cvs doesn't deal with UTF-16 as text, cvs diff doesn't show the change.

When committing this, we'll need to cvs rm the existing InfoPlist.strings.in to remove the binary (-kb) flag. 

InfoPlist.strings.in actually looks like this:

/* Localized versions of Info.plist keys */

CFBundleName = @APP_NAME@;
NSHumanReadableCopyright = "Copyright © 1998-2007 Contributors.";
Attachment #250342 - Flags: first-review?
Attachment #250342 - Flags: first-review? → first-review?(philringnalda)
Attached patch Less iconv, more file (obsolete) — Splinter Review
Like so? Your patch was fun, since the build stopped while sed waited for you to type in the contents that you wanted passed to iconv, but I think using the file is more practical ;)

No need to remove and then add to get rid of -kb (re-adding always makes me nervous) - we know plenty of people with cvs admin perms, who can "cvs admin -k kv
mozilla/calendar/sunbird/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in" for us, and the build system doesn't care how long it's UTF-8 but still -kb, as long as it gets done before next year's Happy New Year Patching.
Attachment #250342 - Attachment is obsolete: true
Attachment #250426 - Flags: first-review?(lilmatt)
Attachment #250342 - Flags: first-review?(philringnalda)
Gavin: I know you had lots of fun with -k kv last time, so I halfway volunteered your future services. Luckily, nobody will know I meant you, if you don't want to do it.
Pardon me while I thrash around in your queue. I didn't mean that patch with the typo that creates an empty file, I meant this one, that also doesn't rsync over the .strings.in before it creates the .strings
Attachment #250426 - Attachment is obsolete: true
Attachment #250433 - Flags: first-review?(lilmatt)
Attachment #250426 - Flags: first-review?(lilmatt)
And as Gavin pointed out, I really should read the CVS manual once more, with my eyes open: "(except for the cvs admin -k command, which can be run by anybody)" implies that even I ought to be able to manage it.
Comment on attachment 250433 [details] [diff] [review]
Fewer typos, less rsync of .in

nit: remove one of the two spaces before the pipe character

r=lilmatt with that
Attachment #250433 - Flags: first-review?(lilmatt) → first-review+
calendar/sunbird/app/Makefile.in 1.44, 1.21.2.15
calendar/sunbird/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in 1.2, 1.1.2.2

and a little -k kv, and I think we're fixed. (Several hours ago, but I don't seem to have clicked the Commit button.)
Status: ASSIGNED → RESOLVED
Closed: 16 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.