Skip to content

Commit b4aecde

Browse files
committed
Add Appveyor integration
1 parent 4b5a2bb commit b4aecde

File tree

3 files changed

+30
-6
lines changed

3 files changed

+30
-6
lines changed

.appveyor.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: '{build}'
2+
os: Windows Server 2012
3+
install:
4+
- cmd: choco install sbt -ia "INSTALLDIR=""C:\sbt"""
5+
- cmd: SET PATH=C:\MinGW\msys\1.0\bin;C:\sbt\bin;%JAVA_HOME%\bin;%PATH%
6+
clone_depth: 50
7+
build_script:
8+
- cd %APPVEYOR_BUILD_FOLDER%
9+
- git submodule update --init --recursive --depth 50 --jobs 3
10+
- git show
11+
- pwd
12+
# - bash project/scripts/sbt compile
13+
- sbt "dotty-bootstrapped/compile"
14+
test_script:
15+
- pwd
16+
# - bash project/scripts/sbt test
17+
# - bash project/scripts/sbt "dotty-bootstrapped/test"
18+
# - bash project/scripts/sbt "dotty-bootstrapped/testCompilation"
19+
- cmd: project/scripts/cmdTests.bat
20+
- cmd: project/scripts/bootstrapCmdTests.bat
21+
cache:
22+
- C:\sbt\
23+
- C:\Users\appveyor\.ivy2

compiler/src/dotty/tools/dotc/consumetasty/ConsumeTasty.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ object ConsumeTasty {
1717
}
1818

1919
val currentClasspath = QuoteDriver.currentClasspath
20-
val args = "-from-tasty" +: "-classpath" +: s"$classpath:$currentClasspath" +: classes
20+
val sep = java.io.File.pathSeparator
21+
val args = "-from-tasty" +: "-classpath" +: s"$classpath$sep$currentClasspath" +: classes
2122
(new Consume).process(args.toArray)
2223
}
2324
}

project/Build.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -623,13 +623,13 @@ object Build {
623623
val args: List[String] = spaceDelimited("<arg>").parsed.toList
624624
val attList = (dependencyClasspath in Runtime).value
625625
val jars = packageAll.value
626+
val sep = File.pathSeparator
626627

627628
val scalaLib = findLib(attList, "scala-library")
628629
val dottyLib = jars("dotty-library")
629630

630631
def run(args: List[String]): Unit = {
631-
val sep = File.pathSeparator
632-
val fullArgs = insertClasspathInArgs(args, s".$sep$dottyLib$sep$scalaLib")
632+
val fullArgs = insertClasspathInArgs(args, List(".", dottyLib, scalaLib).mkString(sep))
633633
runProcess("java" :: fullArgs, wait = true)
634634
}
635635

@@ -645,7 +645,7 @@ object Build {
645645
val asm = findLib(attList, "scala-asm")
646646
val dottyCompiler = jars("dotty-compiler")
647647
val dottyInterfaces = jars("dotty-interfaces")
648-
run(insertClasspathInArgs(args1, s"$dottyCompiler:$dottyInterfaces:$asm"))
648+
run(insertClasspathInArgs(args1, List(dottyCompiler, dottyInterfaces, asm).mkString(sep)))
649649
} else run(args)
650650
},
651651

@@ -1092,8 +1092,8 @@ object Build {
10921092
Developer(
10931093
id = "liufengyun",
10941094
name = "Liu Fengyun",
1095-
email = "[email protected]",
1096-
url = url("http://chaos-lab.com")
1095+
email = "[email protected]",
1096+
url = url("https://fengy.me")
10971097
),
10981098
Developer(
10991099
id = "nicolasstucki",

0 commit comments

Comments
 (0)