Browse Source

Stop using prebuilt flatc compiler
acaad63ae411eabba0db4fc630aa65a1ba9ee1db

thegeorg 11 months ago
parent
commit
693fac488e

+ 0 - 19
build/prebuilt/contrib/tools/flatc/resources.json

@@ -1,19 +0,0 @@
-{
-    "by_platform": {
-        "darwin": {
-            "uri": "sbr:5983041213"
-        },
-        "darwin-arm64": {
-            "uri": "sbr:5983040151"
-        },
-        "linux": {
-            "uri": "sbr:5983042955"
-        },
-        "linux-aarch64": {
-            "uri": "sbr:5983042153"
-        },
-        "win32-clang-cl": {
-            "uri": "sbr:5983038870"
-        }
-    }
-}

+ 0 - 7
build/prebuilt/contrib/tools/flatc/ya.make

@@ -1,7 +0,0 @@
-OWNER(g:ymake)
-
-INCLUDE(ya.make.prebuilt)
-
-IF (NOT PREBUILT)
-    MESSAGE(FATAL_ERROR Unsupported host platform for prebuilt flatc tool)
-ENDIF()

+ 0 - 4
build/prebuilt/contrib/tools/flatc/ya.make.induced_deps

@@ -1,4 +0,0 @@
-INDUCED_DEPS(h
-    ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers.h
-    ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers_iter.h
-)

+ 0 - 15
build/prebuilt/contrib/tools/flatc/ya.make.prebuilt

@@ -1,15 +0,0 @@
-SET_RESOURCE_URI_FROM_JSON(SANDBOX_RESOURCE_URI ${ARCADIA_ROOT}/build/prebuilt/contrib/tools/flatc/resources.json)
-
-IF (SANDBOX_RESOURCE_URI != "")
-    ENABLE(PREBUILT)
-
-    PREBUILT_PROGRAM()
-
-    DECLARE_EXTERNAL_RESOURCE(FLATC ${SANDBOX_RESOURCE_URI})
-
-    PRIMARY_OUTPUT(${FLATC_RESOURCE_GLOBAL}/flatc${MODULE_SUFFIX})
-
-    INCLUDE(ya.make.induced_deps)
-
-    END()
-ENDIF()

+ 0 - 23
contrib/tools/flatc/bin/ya.make

@@ -1,23 +0,0 @@
-PROGRAM(flatc)
-
-NO_UTIL()
-
-ADDINCL(
-    contrib/libs/flatbuffers/include
-)
-
-PEERDIR(
-    contrib/libs/flatbuffers/flatc
-)
-
-SRCDIR(
-    contrib/libs/flatbuffers/src
-)
-
-SRCS(
-    flatc_main.cpp
-)
-
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/flatc/ya.make.induced_deps)
-
-END()

+ 24 - 8
contrib/tools/flatc/ya.make

@@ -1,11 +1,27 @@
-IF (USE_PREBUILT_TOOLS)
-    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/flatc/ya.make.prebuilt)
-ENDIF()
+PROGRAM(flatc)
 
-IF (NOT PREBUILT)
-    INCLUDE(${ARCADIA_ROOT}/contrib/tools/flatc/bin/ya.make)
-ENDIF()
+INDUCED_DEPS(
+    h
+    ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers.h
+    ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers_iter.h
+)
+
+NO_UTIL()
 
-RECURSE(
-    bin
+ADDINCL(
+    contrib/libs/flatbuffers/include
 )
+
+PEERDIR(
+    contrib/libs/flatbuffers/flatc
+)
+
+SRCDIR(
+    contrib/libs/flatbuffers/src
+)
+
+SRCS(
+    flatc_main.cpp
+)
+
+END()