Commit f0109d6a authored by Botond Baranyi's avatar Botond Baranyi
Browse files

Fixed type descriptor generation for ASN.1 record of/set of with switch '-X' (bug 560851)



Change-Id: Ic63d9a49af255403645db664a0fbe709d77d1bfa
Signed-off-by: Botond Baranyi's avatarBotond Baranyi <botond.baranyi@ericsson.com>
parent cab82d17
...@@ -7321,6 +7321,7 @@ namespace Common { ...@@ -7321,6 +7321,7 @@ namespace Common {
else if (enable_xer()) return false; else if (enable_xer()) return false;
else if ((jsonattrib || (!is_asn1() && else if ((jsonattrib || (!is_asn1() &&
hasEncodeAttr(get_encoding_name(CT_JSON)))) && enable_json()) return false; hasEncodeAttr(get_encoding_name(CT_JSON)))) && enable_json()) return false;
else if (oerattrib && !oerattrib->empty()) return false;
else return true; else return true;
default: default:
return false; return false;
......
...@@ -2,3 +2,5 @@ typeDescrGenWIthNoXER ...@@ -2,3 +2,5 @@ typeDescrGenWIthNoXER
typeDescrGenWIthNoXER.exe typeDescrGenWIthNoXER.exe
typeDescrGenWIthNoXER*.cc typeDescrGenWIthNoXER*.cc
typeDescrGenWIthNoXER*.hh typeDescrGenWIthNoXER*.hh
AsnTypeDescrGenWithNoXer*.cc
AsnTypeDescrGenWithNoXer*.hh
--/////////////////////////////////////////////////////////////////////////////
-- Copyright (c) 2000-2020 Ericsson Telecom AB
-- All rights reserved. This program and the accompanying materials
-- are made available under the terms of the Eclipse Public License v2.0
-- which accompanies this distribution, and is available at
-- https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
--
-- Contributors:
-- Baranyi, Botond
--
--/////////////////////////////////////////////////////////////////////////////
AsnTypeDescrGenWithNoXer
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
IMPORTS ;
Seq ::= SEQUENCE {
field INTEGER
}
SeqOf ::= SEQUENCE OF Seq
END
...@@ -20,7 +20,9 @@ COMPILER_FLAGS += -X ...@@ -20,7 +20,9 @@ COMPILER_FLAGS += -X
TTCN3_MODULES = typeDescrGenWIthNoXER.ttcn TTCN3_MODULES = typeDescrGenWIthNoXER.ttcn
GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) ASN1_MODULES = AsnTypeDescrGenWithNoXer.asn
GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn:.cc)
GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh)
ifdef CODE_SPLIT ifdef CODE_SPLIT
GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc))
...@@ -41,7 +43,7 @@ $(TARGET): $(GENERATED_SOURCES) $(USER_SOURCES) ...@@ -41,7 +43,7 @@ $(TARGET): $(GENERATED_SOURCES) $(USER_SOURCES)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \
-L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS) -L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS)
$(GENERATED_SOURCES) $(GENERATED_HEADERS): $(TTCN3_MODULES) $(GENERATED_SOURCES) $(GENERATED_HEADERS): $(TTCN3_MODULES) $(ASN1_MODULES)
$(TTCN3_COMPILER) $(COMPILER_FLAGS) $^ $(TTCN3_COMPILER) $(COMPILER_FLAGS) $^
clean distclean: clean distclean:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment