Move FRCNetComm.java into generated directory (#1168)

This commit is contained in:
Austin Shalit
2018-06-28 16:37:14 -04:00
committed by Peter Johnson
parent b5bacc09a7
commit 1d8456e2bf
4 changed files with 6 additions and 2 deletions

View File

@@ -27,7 +27,7 @@ def main():
configPath = ".."
outputName = configPath + \
"/hal/src/main/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java"
"/hal/src/generated/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java"
# Set initial copyright year and get current year
year = "2016"

View File

@@ -12,7 +12,9 @@ if (NOT WITHOUT_JAVA)
hal_shared_jni_src src/main/native/cpp/jni/*.cpp
hal_sim_jni_src src/main/native/sim/jni/*.cpp)
file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java)
file(GLOB_RECURSE JAVA_SOURCES
src/generated/java/*.java
src/main/java/*.java)
set(CMAKE_JNI_TARGET true)
if(${CMAKE_VERSION} VERSION_LESS "3.11.0")

View File

@@ -89,3 +89,5 @@ model {
}
}
}
sourceSets.main.java.srcDir "$projectDir/src/generated/java/"