mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01:00
UAVObjects-java: move java output files into synthetic dir
Move generated Java UAVObject output into the common synthetic tree for all UAVObject output. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2527 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
5e6d87b2db
commit
b736b2a956
2
Makefile
2
Makefile
@ -213,7 +213,7 @@ uavobjgenerator:
|
||||
)
|
||||
|
||||
.PHONY:uavobjects
|
||||
uavobjects: uavobjects_gcs uavobjects_flight uavobjects_python uavobjects_matlab
|
||||
uavobjects: uavobjects_gcs uavobjects_flight uavobjects_python uavobjects_matlab uavobjects_java
|
||||
|
||||
UAVOBJ_XML_DIR := $(ROOT_DIR)/shared/uavobjectdefinition
|
||||
UAVOBJ_OUT_DIR := $(BUILD_DIR)/uavobject-synthetics
|
||||
|
@ -27,10 +27,10 @@
|
||||
#include "uavobjectgeneratorjava.h"
|
||||
using namespace std;
|
||||
|
||||
bool UAVObjectGeneratorJava::generate(UAVObjectParser* parser,QString basepath) {
|
||||
QDir javaTemplatePath = QDir( basepath + QString(JAVA_TEMPLATE_DIR));
|
||||
bool UAVObjectGeneratorJava::generate(UAVObjectParser* parser,QString templatepath,QString outputpath) {
|
||||
QDir javaTemplatePath = QDir( templatepath + QString(JAVA_TEMPLATE_DIR));
|
||||
|
||||
javaCodePath = QDir ( basepath + QString(JAVA_GENERATED_DIR));
|
||||
javaCodePath = QDir ( outputpath + QString(JAVA_GENERATED_DIR));
|
||||
|
||||
javaCodeTemplate = readFile( javaTemplatePath.absoluteFilePath("uavobjecttemplate.java") );
|
||||
QString javaInitCodeTemplate = readFile( javaTemplatePath.absoluteFilePath("uavobjectsinittemplate.java") );
|
||||
|
@ -28,14 +28,14 @@
|
||||
#define UAVOBJECTGENERATORJAVA_H
|
||||
|
||||
#define JAVA_TEMPLATE_DIR "ground/src/libs/juavobjects/templates/"
|
||||
#define JAVA_GENERATED_DIR "build/juavobjects/src/org/openpilot/uavtalk"
|
||||
#define JAVA_GENERATED_DIR "java/src/org/openpilot/uavtalk"
|
||||
|
||||
#include "../generator_common.h"
|
||||
|
||||
class UAVObjectGeneratorJava
|
||||
{
|
||||
public:
|
||||
bool generate(UAVObjectParser* gen,QString basepath);
|
||||
bool generate(UAVObjectParser* gen,QString templatepath,QString outputpath);
|
||||
|
||||
private:
|
||||
QString javaCodeTemplate;
|
||||
|
@ -190,7 +190,7 @@ int main(int argc, char *argv[])
|
||||
if (do_java|do_all) {
|
||||
cout << "generating java code" << endl ;
|
||||
UAVObjectGeneratorJava javagen;
|
||||
javagen.generate(parser,templatepath);
|
||||
javagen.generate(parser,templatepath,outputpath);
|
||||
}
|
||||
|
||||
// generate python code if wanted
|
||||
|
Loading…
x
Reference in New Issue
Block a user