diff --git a/wpinet/BUILD.bazel b/wpinet/BUILD.bazel index df8e3ac5d8..4a45a333b3 100644 --- a/wpinet/BUILD.bazel +++ b/wpinet/BUILD.bazel @@ -6,7 +6,6 @@ load("//shared/bazel/rules:cc_rules.bzl", "third_party_cc_lib_helper", "wpilib_c load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_junit5_test") load("//shared/bazel/rules:jni_rules.bzl", "wpilib_jni_cc_library", "wpilib_jni_java_library") load("//shared/bazel/rules:packaging.bzl", "package_minimal_jni_project") -load("//shared/bazel/rules/gen:gen-resources.bzl", "generate_resources") load("//shared/bazel/rules/robotpy:build_info_gen.bzl", "generate_robotpy_native_wrapper_build_info", "generate_robotpy_pybind_build_info") load("//shared/bazel/rules/robotpy:pytest_util.bzl", "robotpy_py_test") load("//wpinet:robotpy_native_build_info.bzl", "define_native_wrapper") @@ -107,16 +106,9 @@ third_party_cc_lib_helper( src_root = "src/main/native/thirdparty/tcpsockets/cpp", ) -generate_resources( - name = "generate-resources", - namespace = "wpi", - prefix = "WPI", - resource_files = glob(["src/main/native/resources/*"]), -) - filegroup( name = "native-srcs", - srcs = ["generate-resources"] + select({ + srcs = select({ "@platforms//os:osx": glob(["src/main/native/macOS/*"]), "@platforms//os:windows": glob(["src/main/native/windows/*"]), "@rules_bzlmodrio_toolchains//constraints/combined:is_linux": glob(["src/main/native/linux/*"]), diff --git a/wpinet/CMakeLists.txt b/wpinet/CMakeLists.txt index c463757e3f..b4b5a62d65 100644 --- a/wpinet/CMakeLists.txt +++ b/wpinet/CMakeLists.txt @@ -65,8 +65,6 @@ if(NOT MSVC AND NOT APPLE) endif() endif() -generate_resources(src/main/native/resources generated/main/cpp WPI wpi wpinet_resources_src) - file( GLOB_RECURSE wpinet_native_src src/main/native/cpp/*.cpp @@ -121,7 +119,7 @@ set(uv_linux_src src/main/native/thirdparty/libuv/src/unix/random-sysctl-linux.cpp ) -add_library(wpinet ${wpinet_native_src} ${wpinet_resources_src}) +add_library(wpinet ${wpinet_native_src}) set_target_properties(wpinet PROPERTIES DEBUG_POSTFIX "d") set_property(TARGET wpinet PROPERTY FOLDER "libraries") diff --git a/wpinet/build.gradle b/wpinet/build.gradle index f2a10bfb15..7edb74a966 100644 --- a/wpinet/build.gradle +++ b/wpinet/build.gradle @@ -1,17 +1,11 @@ -apply from: "${rootDir}/shared/resources.gradle" - ext { baseId = 'wpinet' groupId = 'edu.wpi.first.net' nativeName = 'wpinet' devMain = 'edu.wpi.first.net.DevMain' - def generateTask = createGenerateResourcesTask('main', 'WPI', 'wpi', project) splitSetup = { - it.tasks.withType(CppCompile) { - dependsOn generateTask - } it.sources { libuvCpp(CppSourceSet) { source { @@ -31,15 +25,6 @@ ext { srcDirs 'src/main/native/include', 'src/main/native/thirdparty/tcpsockets/include' } } - resourcesCpp(CppSourceSet) { - source { - srcDirs "$buildDir/generated/main/cpp", "$rootDir/shared/singlelib" - include '*.cpp' - } - exportedHeaders { - srcDirs 'src/main/native/include' - } - } } if (!it.targetPlatform.operatingSystem.isWindows()) { it.cppCompiler.define '_GNU_SOURCE' diff --git a/wpinet/src/main/native/resources/bootstrap-4.1.min.js.gz b/wpinet/src/main/native/resources/bootstrap-4.1.min.js.gz deleted file mode 100644 index a7797e1a79..0000000000 Binary files a/wpinet/src/main/native/resources/bootstrap-4.1.min.js.gz and /dev/null differ diff --git a/wpinet/src/main/native/resources/coreui-2.1.min.css.gz b/wpinet/src/main/native/resources/coreui-2.1.min.css.gz deleted file mode 100644 index d4f43add5e..0000000000 Binary files a/wpinet/src/main/native/resources/coreui-2.1.min.css.gz and /dev/null differ diff --git a/wpinet/src/main/native/resources/coreui-2.1.min.js.gz b/wpinet/src/main/native/resources/coreui-2.1.min.js.gz deleted file mode 100644 index cf4ccb185e..0000000000 Binary files a/wpinet/src/main/native/resources/coreui-2.1.min.js.gz and /dev/null differ diff --git a/wpinet/src/main/native/resources/feather-4.8.min.js.gz b/wpinet/src/main/native/resources/feather-4.8.min.js.gz deleted file mode 100644 index d275865b3e..0000000000 Binary files a/wpinet/src/main/native/resources/feather-4.8.min.js.gz and /dev/null differ diff --git a/wpinet/src/main/native/resources/jquery-3.3.slim.min.js.gz b/wpinet/src/main/native/resources/jquery-3.3.slim.min.js.gz deleted file mode 100644 index 712e06cbd1..0000000000 Binary files a/wpinet/src/main/native/resources/jquery-3.3.slim.min.js.gz and /dev/null differ diff --git a/wpinet/src/main/native/resources/popper-1.14.min.js.gz b/wpinet/src/main/native/resources/popper-1.14.min.js.gz deleted file mode 100644 index c6ebec8ddd..0000000000 Binary files a/wpinet/src/main/native/resources/popper-1.14.min.js.gz and /dev/null differ