Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Use encoding iso 8859 1 #69

Closed
wants to merge 2 commits into from
Closed

WIP: Use encoding iso 8859 1 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ac06a7
Print source encoding being used
Mesbah-Alam Oct 9, 2019
5f64de2
Use encoding ISO-8859-1 for compiling system tests
Mesbah-Alam Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions stf.build/include/top.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ limitations under the License.
<condition property="isOpenJ9" value="true" else="false" >
<contains string="${java_java_vm_vendor}" substring="J9"/>
</condition>

<condition property="isZOS" value="true">
<equals arg1="${os.name}" arg2="z/OS"/>
</condition>

<condition property="download-tool" value="curl" else="wget">
<isset property="isZOS"/>
</condition>

<!--
Determine the java version being used for the build and set properties for use by build.xml files.
Expand Down Expand Up @@ -362,18 +370,6 @@ limitations under the License.
<available file="curl" filepath="${env.PATH}" property="curl_available"/>
</target>

<condition property="isZOS" value="true">
<equals arg1="${os.name}" arg2="z/OS"/>
</condition>

<condition property="src-encoding" value="IBM-1047" else="UTF-8">
<isset property="isZOS"/>
</condition>

<condition property="download-tool" value="curl" else="wget">
<isset property="isZOS"/>
</condition>

<condition property="download-tool-security-options" value="-k" else="--no-check-certificate">
<isset property="isZOS"/>
</condition>
Expand Down
4 changes: 2 additions & 2 deletions stf.core/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ limitations under the License.
fork="true"
executable="${java_compiler}"
classpathref="project.class.path"
encoding="${src-encoding}"
encoding="ISO-8859-1"
includeantruntime="false"
failonerror="true">
<include name="**/*.java"/>
Expand All @@ -95,7 +95,7 @@ limitations under the License.
fork="true"
executable="${java_compiler}"
classpathref="project.class.path"
encoding="${src-encoding}"
encoding="ISO-8859-1"
includeantruntime="false"
failonerror="true">
<include name="**/*.java"/>
Expand Down
2 changes: 1 addition & 1 deletion stf.load/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ limitations under the License.
fork="true"
executable="${java_compiler}"
classpathref="project.class.path"
encoding="${src-encoding}"
encoding="ISO-8859-1"
includeantruntime="false"
failonerror="true">
<include name="**/*.java"/>
Expand Down
2 changes: 1 addition & 1 deletion stf.samples/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ limitations under the License.
fork="true"
executable="${java_compiler}"
classpathref="project.class.path"
encoding="${src-encoding}"
encoding="ISO-8859-1"
includeantruntime="false"
failonerror="true">
<include name="**/*.java"/>
Expand Down