mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-28 02:11:43 +00:00
Renamed folders for consistency, using sim/athena/shared schema (#27)
Rename the following folders: hal/lib/Athena -> hal/lib/athena hal/lib/Desktop -> hal/lib/sim hal/lib/Shared -> hal/lib/shared wpilibc/Athena -> wpilibc/athena wpilibc/simulation -> wpilibc/sim Windows users may need to run gradlew clean after updating.
This commit is contained in:
committed by
Peter Johnson
parent
54092378e9
commit
e71f454b9d
@@ -35,5 +35,5 @@ endif()
|
||||
|
||||
include_directories("build")
|
||||
add_subdirectory(simulation/gz_msgs)
|
||||
add_subdirectory(wpilibc/simulation)
|
||||
add_subdirectory(wpilibc/sim)
|
||||
add_subdirectory(simulation/frc_gazebo_plugins)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// There are two hal libraries that are built
|
||||
// - Desktop which is used by simulation (gcc/msvc)
|
||||
// - Athena which is used by the roborio (arm)
|
||||
// - desktop which is used by simulation (gcc/msvc)
|
||||
// - athena which is used by the roborio (arm)
|
||||
|
||||
apply plugin: 'cpp'
|
||||
|
||||
@@ -14,17 +14,17 @@ model {
|
||||
sources {
|
||||
cpp {
|
||||
source {
|
||||
srcDirs = ["lib/Athena", "lib/Athena/FRC_FPGA_ChipObject", "lib/Shared"]
|
||||
srcDirs = ["lib/athena", "lib/athena/FRC_FPGA_ChipObject", "lib/shared"]
|
||||
includes = ["**/*.cpp"]
|
||||
}
|
||||
exportedHeaders {
|
||||
srcDirs = ["include", "lib/Athena", "lib/Athena/FRC_FPGA_ChipObject", "lib/Shared"]
|
||||
srcDirs = ["include", "lib/athena", "lib/athena/FRC_FPGA_ChipObject", "lib/shared"]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// HALDesktop(NativeLibrarySpec) {
|
||||
// HALSim(NativeLibrarySpec) {
|
||||
// binaries.all {
|
||||
// if (toolChain in Gcc){
|
||||
// cppCompiler.args "-std=c++1y"
|
||||
@@ -34,11 +34,11 @@ model {
|
||||
// sources {
|
||||
// cpp {
|
||||
// source {
|
||||
// srcDirs = ["lib/Desktop", "lib/Shared"]
|
||||
// srcDirs = ["lib/sim", "lib/shared"]
|
||||
// includes = ["**/*.cpp"]
|
||||
// }
|
||||
// exportedHeaders {
|
||||
// srcDirs = ["include", "lib/Desktop", "lib/Shared"]
|
||||
// srcDirs = ["include", "lib/sim", "lib/shared"]
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
@@ -126,7 +126,7 @@ if (checkDoxygen()) {
|
||||
source file("$ntSourceDir/src")
|
||||
source file("$ntSourceDir/include")
|
||||
source file("$halLocation/shared")
|
||||
source file("$halLocation/Athena")
|
||||
source file("$halLocation/athena")
|
||||
source file("$halLocation/include")
|
||||
// template file('cpp.doxy')
|
||||
exclude 'nivision.h'
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user