File tree Expand file tree Collapse file tree 3 files changed +2
-13
lines changed
plugins/package-managers/conan/src/main/kotlin Expand file tree Collapse file tree 3 files changed +2
-13
lines changed Original file line number Diff line number Diff line change @@ -113,12 +113,6 @@ class Conan(
113
113
private val config : ConanConfig
114
114
) : PackageManager(" Conan" ) {
115
115
companion object {
116
- internal val DUMMY_COMPILER_SETTINGS = arrayOf(
117
- " -s" , " compiler=gcc" ,
118
- " -s" , " compiler.libcxx=libstdc++" ,
119
- " -s" , " compiler.version=11.1"
120
- )
121
-
122
116
internal const val SCOPE_NAME_DEPENDENCIES = " requires"
123
117
internal const val SCOPE_NAME_DEV_DEPENDENCIES = " build_requires"
124
118
}
Original file line number Diff line number Diff line change @@ -30,7 +30,6 @@ import org.ossreviewtoolkit.model.PackageReference
30
30
import org.ossreviewtoolkit.model.RemoteArtifact
31
31
import org.ossreviewtoolkit.model.Scope
32
32
import org.ossreviewtoolkit.model.VcsInfo
33
- import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.DUMMY_COMPILER_SETTINGS
34
33
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEPENDENCIES
35
34
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEV_DEPENDENCIES
36
35
import org.ossreviewtoolkit.utils.common.Os
@@ -63,8 +62,7 @@ internal class ConanV1Handler(private val conan: Conan) : ConanVersionHandler {
63
62
" info" ,
64
63
definitionFile.name,
65
64
" --json" ,
66
- jsonFile.absolutePath,
67
- * DUMMY_COMPILER_SETTINGS
65
+ jsonFile.absolutePath
68
66
).requireSuccess()
69
67
}
70
68
Original file line number Diff line number Diff line change @@ -32,7 +32,6 @@ import org.ossreviewtoolkit.model.PackageReference
32
32
import org.ossreviewtoolkit.model.RemoteArtifact
33
33
import org.ossreviewtoolkit.model.Scope
34
34
import org.ossreviewtoolkit.model.VcsInfo
35
- import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.DUMMY_COMPILER_SETTINGS
36
35
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEPENDENCIES
37
36
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEV_DEPENDENCIES
38
37
import org.ossreviewtoolkit.utils.common.Os
@@ -45,7 +44,7 @@ import org.ossreviewtoolkit.utils.ort.createOrtTempDir
45
44
* commands or call common functions.
46
45
*/
47
46
internal class ConanV2Handler (private val conan : Conan ) : ConanVersionHandler {
48
- override fun getConanHome (): File = Os .userHomeDirectory.resolve(" .conan2 " )
47
+ override fun getConanHome (): File = Os .userHomeDirectory.resolve(" .conan " )
49
48
50
49
override fun getConanStoragePath (): File = getConanHome().resolve(" data/p" )
51
50
@@ -70,7 +69,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
70
69
lockfileName,
71
70
" --out-file" ,
72
71
jsonFile.absolutePath,
73
- * DUMMY_COMPILER_SETTINGS ,
74
72
definitionFile.name
75
73
).requireSuccess()
76
74
} else {
@@ -82,7 +80,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
82
80
" json" ,
83
81
" --out-file" ,
84
82
jsonFile.absolutePath,
85
- * DUMMY_COMPILER_SETTINGS ,
86
83
definitionFile.name
87
84
).requireSuccess()
88
85
}
You can’t perform that action at this time.
0 commit comments