diff --git a/build.gradle b/build.gradle index 1a2d62f2ed..005977766b 100644 --- a/build.gradle +++ b/build.gradle @@ -70,13 +70,13 @@ ext.setupDefines = { project, binaries -> } } -apply from: "cameraserver.gradle" +apply from: "cscore.gradle" -// Empty task for build so that cameraserverSourceZip will be +// Empty task for build so that cscoreSourceZip will be // built when running ./gradlew build task build -build.dependsOn cameraserverSourceZip +build.dependsOn cscoreSourceZip apply from: 'publish.gradle' diff --git a/cameraserver-jni.def b/cscore-jni.def similarity index 100% rename from cameraserver-jni.def rename to cscore-jni.def diff --git a/cameraserver.def b/cscore.def similarity index 100% rename from cameraserver.def rename to cscore.def diff --git a/cameraserver.gradle b/cscore.gradle similarity index 78% rename from cameraserver.gradle rename to cscore.gradle index ef60cc388b..7148ce3f68 100644 --- a/cameraserver.gradle +++ b/cscore.gradle @@ -1,9 +1,9 @@ import org.gradle.internal.os.OperatingSystem -def cameraserverSetupModel = { project -> +def cscoreSetupModel = { project -> project.model { components { - cameraserver(NativeLibrarySpec) { + cscore(NativeLibrarySpec) { if (project.isArm) { targetPlatform 'arm' } else { @@ -15,11 +15,11 @@ def cameraserverSetupModel = { project -> if (includeJava) { project.setupJniIncludes(binaries) binaries.all { - project.setupDef(linker, "${rootDir}/cameraserver-jni.def") + project.setupDef(linker, "${rootDir}/cscore-jni.def") } } else { binaries.all { - project.setupDef(linker, "${rootDir}/cameraserver.def") + project.setupDef(linker, "${rootDir}/cscore.def") } } @@ -35,7 +35,7 @@ def cameraserverSetupModel = { project -> exportedHeaders { srcDirs = ["${rootDir}/include", project.wpiUtilInclude, project.openCvInclude] if (includeJava) { - project.jniHeadersCameraServer.outputs.files.each { file -> + project.jniHeadersCscore.outputs.files.each { file -> srcDirs file.getPath() } } @@ -48,7 +48,7 @@ def cameraserverSetupModel = { project -> } } -def cameraserverSetupExamplesModel = { project -> +def cscoreSetupExamplesModel = { project -> project.model { components { enum_usb(NativeExecutableSpec) { @@ -69,7 +69,7 @@ def cameraserverSetupExamplesModel = { project -> srcDirs = ["${rootDir}/include", "${rootDir}/wpiutil/include"] include '**/*.h' } - lib library: 'cameraserver', linkage: 'static' + lib library: 'cscore', linkage: 'static' } } } @@ -92,7 +92,7 @@ def cameraserverSetupExamplesModel = { project -> srcDirs = ["${rootDir}/include", "${rootDir}/wpiutil/include"] include '**/*.h' } - lib library: 'cameraserver', linkage: 'static' + lib library: 'cscore', linkage: 'static' } } } @@ -115,7 +115,7 @@ def cameraserverSetupExamplesModel = { project -> srcDirs = ["${rootDir}/include", "${rootDir}/wpiutil/include", project.openCvInclude] include '**/*.h' } - lib library: 'cameraserver', linkage: 'static' + lib library: 'cscore', linkage: 'static' } } } @@ -123,12 +123,12 @@ def cameraserverSetupExamplesModel = { project -> } } -def cameraserverZipTask = { project -> - project.ext.cameraserverZip = project.tasks.create("${project.isArm ? 'arm' : 'native'}CameraserverZip", Zip) { - description = 'Creates platform-specific zip of the desktop cameraserver libraries.' +def cscoreZipTask = { project -> + project.ext.cscoreZip = project.tasks.create("${project.isArm ? 'arm' : 'native'}CscoreZip", Zip) { + description = 'Creates platform-specific zip of the desktop cscore libraries.' group = 'WPILib' destinationDir = project.buildDir - baseName = 'cameraserver' + baseName = 'cscore' classifier = "${project.buildPlatform}" duplicatesStrategy = 'exclude' @@ -137,7 +137,7 @@ def cameraserverZipTask = { project -> } if (!project.hasProperty('skipJava')) { - project.jniHeadersCameraServer.outputs.each { + project.jniHeadersCscore.outputs.each { from(it) { into 'include' } @@ -163,25 +163,25 @@ def cameraserverZipTask = { project -> } } - project.build.dependsOn project.cameraserverZip + project.build.dependsOn project.cscoreZip project.debugStripSetup() project.tasks.whenTaskAdded { task -> def name = task.name.toLowerCase() - if (name.contains("cameraserversharedlibrary") || name.contains("cameraserverstaticlibrary") || name.contains("cameraservertest")) { - project.cameraserverZip.dependsOn task + if (name.contains("cscoresharedlibrary") || name.contains("cscorestaticlibrary") || name.contains("cscoretest")) { + project.cscoreZip.dependsOn task } } } -def cameraserverUberZipTask = { project -> +def cscoreUberZipTask = { project -> if (project.isArm) { - project.ext.cameraserverUberZip = project.tasks.create("armCameraserverUberZip", Zip) { - description = 'Create platform-specific zip of cameraserver libraries including opencv' + project.ext.cscoreUberZip = project.tasks.create("armCscoreUberZip", Zip) { + description = 'Create platform-specific zip of cscore libraries including opencv' group = 'WPILib' destinationDir = project.buildDir - baseName = 'cameraserver' + baseName = 'cscore' classifier= "uber${project.buildPlatform}" duplicatesStrategy = 'exclude' @@ -190,7 +190,7 @@ def cameraserverUberZipTask = { project -> } if (!project.hasProperty('skipJava')) { - project.jniHeadersCameraServer.outputs.each { + project.jniHeadersCscore.outputs.each { from(it) { into 'include' } @@ -226,12 +226,12 @@ def cameraserverUberZipTask = { project -> } } - project.build.dependsOn project.cameraserverUberZip + project.build.dependsOn project.cscoreUberZip project.tasks.whenTaskAdded { task -> def name = task.name.toLowerCase() - if (name.contains("cameraserversharedlibrary") || name.contains("cameraserverstaticlibrary") || name.contains("cameraservertest")) { - project.cameraserverUberZip.dependsOn task + if (name.contains("cscoresharedlibrary") || name.contains("cscorestaticlibrary") || name.contains("cscoretest")) { + project.cscoreUberZip.dependsOn task } } } @@ -246,12 +246,12 @@ if (buildArm) { apply from: "${rootDir}/java/java.gradle" } - cameraserverSetupModel(project) - cameraserverSetupExamplesModel(project) - cameraserverZipTask(project) + cscoreSetupModel(project) + cscoreSetupExamplesModel(project) + cscoreZipTask(project) useWpiUtil(project) useOpenCv(project) - cameraserverUberZipTask(project) + cscoreUberZipTask(project) } } @@ -269,19 +269,19 @@ project(':native') { apply from: "${rootDir}/java/java.gradle" } - cameraserverSetupModel(project) - cameraserverSetupExamplesModel(project) - cameraserverZipTask(project) + cscoreSetupModel(project) + cscoreSetupExamplesModel(project) + cscoreZipTask(project) useWpiUtil(project) useOpenCv(project) } } -task cameraserverSourceZip(type: Zip) { - description = 'Creates a sources-zip of the cameraserver source files' +task cscoreSourceZip(type: Zip) { + description = 'Creates a sources-zip of the cscore source files' group = 'WPILib' destinationDir = project.buildDir - baseName = 'cameraserver' + baseName = 'cscore' classifier = "sources" duplicatesStrategy = 'exclude' @@ -298,7 +298,7 @@ task cameraserverSourceZip(type: Zip) { into 'src' } if (!OperatingSystem.current().isWindows()) { - project(':native').jniHeadersCameraServer.outputs.each { + project(':native').jniHeadersCscore.outputs.each { from(it) { into 'include' } diff --git a/dependencies.gradle b/dependencies.gradle index 04627355ff..455c048fb9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -58,155 +58,6 @@ ext.useWpiUtil = { project -> } } -ext.useNetworkTables = { project -> - project.tasks.create(name: "downloadNetworkTables") { - description == 'Downloads the networktables maven dependency.' - group = 'WPILib' - def depFolder = "${project.buildDir}/dependencies" - def ntZip = file("${depFolder}/NetworkTables.zip") - outputs.file(ntZip) - def networkTables - - doFirst { - def ntDependency = project.dependencies.create("edu.wpi.first.wpilib.networktables.cpp:NetworkTables:+:${project.isArm ? 'arm' : 'desktop'}@zip") - def ntConfig = project.configurations.detachedConfiguration(ntDependency) - ntConfig.setTransitive(false) - networkTables = ntConfig.files[0].canonicalFile - } - - doLast { - copy { - from networkTables - rename 'NetworkTables(.+)', 'NetworkTables.zip' - into depFolder - } - } - } - - def networkTablesUnzipLocation = "${project.buildDir}/networktables" - - // Create a task that will unzip the networktables files into a temporary build directory - project.tasks.create(name: "unzipNetworkTable", type: Copy) { - description = 'Unzips the networktables maven dependency so that the include files and libraries can be used' - group = 'WPILib' - dependsOn project.tasks.downloadNetworkTables - from zipTree(project.tasks.downloadNetworkTables.outputs.files.singleFile) - into networkTablesUnzipLocation - } - - project.ext.networkTables = networkTablesUnzipLocation - project.ext.networkTablesInclude = "$networkTablesUnzipLocation/include" - - project.ext.addNetworkTablesStaticLibraryLinks = { compileTask, linker, targetPlatform -> - compileTask.dependsOn project.tasks.unzipNetworkTable - String path = project.getPlatformPath2(targetPlatform) - if (targetPlatform.operatingSystem.windows) { - linker.args "${project.networkTables}/${path}/networktables.lib" - } else { - linker.args "${project.networkTables}/${path}/libnetworktables.a" - } - } - - project.ext.addNetworkTablesSharedLibraryLinks = { compileTask, linker, targetPlatform -> - compileTask.dependsOn project.tasks.unzipNetworkTable - String path = project.getPlatformPath2(targetPlatform) - if (targetPlatform.operatingSystem.windows) { - linker.args "${project.networkTables}/${path}/networktables.dll" - } else { - linker.args "${project.networkTables}/${path}/libnetworktables.so" - } - } -} - -ext.useWpiLib = { project -> - if (project.isArm) { - project.tasks.create(name: "downloadWPILib") { - description == 'Downloads the wpilibc maven dependency.' - group = 'WPILib' - def depFolder = "${project.buildDir}/dependencies" - def wpilibZip = file("${depFolder}/athena-wpilib.zip") - outputs.file(wpilibZip) - def wpilib - - doFirst { - def wpiLibDependency = project.dependencies.create("edu.wpi.first.wpilibc:athena:2017.+@zip") - def wpiLibConfig = project.configurations.detachedConfiguration(wpiLibDependency) - wpiLibConfig.setTransitive(false) - wpilib = wpiLibConfig.files[0].canonicalFile - } - - doLast { - copy { - from wpilib - rename 'athena(.+)', 'athena-wpilib.zip' - into depFolder - } - } - } - - project.tasks.create(name: "downloadHal") { - description == 'Downloads the hal maven dependency.' - group = 'WPILib' - def depFolder = "${project.buildDir}/dependencies" - def halZip = file("${depFolder}/hal.zip") - outputs.file(halZip) - def hal - - doFirst { - def halDependency = project.dependencies.create("edu.wpi.first.wpilib:hal:2017.+@zip") - def halConfig = project.configurations.detachedConfiguration(halDependency) - halConfig.setTransitive(false) - hal = halConfig.files[0].canonicalFile - } - - doLast { - copy { - from hal - rename 'hal(.+)', 'hal.zip' - into depFolder - } - } - } - - def wpiLibUnzipLocation = "${project.buildDir}/wpilibc" - def halUnzipLocation = "${project.buildDir}/hal" - - // Create a task that will unzip the wpilib files into a temporary build directory - project.tasks.create(name: "unzipWpiLib", type: Copy) { - description = 'Unzips the wpilibc maven dependency so that the include files and libraries can be used' - group = 'WPILib' - dependsOn project.tasks.downloadWPILib - from zipTree(project.tasks.downloadWPILib.outputs.files.singleFile) - into wpiLibUnzipLocation - } - - // Create a task that will unzip the hal files into a temporary build directory - project.tasks.create(name: "unzipHal", type: Copy) { - description = 'Unzips the hal maven dependency so that the include files and libraries can be used' - group = 'WPILib' - dependsOn project.tasks.downloadHal - from zipTree(project.tasks.downloadHal.outputs.files.singleFile) - into halUnzipLocation - } - - project.ext.wpiLib = wpiLibUnzipLocation - project.ext.wpiLibInclude = "$wpiLibUnzipLocation/include" - - project.ext.hal = halUnzipLocation - project.ext.halInclude = "$halUnzipLocation/include" - - project.ext.addWpiLibLibraryLinks = { compileTask, linker, targetPlatform -> - compileTask.dependsOn project.tasks.unzipWpiLib - compileTask.dependsOn project.tasks.unzipHal - - linker.args "{project.hal}/libHALAthena.so" - linker.args "{project.hal}/libnilibraries.so" - linker.args "${project.wpiLib}/libwpilibc.so" - linker.args << '-L' + halUnzipLocation - linker.args << '-L' + wpiLibUnzipLocation - } - } -} ext.getOpenCvPlatformPackage = { targetPlatform -> if (targetPlatform.architecture.arm) { return 'linux-arm' diff --git a/examples/enum_usb/enum_usb.cpp b/examples/enum_usb/enum_usb.cpp index 7b5a605444..bd00a28f81 100644 --- a/examples/enum_usb/enum_usb.cpp +++ b/examples/enum_usb/enum_usb.cpp @@ -1,4 +1,4 @@ -#include "cameraserver.h" +#include "cscore.h" #include "llvm/SmallString.h" #include "llvm/raw_ostream.h" diff --git a/examples/usbcvstream/usbcvstream.cpp b/examples/usbcvstream/usbcvstream.cpp index 35ecb7cf80..5c3ba6e3b0 100644 --- a/examples/usbcvstream/usbcvstream.cpp +++ b/examples/usbcvstream/usbcvstream.cpp @@ -1,4 +1,4 @@ -#include "cameraserver.h" +#include "cscore.h" #include "opencv2/core/core.hpp" #include diff --git a/examples/usbstream/usbstream.cpp b/examples/usbstream/usbstream.cpp index 8cb2713e08..2b5d08ca1c 100644 --- a/examples/usbstream/usbstream.cpp +++ b/examples/usbstream/usbstream.cpp @@ -1,4 +1,4 @@ -#include "cameraserver.h" +#include "cscore.h" #include diff --git a/include/cameraserver.h b/include/cscore.h similarity index 77% rename from include/cameraserver.h rename to include/cscore.h index fa6dfb9dbb..7a3d3f5fff 100644 --- a/include/cameraserver.h +++ b/include/cscore.h @@ -5,16 +5,16 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_H_ -#define CAMERASERVER_H_ +#ifndef CSCORE_H_ +#define CSCORE_H_ /* C API */ -#include "cameraserver_c.h" +#include "cscore_c.h" #ifdef __cplusplus /* C++ API */ -#include "cameraserver_cpp.h" -#include "cameraserver_oo.h" +#include "cscore_cpp.h" +#include "cscore_oo.h" #endif /* __cplusplus */ -#endif /* CAMERASERVER_H_ */ +#endif /* CSCORE_H_ */ diff --git a/include/cameraserver_c.h b/include/cscore_c.h similarity index 99% rename from include/cameraserver_c.h rename to include/cscore_c.h index dc0c35e820..16eecd05e9 100644 --- a/include/cameraserver_c.h +++ b/include/cscore_c.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_C_H_ -#define CAMERASERVER_C_H_ +#ifndef CSCORE_C_H_ +#define CSCORE_C_H_ #include #include @@ -277,4 +277,4 @@ void CS_FreeEnumeratedVideoModes(CS_VideoMode* modes, int count); } #endif -#endif /* CAMERASERVER_C_H_ */ +#endif /* CSCORE_C_H_ */ diff --git a/include/cameraserver_cpp.h b/include/cscore_cpp.h similarity index 98% rename from include/cameraserver_cpp.h rename to include/cscore_cpp.h index a106cd713b..52a09c8cd8 100644 --- a/include/cameraserver_cpp.h +++ b/include/cscore_cpp.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_CPP_H_ -#define CAMERASERVER_CPP_H_ +#ifndef CSCORE_CPP_H_ +#define CSCORE_CPP_H_ #include @@ -18,7 +18,7 @@ #include "llvm/SmallVector.h" #include "llvm/StringRef.h" -#include "cameraserver_c.h" +#include "cscore_c.h" namespace cv { class Mat; @@ -272,4 +272,4 @@ llvm::ArrayRef EnumerateSinkHandles( } // namespace cs -#endif // CAMERASERVER_CPP_H_ +#endif // CSCORE_CPP_H_ diff --git a/include/cameraserver_oo.h b/include/cscore_oo.h similarity index 98% rename from include/cameraserver_oo.h rename to include/cscore_oo.h index 9b732d0c1c..1e96bd5b65 100644 --- a/include/cameraserver_oo.h +++ b/include/cscore_oo.h @@ -5,10 +5,10 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_OO_H_ -#define CAMERASERVER_OO_H_ +#ifndef CSCORE_OO_H_ +#define CSCORE_OO_H_ -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" namespace cs { @@ -401,6 +401,6 @@ class VideoListener { } // namespace cs -#include "cameraserver_oo.inl" +#include "cscore_oo.inl" -#endif // CAMERASERVER_OO_H_ +#endif // CSCORE_OO_H_ diff --git a/include/cameraserver_oo.inl b/include/cscore_oo.inl similarity index 99% rename from include/cameraserver_oo.inl rename to include/cscore_oo.inl index d0abc275ab..9d448e9100 100644 --- a/include/cameraserver_oo.inl +++ b/include/cscore_oo.inl @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_OO_INL_ -#define CAMERASERVER_OO_INL_ +#ifndef CSCORE_OO_INL_ +#define CSCORE_OO_INL_ namespace cs { @@ -336,4 +336,4 @@ inline VideoListener::~VideoListener() { } // namespace cs -#endif /* CAMERASERVER_OO_INL_ */ +#endif /* CSCORE_OO_INL_ */ diff --git a/java/java.gradle b/java/java.gradle index 23832de011..f01407da4c 100644 --- a/java/java.gradle +++ b/java/java.gradle @@ -27,8 +27,8 @@ dependencies { } jar { - description = 'Generates CameraServer jar, with the JNI shared libraries embedded' - baseName = 'cameraserver' + description = 'Generates cscore jar, with the JNI shared libraries embedded' + baseName = 'cscore' classifier = "$buildPlatform" duplicatesStrategy = 'exclude' @@ -48,41 +48,41 @@ jar { project.tasks.whenTaskAdded { task -> if (isArm) { - if (task.name == 'cameraserverSharedLibrary') jar.dependsOn task + if (task.name == 'cscoreSharedLibrary') jar.dependsOn task } else { - if (task.name == 'cameraserverX64SharedLibrary' || task.name == 'cameraserverX86SharedLibrary') + if (task.name == 'cscoreX64SharedLibrary' || task.name == 'cscoreX86SharedLibrary') jar.dependsOn task } } -task cameraserverJavaSource(type: Jar, dependsOn: classes) { - description = 'Generates the source jar for CameraServer java' +task cscoreJavaSource(type: Jar, dependsOn: classes) { + description = 'Generates the source jar for cscore java' group = 'WPILib' - baseName = 'cameraserver' + baseName = 'cscore' classifier = "sources" duplicatesStrategy = 'exclude' from sourceSets.main.allJava } -task cameraserverJavadoc(type: Jar, dependsOn: javadoc) { - description = 'Generates the javadoc jar for CameraServer java' +task cscoreJavadoc(type: Jar, dependsOn: javadoc) { + description = 'Generates the javadoc jar for cscore java' group = 'WPILib' - baseName = 'cameraserver' + baseName = 'cscore' classifier = "javadoc" duplicatesStrategy = 'exclude' from javadoc.destinationDir } -build.dependsOn cameraserverJavaSource -build.dependsOn cameraserverJavadoc +build.dependsOn cscoreJavaSource +build.dependsOn cscoreJavadoc /** * Generates the JNI headers */ -task jniHeadersCameraServer { - description = 'Generates JNI headers from edu.wpi.cameraserver.*' +task jniHeadersCscore { + description = 'Generates JNI headers from edu.wpi.cscore.*' group = 'WPILib' def outputFolder = file(generatedJNIHeaderLoc) inputs.files sourceSets.main.output @@ -93,7 +93,7 @@ task jniHeadersCameraServer { executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah') args '-d', outputFolder args '-classpath', sourceSets.main.runtimeClasspath.asPath - args 'edu.wpi.cameraserver.CameraServerJNI' + args 'edu.wpi.cscore.CameraServerJNI' } } } @@ -145,7 +145,7 @@ ext.setupJniIncludes = { binaries -> } } - jniHeadersCameraServer.outputs.files.each { file -> + jniHeadersCscore.outputs.files.each { file -> if (buildPlatform == 'arm') { cppCompiler.args '-I', file.getPath() } else { @@ -153,7 +153,7 @@ ext.setupJniIncludes = { binaries -> } } - dependsOn jniHeadersCameraServer + dependsOn jniHeadersCscore } } } diff --git a/java/lib/CameraServerJNI.cpp b/java/lib/CameraServerJNI.cpp index 166102aede..1a8e5e0814 100644 --- a/java/lib/CameraServerJNI.cpp +++ b/java/lib/CameraServerJNI.cpp @@ -5,12 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "edu_wpi_cameraserver_CameraServerJNI.h" +#include "edu_wpi_cscore_CameraServerJNI.h" #include "llvm/SmallString.h" #include "support/jni_util.h" -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" using namespace wpi::java; diff --git a/java/src/edu/wpi/cameraserver/CameraServerJNI.java b/java/src/edu/wpi/cscore/CameraServerJNI.java similarity index 99% rename from java/src/edu/wpi/cameraserver/CameraServerJNI.java rename to java/src/edu/wpi/cscore/CameraServerJNI.java index 81c7038567..4468deb6f5 100644 --- a/java/src/edu/wpi/cameraserver/CameraServerJNI.java +++ b/java/src/edu/wpi/cscore/CameraServerJNI.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; import java.io.File; import java.io.InputStream; diff --git a/java/src/edu/wpi/cameraserver/CvSink.java b/java/src/edu/wpi/cscore/CvSink.java similarity index 98% rename from java/src/edu/wpi/cameraserver/CvSink.java rename to java/src/edu/wpi/cscore/CvSink.java index 531cba4b79..f093ca18fe 100644 --- a/java/src/edu/wpi/cameraserver/CvSink.java +++ b/java/src/edu/wpi/cscore/CvSink.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; import org.opencv.core.Mat; diff --git a/java/src/edu/wpi/cameraserver/CvSource.java b/java/src/edu/wpi/cscore/CvSource.java similarity index 99% rename from java/src/edu/wpi/cameraserver/CvSource.java rename to java/src/edu/wpi/cscore/CvSource.java index 1762865d5b..6334104d35 100644 --- a/java/src/edu/wpi/cameraserver/CvSource.java +++ b/java/src/edu/wpi/cscore/CvSource.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; import org.opencv.core.Mat; diff --git a/java/src/edu/wpi/cameraserver/HTTPCamera.java b/java/src/edu/wpi/cscore/HTTPCamera.java similarity index 96% rename from java/src/edu/wpi/cameraserver/HTTPCamera.java rename to java/src/edu/wpi/cscore/HTTPCamera.java index bd3f565e25..b7be997e4c 100644 --- a/java/src/edu/wpi/cameraserver/HTTPCamera.java +++ b/java/src/edu/wpi/cscore/HTTPCamera.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; /// A source that represents a MJPEG-over-HTTP (IP) camera. public class HTTPCamera extends VideoSource { diff --git a/java/src/edu/wpi/cameraserver/MJPEGServer.java b/java/src/edu/wpi/cscore/MJPEGServer.java similarity index 97% rename from java/src/edu/wpi/cameraserver/MJPEGServer.java rename to java/src/edu/wpi/cscore/MJPEGServer.java index 4d4704cc98..b161c95c7a 100644 --- a/java/src/edu/wpi/cameraserver/MJPEGServer.java +++ b/java/src/edu/wpi/cscore/MJPEGServer.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; /// A sink that acts as a MJPEG-over-HTTP network server. public class MJPEGServer extends VideoSink { diff --git a/java/src/edu/wpi/cameraserver/USBCamera.java b/java/src/edu/wpi/cscore/USBCamera.java similarity index 97% rename from java/src/edu/wpi/cameraserver/USBCamera.java rename to java/src/edu/wpi/cscore/USBCamera.java index 083ab041cc..b0c644230b 100644 --- a/java/src/edu/wpi/cameraserver/USBCamera.java +++ b/java/src/edu/wpi/cscore/USBCamera.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; /// A source that represents a USB camera. public class USBCamera extends VideoSource { diff --git a/java/src/edu/wpi/cameraserver/USBCameraInfo.java b/java/src/edu/wpi/cscore/USBCameraInfo.java similarity index 96% rename from java/src/edu/wpi/cameraserver/USBCameraInfo.java rename to java/src/edu/wpi/cscore/USBCameraInfo.java index 491d7a4d23..0e83596330 100644 --- a/java/src/edu/wpi/cameraserver/USBCameraInfo.java +++ b/java/src/edu/wpi/cscore/USBCameraInfo.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; /// USB camera information public class USBCameraInfo { diff --git a/java/src/edu/wpi/cameraserver/VideoEvent.java b/java/src/edu/wpi/cscore/VideoEvent.java similarity index 98% rename from java/src/edu/wpi/cameraserver/VideoEvent.java rename to java/src/edu/wpi/cscore/VideoEvent.java index 1d0b0e203c..3f53fe90d9 100644 --- a/java/src/edu/wpi/cameraserver/VideoEvent.java +++ b/java/src/edu/wpi/cscore/VideoEvent.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; /// Video event public class VideoEvent { diff --git a/java/src/edu/wpi/cameraserver/VideoListener.java b/java/src/edu/wpi/cscore/VideoListener.java similarity index 97% rename from java/src/edu/wpi/cameraserver/VideoListener.java rename to java/src/edu/wpi/cscore/VideoListener.java index 091a2cb303..395005030d 100644 --- a/java/src/edu/wpi/cameraserver/VideoListener.java +++ b/java/src/edu/wpi/cscore/VideoListener.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; /// An event listener. This calls back to a desigated callback function when /// an event matching the specified mask is generated by the library. diff --git a/java/src/edu/wpi/cameraserver/VideoListenerFunction.java b/java/src/edu/wpi/cscore/VideoListenerFunction.java similarity index 94% rename from java/src/edu/wpi/cameraserver/VideoListenerFunction.java rename to java/src/edu/wpi/cscore/VideoListenerFunction.java index d11e616b5a..34130c4935 100644 --- a/java/src/edu/wpi/cameraserver/VideoListenerFunction.java +++ b/java/src/edu/wpi/cscore/VideoListenerFunction.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; public interface VideoListenerFunction { void apply(VideoEvent event); diff --git a/java/src/edu/wpi/cameraserver/VideoMode.java b/java/src/edu/wpi/cscore/VideoMode.java similarity index 97% rename from java/src/edu/wpi/cameraserver/VideoMode.java rename to java/src/edu/wpi/cscore/VideoMode.java index 7a0697448f..ef3b57131e 100644 --- a/java/src/edu/wpi/cameraserver/VideoMode.java +++ b/java/src/edu/wpi/cscore/VideoMode.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; /// Video mode public class VideoMode { diff --git a/java/src/edu/wpi/cameraserver/VideoProperty.java b/java/src/edu/wpi/cscore/VideoProperty.java similarity index 98% rename from java/src/edu/wpi/cameraserver/VideoProperty.java rename to java/src/edu/wpi/cscore/VideoProperty.java index 70e9dcaf8d..1b9ede3760 100644 --- a/java/src/edu/wpi/cameraserver/VideoProperty.java +++ b/java/src/edu/wpi/cscore/VideoProperty.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; public class VideoProperty { public enum Type { diff --git a/java/src/edu/wpi/cameraserver/VideoSink.java b/java/src/edu/wpi/cscore/VideoSink.java similarity index 98% rename from java/src/edu/wpi/cameraserver/VideoSink.java rename to java/src/edu/wpi/cscore/VideoSink.java index 15618df1b6..ee187b4813 100644 --- a/java/src/edu/wpi/cameraserver/VideoSink.java +++ b/java/src/edu/wpi/cscore/VideoSink.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; /// A source for video that provides a sequence of frames. Each frame may /// consist of multiple images (e.g. from a stereo or depth camera); these diff --git a/java/src/edu/wpi/cameraserver/VideoSource.java b/java/src/edu/wpi/cscore/VideoSource.java similarity index 99% rename from java/src/edu/wpi/cameraserver/VideoSource.java rename to java/src/edu/wpi/cscore/VideoSource.java index 7f416b88ad..478f2d8c7e 100644 --- a/java/src/edu/wpi/cameraserver/VideoSource.java +++ b/java/src/edu/wpi/cscore/VideoSource.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.cameraserver; +package edu.wpi.cscore; /// A source for video that provides a sequence of frames. Each frame may /// consist of multiple images (e.g. from a stereo or depth camera); these diff --git a/publish.gradle b/publish.gradle index dd17d3e57d..7900ead19c 100644 --- a/publish.gradle +++ b/publish.gradle @@ -3,10 +3,10 @@ import org.gradle.internal.os.OperatingSystem apply plugin: 'maven-publish' apply plugin: 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' -def csFile = file("$buildDir/cameraserver.txt") +def csFile = file("$buildDir/cscore.txt") task outputVersions() { - description = 'Prints the version of CameraServer to a file for use by the downstream packaging project' + description = 'Prints the version of cscore to a file for use by the downstream packaging project' group = 'Build' outputs.files(csFile) @@ -42,8 +42,8 @@ publishing { if (!OperatingSystem.current().isWindows()) { artifact nat.jar if (!project.buildArm) { - artifact nat.cameraserverJavaSource - artifact nat.cameraserverJavadoc + artifact nat.cscoreJavaSource + artifact nat.cscoreJavadoc } } @@ -52,11 +52,11 @@ publishing { artifact camArm.jar // If the library is not embedded include it in the repo if (!project.hasProperty('compilerPrefix')) { - artifact camArm.cameraserverZip + artifact camArm.cscoreZip } - artifact camArm.cameraserverJavaSource - artifact camArm.cameraserverJavadoc - artifact camArm.armCameraserverUberZip { + artifact camArm.cscoreJavaSource + artifact camArm.cscoreJavadoc + artifact camArm.armCscoreUberZip { classifier = 'uberzip' } } @@ -68,32 +68,32 @@ publishing { } } - groupId 'edu.wpi.cameraserver.java' - artifactId 'CameraServer' + groupId 'edu.wpi.cscore.java' + artifactId 'cscore' version WPILibVersion.version } } cpp(MavenPublication) { if (!OperatingSystem.current().isWindows()) { - artifact nat.cameraserverZip + artifact nat.cscoreZip } - artifact cameraserverSourceZip + artifact cscoreSourceZip if (project.buildArm) { - artifact project(':arm').cameraserverZip - artifact project(':arm').armCameraserverUberZip { + artifact project(':arm').cscoreZip + artifact project(':arm').armCscoreUberZip { classifier = 'uberzip' } } if (!OperatingSystem.current().isWindows()) { if (project.hasProperty('makeDesktop')) { - artifact nat.cameraserverZip, { + artifact nat.cscoreZip, { classifier = 'desktop' } } } - groupId 'edu.wpi.cameraserver.cpp' - artifactId 'CameraServer' + groupId 'edu.wpi.cscore.cpp' + artifactId 'cscore' version WPILibVersion.version } } diff --git a/src/CvSinkImpl.cpp b/src/CvSinkImpl.cpp index acb86cdcae..de2fcc44a9 100644 --- a/src/CvSinkImpl.cpp +++ b/src/CvSinkImpl.cpp @@ -11,7 +11,7 @@ #include "opencv2/core/core.hpp" #include "opencv2/highgui/highgui.hpp" -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" #include "c_util.h" #include "Handle.h" #include "Log.h" diff --git a/src/CvSinkImpl.h b/src/CvSinkImpl.h index ed5091f2cd..3672e4e964 100644 --- a/src/CvSinkImpl.h +++ b/src/CvSinkImpl.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_CVSINKIMPL_H_ -#define CAMERASERVER_CVSINKIMPL_H_ +#ifndef CS_CVSINKIMPL_H_ +#define CS_CVSINKIMPL_H_ #include #include @@ -50,4 +50,4 @@ class CvSinkImpl : public SinkImpl { } // namespace cs -#endif // CAMERASERVER_CVSINKIMPL_H_ +#endif // CS_CVSINKIMPL_H_ diff --git a/src/CvSourceImpl.cpp b/src/CvSourceImpl.cpp index 4250f485de..72b309dba7 100644 --- a/src/CvSourceImpl.cpp +++ b/src/CvSourceImpl.cpp @@ -12,7 +12,7 @@ #include "opencv2/highgui/highgui.hpp" #include "support/timestamp.h" -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" #include "c_util.h" #include "Handle.h" #include "Log.h" diff --git a/src/CvSourceImpl.h b/src/CvSourceImpl.h index 2614cd318e..bb64a0809b 100644 --- a/src/CvSourceImpl.h +++ b/src/CvSourceImpl.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_CVSOURCEIMPL_H_ -#define CAMERASERVER_CVSOURCEIMPL_H_ +#ifndef CS_CVSOURCEIMPL_H_ +#define CS_CVSOURCEIMPL_H_ #include #include @@ -75,4 +75,4 @@ class CvSourceImpl : public SourceImpl { } // namespace cs -#endif // CAMERASERVER_CVSOURCEIMPL_H_ +#endif // CS_CVSOURCEIMPL_H_ diff --git a/src/Frame.h b/src/Frame.h index 19a86590bf..1a6e699337 100644 --- a/src/Frame.h +++ b/src/Frame.h @@ -5,15 +5,15 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_FRAME_H_ -#define CAMERASERVER_FRAME_H_ +#ifndef CS_FRAME_H_ +#define CS_FRAME_H_ #include #include #include "llvm/StringRef.h" -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" namespace cs { @@ -109,4 +109,4 @@ class Frame { } // namespace cs -#endif // CAMERASERVER_FRAME_H_ +#endif // CS_FRAME_H_ diff --git a/src/Handle.h b/src/Handle.h index 4b611f1f01..d34d975f36 100644 --- a/src/Handle.h +++ b/src/Handle.h @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_HANDLE_H_ -#define CAMERASERVER_HANDLE_H_ +#ifndef CS_HANDLE_H_ +#define CS_HANDLE_H_ #include #include "llvm/StringRef.h" -#include "cameraserver_c.h" +#include "cscore_c.h" #include "UnlimitedHandleResource.h" namespace cs { @@ -107,4 +107,4 @@ typedef StaticUnlimitedHandleResource Sinks; } // namespace cs -#endif // CAMERASERVER_HANDLE_H_ +#endif // CS_HANDLE_H_ diff --git a/src/Log.h b/src/Log.h index 546c010446..2e581b43b3 100644 --- a/src/Log.h +++ b/src/Log.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_LOG_H_ -#define CAMERASERVER_LOG_H_ +#ifndef CS_LOG_H_ +#define CS_LOG_H_ #include "support/atomic_static.h" #include "support/Logger.h" @@ -42,4 +42,4 @@ class Logger : public wpi::Logger { } // namespace cs -#endif // CAMERASERVER_LOG_H_ +#endif // CS_LOG_H_ diff --git a/src/MJPEGServerImpl.cpp b/src/MJPEGServerImpl.cpp index 4f9128309c..f07a7d8688 100644 --- a/src/MJPEGServerImpl.cpp +++ b/src/MJPEGServerImpl.cpp @@ -15,7 +15,7 @@ #include "support/raw_socket_ostream.h" #include "tcpsockets/TCPAcceptor.h" -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" #include "Handle.h" #include "Log.h" #include "SourceImpl.h" diff --git a/src/MJPEGServerImpl.h b/src/MJPEGServerImpl.h index c590582d37..42193a9ad6 100644 --- a/src/MJPEGServerImpl.h +++ b/src/MJPEGServerImpl.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_MJPEGSERVERIMPL_H_ -#define CAMERASERVER_MJPEGSERVERIMPL_H_ +#ifndef CS_MJPEGSERVERIMPL_H_ +#define CS_MJPEGSERVERIMPL_H_ #include #include @@ -64,4 +64,4 @@ class MJPEGServerImpl : public SinkImpl { } // namespace cs -#endif // CAMERASERVER_MJPEGSERVERIMPL_H_ +#endif // CS_MJPEGSERVERIMPL_H_ diff --git a/src/Notifier.h b/src/Notifier.h index 7ce8f88ca2..0ae38cbea0 100644 --- a/src/Notifier.h +++ b/src/Notifier.h @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_NOTIFIER_H_ -#define CAMERASERVER_NOTIFIER_H_ +#ifndef CS_NOTIFIER_H_ +#define CS_NOTIFIER_H_ #include #include "support/atomic_static.h" #include "support/SafeThread.h" -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" namespace cs { @@ -64,4 +64,4 @@ class Notifier { } // namespace cs -#endif // CAMERASERVER_NOTIFIER_H_ +#endif // CS_NOTIFIER_H_ diff --git a/src/SinkImpl.h b/src/SinkImpl.h index 03fef945b2..2351077e89 100644 --- a/src/SinkImpl.h +++ b/src/SinkImpl.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_SINKIMPL_H_ -#define CAMERASERVER_SINKIMPL_H_ +#ifndef CS_SINKIMPL_H_ +#define CS_SINKIMPL_H_ #include #include @@ -77,4 +77,4 @@ class SinkImpl { } // namespace cs -#endif // CAMERASERVER_SINKIMPL_H_ +#endif // CS_SINKIMPL_H_ diff --git a/src/SourceImpl.h b/src/SourceImpl.h index 5fff01d434..d44ffb3833 100644 --- a/src/SourceImpl.h +++ b/src/SourceImpl.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_SOURCEIMPL_H_ -#define CAMERASERVER_SOURCEIMPL_H_ +#ifndef CS_SOURCEIMPL_H_ +#define CS_SOURCEIMPL_H_ #include #include @@ -18,7 +18,7 @@ #include "llvm/ArrayRef.h" #include "llvm/StringMap.h" #include "llvm/StringRef.h" -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" #include "Frame.h" namespace cs { @@ -209,4 +209,4 @@ class SourceImpl { } // namespace cs -#endif // CAMERASERVER_SOURCEIMPL_H_ +#endif // CS_SOURCEIMPL_H_ diff --git a/src/USBCameraBuffer.h b/src/USBCameraBuffer.h index 330763e207..ecfdb7b5c9 100644 --- a/src/USBCameraBuffer.h +++ b/src/USBCameraBuffer.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_USBCAMERABUFFER_H_ -#define CAMERASERVER_USBCAMERABUFFER_H_ +#ifndef CS_USBCAMERABUFFER_H_ +#define CS_USBCAMERABUFFER_H_ #ifdef __linux__ #include @@ -55,4 +55,4 @@ class USBCameraBuffer { } // namespace cs -#endif // CAMERASERVER_USBCAMERABUFFER_H_ +#endif // CS_USBCAMERABUFFER_H_ diff --git a/src/USBCameraImpl.cpp b/src/USBCameraImpl.cpp index 18052d6d16..a43f52c493 100644 --- a/src/USBCameraImpl.cpp +++ b/src/USBCameraImpl.cpp @@ -33,7 +33,7 @@ #include "llvm/SmallString.h" #include "support/timestamp.h" -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" #include "c_util.h" #include "Handle.h" #include "Log.h" diff --git a/src/USBCameraImpl.h b/src/USBCameraImpl.h index 5c928c0f0d..1db5237e5a 100644 --- a/src/USBCameraImpl.h +++ b/src/USBCameraImpl.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_USBCAMERAIMPL_H_ -#define CAMERASERVER_USBCAMERAIMPL_H_ +#ifndef CS_USBCAMERAIMPL_H_ +#define CS_USBCAMERAIMPL_H_ #include #include @@ -171,4 +171,4 @@ class USBCameraImpl : public SourceImpl { } // namespace cs -#endif // CAMERASERVER_USBCAMERAIMPL_H_ +#endif // CS_USBCAMERAIMPL_H_ diff --git a/src/UnlimitedHandleResource.h b/src/UnlimitedHandleResource.h index 219bbe618a..f2807e1364 100644 --- a/src/UnlimitedHandleResource.h +++ b/src/UnlimitedHandleResource.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_UNLIMITEDHANDLERESOURCE_H_ -#define CAMERASERVER_UNLIMITEDHANDLERESOURCE_H_ +#ifndef CS_UNLIMITEDHANDLERESOURCE_H_ +#define CS_UNLIMITEDHANDLERESOURCE_H_ #include #include @@ -154,4 +154,4 @@ class StaticUnlimitedHandleResource } // namespace cs -#endif // CAMERASERVER_UNLIMITEDHANDLERESOURCE_H_ +#endif // CS_UNLIMITEDHANDLERESOURCE_H_ diff --git a/src/c_util.h b/src/c_util.h index 4aa1df916d..f76c3712af 100644 --- a/src/c_util.h +++ b/src/c_util.h @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#ifndef CAMERASERVER_C_UTIL_H_ -#define CAMERASERVER_C_UTIL_H_ +#ifndef CS_C_UTIL_H_ +#define CS_C_UTIL_H_ namespace cs { @@ -19,4 +19,4 @@ inline char* ConvertToC(llvm::StringRef in) { } // namespace cs -#endif // CAMERASERVER_C_UTIL_H_ +#endif // CS_C_UTIL_H_ diff --git a/src/cameraserver_c.cpp b/src/cscore_c.cpp similarity index 99% rename from src/cameraserver_c.cpp rename to src/cscore_c.cpp index 9ba5bd80e8..bd593936e7 100644 --- a/src/cameraserver_c.cpp +++ b/src/cscore_c.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "cameraserver_c.h" +#include "cscore_c.h" #include #include @@ -13,7 +13,7 @@ #include "opencv2/core/core.hpp" #include "llvm/SmallString.h" -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" #include "c_util.h" extern "C" { diff --git a/src/cameraserver_cpp.cpp b/src/cscore_cpp.cpp similarity index 99% rename from src/cameraserver_cpp.cpp rename to src/cscore_cpp.cpp index a19589fcba..d889fd3029 100644 --- a/src/cameraserver_cpp.cpp +++ b/src/cscore_cpp.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "cameraserver_cpp.h" +#include "cscore_cpp.h" #include "llvm/SmallString.h" diff --git a/src/cameraserver_oo.cpp b/src/cscore_oo.cpp similarity index 98% rename from src/cameraserver_oo.cpp rename to src/cscore_oo.cpp index ae81441aab..4aac76ccf1 100644 --- a/src/cameraserver_oo.cpp +++ b/src/cscore_oo.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "cameraserver_oo.h" +#include "cscore_oo.h" using namespace cs;