Changeset 34098 for main/trunk/greenstone2/setup.bat

Timestamp:

2020-04-04T15:34:45+13:00 (4 years ago)

Author:

ak19

Message:

The inclusion of chcp 850 in setup.bat was not sufficient when Tracie Feng was working on her machine that's set to Chinese locale. The additional changes described at http://trac.greenstone.org/changeset/33793 were found to be necessary also. So am activating these additional changes by uncommenting them. This commit also contains some minor changes to comments.

File:

• main/trunk/greenstone2/setup.bat (modified) (2 diffs)

main/trunk/greenstone2/setup.bat

@@ -299 +299 @@
 
 
-:: On other localse, like Chinese locales, for XMLParsers to read (XML) files
+:: On other locales, like Chinese locales, for XMLParsers to read (XML) files
 :: in UTF-8 encoding (instead of defaulting to encoding GBK when on Chinese locale),
 :: need to pass -Dfile.encoding=UTF-8 to the JVM. Can have this passed to the JVM by
@@ -305 +305 @@
 :: For example, the example at https://www.mkyong.com/java/how-to-read-utf-8-xml-file-in-java-sax-parser/
 :: doesn't work in a Chinese locale until the program is run with 
-:: java -Dfile.encoding=UTF-8 <ReadXMLUTF8FileSAX>
+:: java -Dfile.encoding=UTF-8 <ReadXMLUTF8FileSAX>, so for GS3 this will be passed in to tomcat
+:: in build.xml
 ::
 ::set JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Dfile.encoding=UTF-8
-rem set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
+set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8