aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf
diff options
context:
space:
mode:
authortrenin17 <trenin17@yandex-team.ru>2022-02-10 16:51:09 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:51:09 +0300
commitb342c7befcbe40ed54f8d2f8968ad241b71e2701 (patch)
tree5d5cb817648f650d76cf1076100726fd9b8448e8 /build/conf
parent7d9e9dd650ccaad923d6b1ce79baaa3a15b740ae (diff)
downloadydb-b342c7befcbe40ed54f8d2f8968ad241b71e2701.tar.gz
Restoring authorship annotation for <trenin17@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build/conf')
-rw-r--r--build/conf/java.ymake.conf4
-rw-r--r--build/conf/jbuild.ymake.conf2
-rw-r--r--build/conf/project_specific/maps/aar.conf12
3 files changed, 9 insertions, 9 deletions
diff --git a/build/conf/java.ymake.conf b/build/conf/java.ymake.conf
index aa104bb5c6..ed85153c78 100644
--- a/build/conf/java.ymake.conf
+++ b/build/conf/java.ymake.conf
@@ -10,7 +10,7 @@ macro _INPUT_WITH_FLAG_IMPL(IN{input}[], Args...) {
}
macro ACCELEO(XSD{input}[], MTL{input}[], MTL_ROOT="${MODDIR}", LANG{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], DEBUG?"stdout2stderr":"stderr2stdout") {
- .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
+ .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
.CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input;pre=build/scripts/:DEBUG.py} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:"tools/acceleo"}${RUN_JAR_PROG_CP_SUF} ru.yandex.se.logsng.tool.Cli $_INPUT_WITH_FLAG(--xsd IN $XSD) $_INPUT_WITH_FLAG(--mtl IN $MTL) $_INPUT_WITH_FLAG(--lang IN $LANG) --output-dir $BINDIR --build-root ${ARCADIA_BUILD_ROOT} --source-root ${ARCADIA_ROOT} --mtl-root $MTL_ROOT ${output_include;hide:OUTPUT_INCLUDES} ${output;hide:OUT} ${output;noauto;hide:OUT_NOAUTO} ${kv;hide:"p JV"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
}
@@ -173,7 +173,7 @@ multimodule DLL_JAVA {
.PEERDIRSELF=JNI_DLL
SET(SWIG_LANG jni_java)
PEERDIR+=build/platform/java/jdk
- PEERDIR+=$JDK_RESOURCE_PEERDIR
+ PEERDIR+=$JDK_RESOURCE_PEERDIR
.FINAL_TARGET=yes
}
}
diff --git a/build/conf/jbuild.ymake.conf b/build/conf/jbuild.ymake.conf
index 80ec4fe498..945a7cc979 100644
--- a/build/conf/jbuild.ymake.conf
+++ b/build/conf/jbuild.ymake.conf
@@ -115,7 +115,7 @@ module DLL_JAVA: DLL {
.EXTS=.o .obj .jsrc .java .mf
.CMD=SWIG_DLL_JAR_CMD
PEERDIR(build/platform/java/jdk)
- PEERDIR+=$JDK_RESOURCE_PEERDIR
+ PEERDIR+=$JDK_RESOURCE_PEERDIR
PROPAGATES_MANAGEABLE_PEERS=yes
SET(SWIG_LANG java)
diff --git a/build/conf/project_specific/maps/aar.conf b/build/conf/project_specific/maps/aar.conf
index 51c939c424..780ff38984 100644
--- a/build/conf/project_specific/maps/aar.conf
+++ b/build/conf/project_specific/maps/aar.conf
@@ -28,7 +28,7 @@ module MOBILE_DLL: DLL {
PEERDIR(build/external_resources/android_sdk)
PEERDIR(build/external_resources/gradle)
PEERDIR(build/platform/java/jdk)
- PEERDIR($JDK_RESOURCE_PEERDIR)
+ PEERDIR($JDK_RESOURCE_PEERDIR)
SET(BIN_AAR_DIR $BINDIR/aar)
SET(BIN_TMP_DIR $BINDIR/tmp)
@@ -88,7 +88,7 @@ ${input;hide:EXTRA_INPUTS} \
--output-dir $BIN_AAR_DIR \
--bundle-name unittest \
--maven-repos ${MAPSMOBI_MAVEN_REPO_RESOURCE_GLOBAL} \
-&& ${cwd:BIN_AAR_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assemble${_BUNDLE_BUILD_TYPE} ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \
+&& ${cwd:BIN_AAR_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assemble${_BUNDLE_BUILD_TYPE} ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \
&& $FS_TOOLS md $BIN_APK_DIR \
&& $FS_TOOLS md $BIN_APK_DIR/res \
&& $COPY_CMD $_MOBILE_TEST_APK_TEMPLATE_DIR/Manifest.xml $BIN_APK_DIR/Manifest.xml \
@@ -106,7 +106,7 @@ ${input;hide:EXTRA_INPUTS} \
--bundles $BIN_AAR_DIR/build/outputs/aar/unittest-${tolower:_BUNDLE_BUILD_TYPE}.aar $_MOBILE_TEST_APK_AAR_BUNDLES_VALUE \
--library-name $_MOBILE_TEST_APK_LIBRARY_NAME \
--maven-repos ${MAPSMOBI_MAVEN_REPO_RESOURCE_GLOBAL} \
-&& ${cwd:BIN_APK_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assembleDebug ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \
+&& ${cwd:BIN_APK_DIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR assembleDebug ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} \
&& $COPY_CMD $BIN_APK_DIR/build/outputs/apk/${tolower:_BUNDLE_BUILD_TYPE}/$REALPRJNAME.apk ${OUTPUT}
_MOBILE_TEST_APK_EXTRA_INPUTS_VALUE=
@@ -127,7 +127,7 @@ module MOBILE_TEST_APK: DLL {
PEERDIR(build/external_resources/android_sdk)
PEERDIR(build/external_resources/gradle)
PEERDIR(build/platform/java/jdk)
- PEERDIR($JDK_RESOURCE_PEERDIR)
+ PEERDIR($JDK_RESOURCE_PEERDIR)
SET(MODULE_PREFIX)
SET(MODULE_SUFFIX .apk)
@@ -296,7 +296,7 @@ ${input;hide:EXTRA_INPUTS} \
--maven-repos $_AAR_LOCAL_MAVEN_REPO_VALUE \
$_AAR_GENERATE_DOC_VALUE \
$_AAR_NO_STRIP_VALUE \
-&& ${cwd:BINDIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR bundle${_BUNDLE_BUILD_TYPE}Aar ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} $VCS_INFO_DISABLE_CACHE__NO_UID__ \
+&& ${cwd:BINDIR} ${GRADLE_RESOURCE_GLOBAL}/bin/gradle $_GRADLE_FLAGS_VALUE --no-daemon --offline -g $BIN_GRADLE_USER_HOME_DIR bundle${_BUNDLE_BUILD_TYPE}Aar ${env:"ANDROID_HOME=$ANDROID_SDK_RESOURCE_GLOBAL/android_sdk"} ${env:"JAVA_HOME=$JDK_RESOURCE"} ${env:"ANDROID_SDK_HOME=$BINDIR"} $VCS_INFO_DISABLE_CACHE__NO_UID__ \
&& ${cwd:BINDIR} $COPY_CMD build/outputs/aar/${REALPRJNAME}-${tolower:_BUNDLE_BUILD_TYPE}.aar $TARGET \
$_AAR_COPY_DOC_VALUE \
&& ${cwd:BINDIR} $COPY_CMD build/${suf=-pom.xml:REALPRJNAME} ${output;suf=-pom.xml:REALPRJNAME} \
@@ -324,7 +324,7 @@ module AAR: _BASE_UNIT {
PEERDIR(build/external_resources/android_sdk)
PEERDIR(build/external_resources/gradle)
PEERDIR(build/platform/java/jdk)
- PEERDIR($JDK_RESOURCE_PEERDIR)
+ PEERDIR($JDK_RESOURCE_PEERDIR)
SET(BIN_TMP_DIR $BINDIR/tmp)
SET(BIN_GRADLE_USER_HOME_DIR $BINDIR/gradle)