Browse Source

Generate all Exceptions fixed

JNI-106
heck 5 years ago
parent
commit
de22d6aad3
  1. 2
      .hgignore
  2. 4
      src/Makefile
  3. 4
      src/codegen/Makefile
  4. 11
      src/codegen/gen_java_Message.ysl2

2
.hgignore

@ -21,6 +21,7 @@ foundation_pEp_jniadapter_Engine.*
foundation_pEp_jniadapter_Message.* foundation_pEp_jniadapter_Message.*
foundation_pEp_jniadapter_Identity.h foundation_pEp_jniadapter_Identity.h
throw_pEp_exception.* throw_pEp_exception.*
src/java/foundation/pEp/jniadapter/exceptions/*.java
CipherSuite.java CipherSuite.java
Color.java Color.java
@ -30,7 +31,6 @@ EngineInterface.java
IdentityFlags.java IdentityFlags.java
Message.java Message.java
MessageInterface.java MessageInterface.java
pEp*.java
Rating.java Rating.java
Status.java Status.java
SyncHandshakeResult.java SyncHandshakeResult.java

4
src/Makefile

@ -67,7 +67,8 @@ GENERATED_JAVA=\
$(JAVA_PKG_ROOT)/SyncHandshakeResult.java \ $(JAVA_PKG_ROOT)/SyncHandshakeResult.java \
$(JAVA_PKG_ROOT)/SyncHandshakeSignal.java \ $(JAVA_PKG_ROOT)/SyncHandshakeSignal.java \
$(JAVA_PKG_ROOT)/interfaces/EngineInterface.java \ $(JAVA_PKG_ROOT)/interfaces/EngineInterface.java \
$(JAVA_PKG_ROOT)/interfaces/MessageInterface.java $(JAVA_PKG_ROOT)/interfaces/MessageInterface.java \
$(JAVA_PKG_ROOT)/exceptions/*.java
# files to compile which will be be generated # files to compile which will be be generated
GENERATED_CC=\ GENERATED_CC=\
@ -159,6 +160,7 @@ create-dirs:
mkdir -p $(JAVA_BUILD_ROOT)/$(JAVA_PKG_BASENAME)/exceptions mkdir -p $(JAVA_BUILD_ROOT)/$(JAVA_PKG_BASENAME)/exceptions
mkdir -p $(OBJ_DIR) mkdir -p $(OBJ_DIR)
mkdir -p $(DIST_DIR) mkdir -p $(DIST_DIR)
mkdir -p $(JAVA_PKG_ROOT)/exceptions
#rm -rf is too dangerous for vars #rm -rf is too dangerous for vars
remove-dirs: remove-dirs:

4
src/codegen/Makefile

@ -9,9 +9,9 @@ MARKER_DIR=../../build/marker/
PEP_HEADER:=$(shell $(CXX) $(CXXFLAGS) -E -M ../cxx/get_header.cc | grep -oe '[^[:space:]]*pEpEngine\.h' | head -1) PEP_HEADER:=$(shell $(CXX) $(CXXFLAGS) -E -M ../cxx/get_header.cc | grep -oe '[^[:space:]]*pEpEngine\.h' | head -1)
# Every ysl2 file that need to be "compiled" separately, needs to generate a "marker" file # Every ysl2 file that needs to be "compiled" separately, needs to generate a "marker" file
# The marker serves as the make target. # The marker serves as the make target.
# If the marker file is older than its corresponding ysl2 file, or not exsiting the ysl2 file will be "compiled" # If the marker file is older than its corresponding ysl2 file, or not exsiting, the ysl2 file will be "compiled"
# Naming: # Naming:
# For a ysl2 file called "gen_example_stuff.ysl2", a marker file called "gen_example_stuff.marker" is expected. # For a ysl2 file called "gen_example_stuff.ysl2", a marker file called "gen_example_stuff.marker" is expected.
YML2_MARKERS= \ YML2_MARKERS= \

11
src/codegen/gen_java_Message.ysl2

@ -6,6 +6,17 @@ tstylesheet {
template "/namespace[@name='pEp']" { template "/namespace[@name='pEp']" {
apply "struct|enum|exception", 0; apply "struct|enum|exception", 0;
document "../java/foundation/pEp/jniadapter/exceptions/pEpException.java", "text" {
||
package foundation.pEp.jniadapter.exceptions;
public class pEpException extends RuntimeException {
public pEpException(String message) {
super(message);
}
}
||
}
document("../../build/marker/gen_java_Message.marker", "text") > "" document("../../build/marker/gen_java_Message.marker", "text") > ""
} }

Loading…
Cancel
Save