Changeset 34111


Ignore:
Timestamp:
2020-05-18T11:24:29+12:00 (4 years ago)
Author:
ak19
Message:

Undoing additions surrounding JAVA_TOOL_OPTIONS where file.encoding is set to utf-9, after discussing with Kathy and Dr Bainbridge. We think it possible that the changes to XMLConverter.java that enforce utf-8 as the char-encoding for reading in files will also fix the last remaining locale issue which required the JAVA_TOOL_OPTIONS of file.encoding=utf-8 to be passed in. Will still need to ask Shaoqun, in case she has a Win machine in Chinese locale, to test 3.09 vs the caveat for 3.10 that will contain this final commit. But our win machine generating the win nightlies runs overnight and is not accesible remotely. So the earlierst that test can be done is tomorrow.

Location:
main/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/setup.bash

    r34099 r34111  
    409409export WGETRC=$GSDLHOME/bin/$GSDLOS/wgetrc
    410410
    411 if [ "x$JAVA_TOOL_OPTIONS" = "x" ] ; then
    412     export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
    413 else
    414     export JAVA_TOOL_OPTIONS=$JAVA_TOOL_OPTIONS -Dfile.encoding=UTF-8
    415 fi
     411#if [ "x$JAVA_TOOL_OPTIONS" = "x" ] ; then
     412#    export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
     413#else
     414#    export JAVA_TOOL_OPTIONS=$JAVA_TOOL_OPTIONS -Dfile.encoding=UTF-8
     415#fi

  • main/trunk/greenstone2/setup.bat

    r34099 r34111  
    309309::
    310310:: https://stackoverflow.com/questions/37071353/how-to-check-if-a-variable-exists-in-a-batch-file
    311 if "x%JAVA_TOOL_OPTIONS%"=="x" (
    312    set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 
    313 ) else (
    314   set JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Dfile.encoding=UTF-8
    315 )
     311rem if "x%JAVA_TOOL_OPTIONS%"=="x" (
     312rem   set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 
     313rem ) else (
     314rem   set JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Dfile.encoding=UTF-8
     315rem )

  • main/trunk/greenstone3/build.xml

    r34098 r34111  
    24872487    <exec executable="${sudo.or.not}" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
    24882488      <!--<env key="GSDLOS" value="linux"/> do we need this?? -->
     2489      <!--<env key="JAVA_TOOL_OPTIONS" value="-Dfile.encoding=UTF-8"/>--><!-- Was needed by Windows for on e.g. Chinese locales, but added to unix for symmetry-->
    24892490      <env key="GSDL3HOME" value="${web.home}"/>
    24902491      <env key="PATH" path="${tomcat.path}"/>
    … …  
    24992500    </exec>
    25002501    <exec executable="${catalina.home}/bin/startup.bat" osfamily="windows" dir="${catalina.home}/bin" spawn="true">
    2501       <env key="JAVA_TOOL_OPTIONS" value="-Dfile.encoding=UTF-8"/>
     2502      <!--<env key="JAVA_TOOL_OPTIONS" value="-Dfile.encoding=UTF-8"/>-->
    25022503      <env key="GSDLOS" value="windows"/>
    25032504      <env key="GSDL3HOME" value="${web.home}"/>
    … …  
    25462547    <!--<exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">-->
    25472548    <exec executable="${sudo.or.not}" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
     2549      <!--<env key="JAVA_TOOL_OPTIONS" value="-Dfile.encoding=UTF-8"/>--><!-- Was needed by Windows for on e.g. Chinese locales, but added to unix for symmetry-->
    25482550      <env key="FEDORA_HOME" path="${fedora.home}"/>
    25492551      <env key="CATALINA_HOME" value="${catalina.home}"/>
    … …  
    25522554    </exec>
    25532555    <exec executable="${catalina.home}/bin/shutdown.bat" osfamily="windows" dir="${catalina.home}/bin" spawn="false">
    2554       <env key="JAVA_TOOL_OPTIONS" value="-Dfile.encoding=UTF-8"/>
     2556      <!--<env key="JAVA_TOOL_OPTIONS" value="-Dfile.encoding=UTF-8"/>--><!-- In case on stopping tomcat, GLI may read in some XML file during cleanup for exit? -->
    25552557      <env key="FEDORA_HOME" path="${fedora.home}"/>
    25562558      <env key="CATALINA_HOME" value="${catalina.home}"/>

  • main/trunk/greenstone3/gs3-setup.bat

    r34098 r34111  
    350350:: initialised in a set local/set enabledelayedexpansion section.
    351351:: See http://ss64.com/nt/endlocal.html
    352 rem endlocal & set RUNJAVA=%RUNJAVA%& set PATH=%PATH%& set GSDLOS=%GSDLOS%& set GSDLHOME=%GSDLHOME%& set GSDL3HOME=%GSDL3HOME%& set GSDL3SRCHOME=%GSDL3SRCHOME%& ^
    353 rem set JAVA_HOME=%JAVA_HOME%& set JRE_HOME=%JRE_HOME%& set ANT_HOME=%ANT_HOME%& set CLASSPATH=%CLASSPATH%
     352endlocal & set RUNJAVA=%RUNJAVA%& set PATH=%PATH%& set GSDLOS=%GSDLOS%& set GSDLHOME=%GSDLHOME%& set GSDL3HOME=%GSDL3HOME%& set GSDL3SRCHOME=%GSDL3SRCHOME%& ^
     353set JAVA_HOME=%JAVA_HOME%& set JRE_HOME=%JRE_HOME%& set ANT_HOME=%ANT_HOME%& set CLASSPATH=%CLASSPATH%
    354354
    355355:: For locales that are significantly different from the English locale, for example for
    … …  
    361361:: Finally, in DirectoryPlugin.pm, uncomment Alias.pm and rename *forLocaleIssue files
    362362:: in cpan\Encode to Alias.pm and the up-to-date Locale.pm.
    363 endlocal & set RUNJAVA=%RUNJAVA%& set PATH=%PATH%& set GSDLOS=%GSDLOS%& set GSDLHOME=%GSDLHOME%& set GSDL3HOME=%GSDL3HOME%& set GSDL3SRCHOME=%GSDL3SRCHOME%& ^
    364 set JAVA_HOME=%JAVA_HOME%& set JRE_HOME=%JRE_HOME%& set JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS%& set ANT_HOME=%ANT_HOME%& set CLASSPATH=%CLASSPATH%
     363rem endlocal & set RUNJAVA=%RUNJAVA%& set PATH=%PATH%& set GSDLOS=%GSDLOS%& set GSDLHOME=%GSDLHOME%& set GSDL3HOME=%GSDL3HOME%& set GSDL3SRCHOME=%GSDL3SRCHOME%& ^
     364rem set JAVA_HOME=%JAVA_HOME%& set JRE_HOME=%JRE_HOME%& set JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS%& set ANT_HOME=%ANT_HOME%& set CLASSPATH=%CLASSPATH%
    365365
    366366:end
Note: See TracChangeset for help on using the changeset viewer.