File tree Expand file tree Collapse file tree 5 files changed +54
-0
lines changed
jps-tests/test/org/jetbrains/kotlin/jps/build
src/org/jetbrains/kotlin/compilerRunner
testData/general/CustomDestination Expand file tree Collapse file tree 5 files changed +54
-0
lines changed Original file line number Diff line number Diff line change @@ -915,6 +915,20 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
915
915
buildAllModules().assertSuccessful()
916
916
}
917
917
918
+ fun testCustomDestination () {
919
+ loadProject(workDir.absolutePath + File .separator + PROJECT_NAME + " .ipr" )
920
+ addKotlinRuntimeDependency()
921
+ buildAllModules().apply {
922
+ assertSuccessful()
923
+
924
+ val aClass = File (workDir, " customOut/A.class" )
925
+ assert (aClass.exists()) { " $aClass does not exist!" }
926
+
927
+ val warnings = getMessages(BuildMessage .Kind .WARNING )
928
+ assert (warnings.isEmpty()) { " Unexpected warnings: \n ${warnings.joinToString(" \n " )} " }
929
+ }
930
+ }
931
+
918
932
private fun BuildResult.checkErrors () {
919
933
val actualErrors = getMessages(BuildMessage .Kind .ERROR )
920
934
.map { it as CompilerMessage }
Original file line number Diff line number Diff line change @@ -198,6 +198,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
198
198
private fun setupK2JvmArguments (moduleFile : File , settings : K2JVMCompilerArguments ) {
199
199
with (settings) {
200
200
module = moduleFile.absolutePath
201
+ destination = null
201
202
noStdlib = true
202
203
noReflect = true
203
204
noJdk = true
Original file line number Diff line number Diff line change
1
+ <?xml version =" 1.0" encoding =" UTF-8" ?>
2
+ <module type =" JAVA_MODULE" version =" 4" >
3
+ <component name =" FacetManager" >
4
+ <facet type =" kotlin-language" name =" Kotlin" >
5
+ <configuration version =" 3" platform =" JVM 1.8" useProjectSettings =" false" >
6
+ <compilerSettings />
7
+ <compilerArguments >
8
+ <option name =" destination" value =" $MODULE_DIR$/customOut/" />
9
+ </compilerArguments >
10
+ </configuration >
11
+ </facet >
12
+ </component >
13
+ <component name =" NewModuleRootManager" >
14
+ <output url =" $MODULE_DIR$/customOut/" />
15
+
16
+ <exclude-output />
17
+ <content url =" file://$MODULE_DIR$" >
18
+ <sourceFolder url =" file://$MODULE_DIR$/src" isTestSource =" false" />
19
+ </content >
20
+ <orderEntry type =" jdk" jdkName =" IDEA_JDK" jdkType =" JavaSDK" />
21
+ <orderEntry type =" sourceFolder" forTests =" false" />
22
+ <orderEntry type =" module" module-name =" kotlinProject" />
23
+ </component >
24
+ </module >
Original file line number Diff line number Diff line change
1
+ <?xml version =" 1.0" encoding =" UTF-8" ?>
2
+ <project version =" 4" >
3
+ <component name =" CompilerConfiguration" >
4
+ <option name =" DEFAULT_COMPILER" value =" Javac" />
5
+ </component >
6
+ <component name =" ProjectModuleManager" >
7
+ <modules >
8
+ <module fileurl =" file://$PROJECT_DIR$/kotlinProject.iml" filepath =" $PROJECT_DIR$/kotlinProject.iml" />
9
+ </modules >
10
+ </component >
11
+ <component name =" ProjectRootManager" version =" 2" languageLevel =" JDK_1_6" assert-keyword =" true" jdk-15 =" true" project-jdk-name =" IDEA_JDK" project-jdk-type =" JavaSDK" >
12
+ <output url =" file://$PROJECT_DIR$/out" />
13
+ </component >
14
+ </project >
Original file line number Diff line number Diff line change
1
+ class A
You can’t perform that action at this time.
0 commit comments