This commit is contained in:
Jan-Erik Rediger 2024-11-20 17:38:28 +01:00
Родитель 18f9507938
Коммит bcff07a52b
3 изменённых файлов: 16 добавлений и 13 удалений

Просмотреть файл

@ -27,6 +27,7 @@ File GLEAN_PING_SCHEMA_PATH = file("$rootDir/glean.1.schema.json")
// Set configuration for the glean_parser
ext.allowGleanInternal = true
ext.gleanNamespace = "mozilla.telemetry.glean"
ext.gleanPythonEnvDir = "/Users/jer/mozilla/src/glean/target/glean-venv"
android {
compileSdkVersion rootProject.ext.build.compileSdkVersion
@ -250,14 +251,14 @@ ext.glean_plugin.apply(project)
// so that unit tests can validate JSON schema.
// Note that despite the name of this variable it isn't strictly for Miniconda
// anymore, it's for any sort of Python environment.
android {
defaultConfig {
buildConfigField(
"String",
"GLEAN_MINICONDA_DIR",
// Carefully escape the string here so it will support `\` in
// Windows paths correctly.
JsonOutput.toJson(project.ext.gleanPythonEnvDir.path)
)
}
}
//android {
// defaultConfig {
// buildConfigField(
// "String",
// "GLEAN_MINICONDA_DIR",
// // Carefully escape the string here so it will support `\` in
// // Windows paths correctly.
// JsonOutput.toJson(project.ext.gleanPythonEnvDir.path)
// )
// }
//}

Просмотреть файл

@ -154,12 +154,13 @@ if [ -z "$PROJECT" ]; then
fi
VENVDIR="${SOURCE_ROOT}/.venv"
VENVDIR=/Users/jer/mozilla/src/glean/target/glean-venv
[ -x "${VENVDIR}/bin/python" ] || python3 -m venv "${VENVDIR}"
# We need at least pip 20.3 for Big Sur support, see https://pip.pypa.io/en/stable/news/#id48
# Latest pip is 21.0.1
"${VENVDIR}"/bin/pip install "pip>=20.3"
"${VENVDIR}"/bin/pip install --upgrade "glean_parser~=$GLEAN_PARSER_VERSION"
# "${VENVDIR}"/bin/pip install "pip>=20.3"
# "${VENVDIR}"/bin/pip install --upgrade "glean_parser~=$GLEAN_PARSER_VERSION"
# Run the glinter
# Turn its warnings into warnings visible in Xcode (but don't do for the success message)

Просмотреть файл

@ -61,6 +61,7 @@ ext.gleanBuildDate = "2020-11-06T11:30:50+00:00"
// Enable expiration by major version. The sample is at version 1,
// see versionName.
ext.gleanExpireByVersion = 1
ext.gleanPythonEnvDir = "/Users/jer/mozilla/src/glean/target/glean-venv"
// Include the glean-gradle-plugin. This is slightly different than what is
// recommended for external users since we are loading it from the same root Gradle