Skip to content

Conversation

@mtbc
Copy link
Member

@mtbc mtbc commented Feb 13, 2013

No description provided.

@mtbc
Copy link
Member Author

mtbc commented Feb 13, 2013

In rebasing this to develop include 08c0721

@manics
Copy link
Member

manics commented Feb 14, 2013

All Java \u escapes have been removed, $ git grep '\\u' -- '*java' returns nothing, builds fine.

$ git grep -A16 '<javac' -- '*.xml'shows two files with javac tasks that don't have the encoding parameter, though don't know if it's required here:
components/insight/build/app.xml
components/insight/build/test.xml

@manics
Copy link
Member

manics commented Feb 14, 2013

Also it looks like our code is free of non-unicode chars (using https://gist.github.com/manics/4707338)

$ find . -type f \( -name \*.java -or -name \*.py -or -name \*.txt -or -name \*.hpp -or -name \*.cpp -or -name \*.js -or -name \*.css -or -name \*.html -or -name \*.htm -or -name \*.xml -or -name \*.xslt -or -name \*.xsd -or -name \*.sql -or -name \*.pl -or -name \*.ice -or -name \*.asm -or -name \*.rst \) -exec sh -c 'check_utf8.py "{}" || echo "FAIL: {}"' \;
./components/bioformats/components/forks/jai/COPYRIGHT.txt contains invalid UTF-8
FAIL: ./components/bioformats/components/forks/jai/COPYRIGHT.txt
./components/insight/build/tools/findbugs-1.2.1/LICENSE-AppleJavaExtensions.txt contains invalid UTF-8
FAIL: ./components/insight/build/tools/findbugs-1.2.1/LICENSE-AppleJavaExtensions.txt
./lib/findbugs-1.2.1/LICENSE-AppleJavaExtensions.txt contains invalid UTF-8
FAIL: ./lib/findbugs-1.2.1/LICENSE-AppleJavaExtensions.txt

@mtbc
Copy link
Member Author

mtbc commented Feb 14, 2013

Thanks, I hadn't actually noticed Insight's app.xml and test.xml files.

@manics
Copy link
Member

manics commented Feb 15, 2013

Builds fine. I think this is good to merge, unless the separate whitespace commit is a must instead of a "next time".

@joshmoore
Copy link
Member

@manics: definitely more a "next time" sort of thing.

Otherwise, UTF-8 changes all look fine. Holding off until Monday for comments from @jburel.

@jburel
Copy link
Member

jburel commented Feb 18, 2013

Everything looks fine. Merging

jburel added a commit that referenced this pull request Feb 18, 2013
unescape UTF-8 literals in Java source code
@jburel jburel merged commit 41610f2 into ome:dev_4_4 Feb 18, 2013
@mtbc mtbc deleted the utf-8 branch February 18, 2013 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants