Skip to content

Commit 7ecc19b

Browse files
committed
refactor: Remove dummy profile settings
- Remove DUMMY_COMPILER_SETTINGS from plugin code as breaks any non-linux systems. Signed-off-by: Helio Chissini de Castro <[email protected]>
1 parent 960bd67 commit 7ecc19b

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

plugins/package-managers/conan/src/main/kotlin/Conan.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,6 @@ class Conan(
113113
private val config: ConanConfig
114114
) : PackageManager("Conan") {
115115
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-
122116
internal const val SCOPE_NAME_DEPENDENCIES = "requires"
123117
internal const val SCOPE_NAME_DEV_DEPENDENCIES = "build_requires"
124118
}

plugins/package-managers/conan/src/main/kotlin/ConanV1Handler.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import org.ossreviewtoolkit.model.PackageReference
3030
import org.ossreviewtoolkit.model.RemoteArtifact
3131
import org.ossreviewtoolkit.model.Scope
3232
import org.ossreviewtoolkit.model.VcsInfo
33-
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.DUMMY_COMPILER_SETTINGS
3433
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEPENDENCIES
3534
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEV_DEPENDENCIES
3635
import org.ossreviewtoolkit.utils.common.Os
@@ -63,8 +62,7 @@ internal class ConanV1Handler(private val conan: Conan) : ConanVersionHandler {
6362
"info",
6463
definitionFile.name,
6564
"--json",
66-
jsonFile.absolutePath,
67-
*DUMMY_COMPILER_SETTINGS
65+
jsonFile.absolutePath
6866
).requireSuccess()
6967
}
7068

plugins/package-managers/conan/src/main/kotlin/ConanV2Handler.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import org.ossreviewtoolkit.model.PackageReference
3232
import org.ossreviewtoolkit.model.RemoteArtifact
3333
import org.ossreviewtoolkit.model.Scope
3434
import org.ossreviewtoolkit.model.VcsInfo
35-
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.DUMMY_COMPILER_SETTINGS
3635
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEPENDENCIES
3736
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEV_DEPENDENCIES
3837
import org.ossreviewtoolkit.utils.common.Os
@@ -45,7 +44,7 @@ import org.ossreviewtoolkit.utils.ort.createOrtTempDir
4544
* commands or call common functions.
4645
*/
4746
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")
4948

5049
override fun getConanStoragePath(): File = getConanHome().resolve("data/p")
5150

@@ -70,7 +69,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
7069
lockfileName,
7170
"--out-file",
7271
jsonFile.absolutePath,
73-
*DUMMY_COMPILER_SETTINGS,
7472
definitionFile.name
7573
).requireSuccess()
7674
} else {
@@ -82,7 +80,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
8280
"json",
8381
"--out-file",
8482
jsonFile.absolutePath,
85-
*DUMMY_COMPILER_SETTINGS,
8683
definitionFile.name
8784
).requireSuccess()
8885
}

0 commit comments

Comments
 (0)