Skip to content

[WIP] Windows Support #234

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.

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

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
version: build {build} {branch}

image: Visual Studio 2017

# init:
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

install:
- ps: |
Add-Type -AssemblyName System.IO.Compression.FileSystem
if (!(Test-Path -Path "C:\ant\apache-ant-1.10.2" )) {
(new-object System.Net.WebClient).DownloadFile(
'https://www.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip',
'C:\ant-bin.zip'
)
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\ant-bin.zip", "C:\ant")
}
- cmd: SET JAVA_HOME=C:\Program Files\Java\jdk10
- cmd: SET PATH=C:\ant\apache-ant-1.10.5\bin;%JAVA_HOME%\bin;%PATH%
- cmd: echo %USERPROFILE%
- cmd: echo %PATH%
- cmd: java -version
- cmd: git submodule update --init --recursive

build_script:
- ant compile

test_script:
- som core-lib/TestSuite/TestRunner.ns

# on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

cache:
- C:\ant
78 changes: 0 additions & 78 deletions .travis.yml

This file was deleted.

25 changes: 22 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@
<!-- <property name="lib.url" value="https://dl.bintray.com/smarr/SOM" /> -->
<property name="lib.url" value="http://stefan-marr.de/dev" />

<property name="mx.cmd" value="../../mx/mx" />
<condition property="is.windows" value="true" else="false">
<os family="windows"/>
</condition>

<property name="mx.cmd" location="${lib.dir}/mx/mx" unless:true="${is.windows}" />
<property name="mx.cmd" location="${lib.dir}\mx\mx.cmd" if:true="${is.windows}" />

<property name="build.dir" value="build"/>
<property name="classes.dir" value="${build.dir}/classes"/>
Expand Down Expand Up @@ -143,7 +148,7 @@
</target>
<target name="truffle-submodule" depends="check-truffle-available"
unless="truffle.present">
<exec executable="./.gitloadmodules" failonerror="true">
<exec executable="./.gitloadmodules" failonerror="true" unless:true="${is.windows}">
</exec>
</target>

Expand All @@ -158,6 +163,20 @@
</exec>
<travis target="truffle-libs" />
</target>

<target name="build-graal" description="Build the embedded Graal" unless="skip.graal">
<echo unless:true="${is.atLeastJava9}" level="warning">
The used JDK needs to have JVMCI support, which is the case for Java 9.
If Java 8 is needed, see
http://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html
for a JVMCI JDK Download.
</echo>

<exec executable="${mx.cmd}" dir="${graal.dir}" failonerror="true">
<arg value="build" />
<arg value="--no-native" />
</exec>
</target>

<target name="bd-libs"> <!-- implicit dependency on truffle-libs -->
<travis target="bd-libs" start="Build Black Diamonds" />
Expand Down Expand Up @@ -438,7 +457,7 @@
<exec executable="tests/superinstructions/test.sh" failonerror="true"></exec>
<travis target="si-tests" />
</target>

<target name="update-test-data" depends="compile-som" description="Updates the test data for DynamicMetrics and SuperInstructions">
<exec executable="tests/dym/test.sh" failonerror="true">
<arg value="update" />
Expand Down