Fix file dependencies for JER encoding

libasn1compiler/asn1c_fdeps.c

@@ -124,6 +124,10 @@ asn1c_read_file_dependencies(arg_t *arg, const char *datadir) {
 					  && strcmp(p, "CODEC-XER:") == 0) {
                     activate = 0;
 					section = FDEP_CODEC_XER;
+				} else if((arg->flags & A1C_GEN_JER)
+					  && strcmp(p, "CODEC-JER:") == 0) {
+                    activate = 0;
+					section = FDEP_CODEC_JER;
 				} else if((arg->flags & A1C_GEN_OER)
 					  && strcmp(p, "CODEC-OER:") == 0) {
                     activate = 0;

libasn1compiler/asn1c_fdeps.h

@@ -34,6 +34,7 @@ typedef struct {
         FDEP_CODEC_XER = (1 << 9),    /* Use contents only if not -no-gen-XER */
         FDEP_PRINT = (1 << 10),       /* Use contents only if not -no-gen-print */
         FDEP_RFILL = (1 << 11),       /* Use contents only if not -no-gen-random-fill */
+        FDEP_CODEC_JER = (1 << 12),   /* Use contents only if not -no-gen-JER */
     } section;                        /* Some file refers to it */
 
     /* Whether this chain is alive and has to be present in the output */

skeletons/file-dependencies

@@ -244,3 +244,29 @@ constr_SEQUENCE.h constr_SEQUENCE_rfill.c
 constr_SET_OF.h constr_SET_OF_rfill.c
 constr_SET.h constr_SET_rfill.c
 
+CODEC-JER:			# THIS IS A SPECIAL SECTION
+jer_encoder.h
+jer_encoder.h jer_encoder.c
+ANY.h ANY_jer.c
+BIT_STRING.h BIT_STRING_jer.c
+BMPString.h BMPString_jer.c
+BOOLEAN.h BOOLEAN_jer.c
+GeneralizedTime.h GeneralizedTime_jer.c
+INTEGER.h INTEGER_jer.c
+NULL.h NULL_jer.c
+NativeEnumerated.h NativeEnumerated_jer.c
+NativeInteger.h NativeInteger_jer.c
+NativeReal.h NativeReal_jer.c
+OBJECT_IDENTIFIER.h OBJECT_IDENTIFIER_jer.c
+OCTET_STRING.h OCTET_STRING_jer.c
+OPEN_TYPE.h OPEN_TYPE_jer.c
+REAL.h REAL_jer.c
+RELATIVE-OID.h RELATIVE-OID_jer.c
+UTCTime.h UTCTime_jer.c
+UniversalString.h UniversalString_jer.c
+asn_codecs_prim.h asn_codecs_prim_jer.c
+constr_CHOICE.h constr_CHOICE_jer.c
+constr_SEQUENCE_OF.h constr_SEQUENCE_OF_jer.c
+constr_SEQUENCE.h constr_SEQUENCE_jer.c
+constr_SET_OF.h constr_SET_OF_jer.c
+constr_SET.h constr_SET_jer.c

skeletons/jer_encoder.c

@@ -11,7 +11,7 @@
  */
 asn_enc_rval_t
 jer_encode(const asn_TYPE_descriptor_t *td, const void *sptr,
-           enum jer_encoder_flags_e jer_flags, asn_app_consume_bytes_f *cb,
+           asn_app_consume_bytes_f *cb,
            void *app_key) {
     asn_enc_rval_t er = {0, 0, 0};
 	asn_enc_rval_t tmper;

skeletons/jer_encoder.h

@@ -17,7 +17,6 @@ struct asn_TYPE_descriptor_s;	/* Forward declaration */
 enum jer_encoder_flags_e {
 	/* Mode of encoding */
 	JER_F_BASIC	= 0x01,	/* BASIC-JER (pretty-printing) */
-	JER_F_CANONICAL	= 0x02	/* Canonical JER (strict rules) */
 };
 
 /*
@@ -26,7 +25,6 @@ enum jer_encoder_flags_e {
  */
 asn_enc_rval_t jer_encode(const struct asn_TYPE_descriptor_s *type_descriptor,
                           const void *struct_ptr, /* Structure to be encoded */
-                          enum jer_encoder_flags_e jer_flags,
                           asn_app_consume_bytes_f *consume_bytes_cb,
                           void *app_key /* Arbitrary callback argument */
 );