osmocom
/
asn1c
mirror of https://gerrit.osmocom.org/asn1c
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename Makefile.am.example => converter-example.mk 

The generated Makefile.am.example is not really in the automake style.
Renaming it to converter-example.mk to reflect that it is a plain makefile
snippet and that it is for creating the converter-example
This commit is contained in:
Jon Ringle 2017-11-15 02:06:47 -05:00 committed by Lev Walkin
parent f71745aa7a
commit 3016fd59fe
16 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -43,6 +43,7 @@ stamp-h*
# /tests/
/tests/tests-asn1c-smoke/Makefile.am.libasncodec
/tests/tests-asn1c-smoke/Makefile.am.sample
/tests/tests-asn1c-smoke/converter-example.mk
/tests/tests-asn1c-smoke/*.[acho]
/tests/tests-asn1c-smoke/*.asn
/tests/tests-asn1c-smoke/*.txt
@ -77,6 +78,7 @@ doc/docsrc/*.xdv
/examples/sample.source.*/.tmp.*
/examples/sample.source.*/Makefile.am.libasncodec
/examples/sample.source.*/Makefile.am.example
/examples/sample.source.*/converter-example.mk
!/examples/sample.source.*/Makefile
!/examples/sample.source.*/config.h

6
doc/docsrc/asn1c-usage.tex
View File

@ -149,7 +149,7 @@ asn1c -no-gen-example %\textbf{rectangle.asn}%
\item Create the converter and dumper:
\begin{bash}
make -f Makefile.am.example
make -f converter-example.mk
\end{bash}
\item Done. The binary file converter is ready:
@ -486,14 +486,14 @@ after compilation will be rather small anyway.
generated files.
This makefile can be used on its own to build the just the codec library.
\item A \textbf{converter-example.c} file containing the \emph{int main()} function with a fully functioning encoder and data format converter. It can convert a given PDU between BER, XER, OER and PER. At some point you will want to replace this file with your own file containing the \emph{int main()} function.
\item A \textbf{Makefile.am.example} file which binds together
\item A \textbf{converter-example.mk} file which binds together
\textbf{Makefile.am.libasncodecs} and \textbf{converter-example.c}
to build a versatile converter and debugger for your data formats.
\end{itemize}
It is possible to compile everything with just a couple of instructions:
\begin{bash}
asn1c -pdu=%\emph{Rectangle}% *.asn
make -f Makefile.am.example # If you use `make`
make -f converter-example.mk # If you use `make`
\end{bash}
or
\begin{bash}

8
examples/sample.makefile.regen
View File

@ -31,8 +31,8 @@ else
asn1c ${EFFECTIVE_CMDOPTS} || exit $?
fi
if test ! -f Makefile.am.example ; then
echo "Makefile.am.example is missing"
if test ! -f converter-example.mk ; then
echo "converter-example.mk is missing"
exit 1
fi
@ -45,7 +45,7 @@ test -n "$TITLE" && EXTRA_CFLAGS="-DASN_CONVERTER_TITLE=\"$TITLE\" ${EXTRA_CFLAG
echo "CFLAGS += ${EXTRA_CFLAGS}"
echo "begin: ${ASN_PDU}.c maybe-wip-pause all"
echo
echo "-include Makefile.am.example"
echo "-include converter-example.mk"
echo
echo "${ASN_PDU}.c: $0 ${ASN_MODULES}"
echo " make regen-makefile"
@ -147,7 +147,7 @@ test -n "$TITLE" && EXTRA_CFLAGS="-DASN_CONVERTER_TITLE=\"$TITLE\" ${EXTRA_CFLAG
echo ' rm -f $(ASN_MODULE_SRCS)'
echo ' rm -f $(ASN_MODULE_HDRS)'
echo ' rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)'
echo " rm -f Makefile.am.example"
echo " rm -f converter-example.mk"
} > Makefile
echo

4
examples/sample.source.1609.2/Makefile
View File

@ -2,7 +2,7 @@ ASN_PROGRAM = 1609-2-dump
CFLAGS += -DASN_CONVERTER_TITLE="IEEE 1609.2-2016 decoder" -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE
begin: Certificate.c maybe-wip-pause all
-include Makefile.am.example
-include converter-example.mk
Certificate.c: ../sample.makefile.regen ../IEEE-1609.2-2016.asn1
make regen-makefile
@ -104,4 +104,4 @@ distclean: clean
rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
rm -f converter-example.mk

4
examples/sample.source.J2735/Makefile
View File

@ -2,7 +2,7 @@ ASN_PROGRAM = j2735-dump
CFLAGS += -DASN_CONVERTER_TITLE="J2735 DSRC decoder" -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE
begin: MessageFrame.c maybe-wip-pause all
-include Makefile.am.example
-include converter-example.mk
MessageFrame.c: ../sample.makefile.regen ../J2735_201603.asn1
make regen-makefile
@ -104,4 +104,4 @@ distclean: clean
rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
rm -f converter-example.mk

4
examples/sample.source.LDAP3/Makefile
View File

@ -2,7 +2,7 @@ ASN_PROGRAM = ldap3dump
CFLAGS += -DASN_CONVERTER_TITLE="Lightweight Directory Access Protocol V3 decoder" -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE
begin: LDAPMessage.c maybe-wip-pause all
-include Makefile.am.example
-include converter-example.mk
LDAPMessage.c: ../sample.makefile.regen ../rfc4511-Lightweight-Directory-Access-Protocol-V3.asn1
make regen-makefile
@ -104,4 +104,4 @@ distclean: clean
rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
rm -f converter-example.mk

4
examples/sample.source.MEGACO/Makefile
View File

@ -2,7 +2,7 @@ ASN_PROGRAM = megaco-dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE
begin: MegacoMessage.c maybe-wip-pause all
-include Makefile.am.example
-include converter-example.mk
MegacoMessage.c: ../sample.makefile.regen ../rfc3525-MEDIA-GATEWAY-CONTROL.asn1
make regen-makefile
@ -103,4 +103,4 @@ distclean: clean
rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
rm -f converter-example.mk

4
examples/sample.source.PKIX1/Makefile
View File

@ -2,7 +2,7 @@ ASN_PROGRAM = x509dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE
begin: Certificate.c maybe-wip-pause all
-include Makefile.am.example
-include converter-example.mk
Certificate.c: ../sample.makefile.regen ../rfc3280-*.asn1
make regen-makefile
@ -103,4 +103,4 @@ distclean: clean
rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
rm -f converter-example.mk

4
examples/sample.source.RRC/Makefile
View File

@ -2,7 +2,7 @@ ASN_PROGRAM = rrc-dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE
begin: DL-DCCH-Message.c maybe-wip-pause all
-include Makefile.am.example
-include converter-example.mk
DL-DCCH-Message.c: ../sample.makefile.regen ../rrc-7.1.0.asn1
make regen-makefile
@ -103,4 +103,4 @@ distclean: clean
rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
rm -f converter-example.mk

4
examples/sample.source.TAP3/Makefile
View File

@ -2,7 +2,7 @@ ASN_PROGRAM = tap3dump
CFLAGS += -DASN_CONVERTER_TITLE="GSM TAP3 (Transferred Account Procedure, Version 3) decoder" -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE
begin: DataInterChange.c maybe-wip-pause all
-include Makefile.am.example
-include converter-example.mk
DataInterChange.c: ../sample.makefile.regen ../tap3.asn1
make regen-makefile
@ -104,4 +104,4 @@ distclean: clean
rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
rm -f converter-example.mk

4
examples/sample.source.ULP/Makefile
View File

@ -2,7 +2,7 @@ ASN_PROGRAM = ulp-dump
CFLAGS += -DASN_CONVERTER_TITLE="OMA UserPlane Location Protocol decoder" -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE
begin: ULP-PDU.c maybe-wip-pause all
-include Makefile.am.example
-include converter-example.mk
ULP-PDU.c: ../sample.makefile.regen ../ulp.asn1
make regen-makefile
@ -104,4 +104,4 @@ distclean: clean
rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
rm -f converter-example.mk

18
libasn1compiler/asn1c_save.c
View File

@ -160,13 +160,14 @@ asn1c__save_library_makefile(arg_t *arg, const asn1c_dep_chainset *deps,
}
static int
asn1c__save_example_makefile(arg_t *arg, const asn1c_dep_chainset *deps, const char *datadir,
const char *destdir, const char *makefile_name,
const char *library_makefile_name, int argc,
char **argv) {
asn1c__save_example_mk_makefile(arg_t *arg, const asn1c_dep_chainset *deps, const char *datadir,
const char *destdir, const char *makefile_name,
const char *library_makefile_name, int argc,
char **argv) {
FILE *mkf;
asn1c_dep_chain *dlist = asn1c_deps_flatten(deps, FDEP_CONVERTER);
/* Generate converter-example.mk snippet */
mkf = asn1c_open_file(destdir, makefile_name, "", 0);
if(mkf == NULL) {
perror(makefile_name);
@ -228,6 +229,7 @@ asn1c__save_example_makefile(arg_t *arg, const asn1c_dep_chainset *deps, const c
fclose(mkf);
safe_fprintf(stderr, "Generated %s%s\n", destdir, makefile_name);
return 0;
}
@ -246,7 +248,7 @@ asn1c_save_compiled_output(arg_t *arg, const char *datadir, const char *destdir,
int argc, int optc, char **argv) {
int ret = -1;
const char* program_makefile = "Makefile.am.example";
const char* program_makefile = "converter-example.mk";
const char* library_makefile = "Makefile.am.libasncodec";
/*
@ -291,9 +293,9 @@ asn1c_save_compiled_output(arg_t *arg, const char *datadir, const char *destdir,
if(ret) break;
if(arg->flags & A1C_GEN_EXAMPLE) {
ret = asn1c__save_example_makefile(arg, deps, datadir, destdir,
program_makefile,
library_makefile, argc, argv);
ret = asn1c__save_example_mk_makefile(arg, deps, datadir, destdir,
program_makefile,
library_makefile, argc, argv);
if(ret) break;
}
} while(0);

2
libasn1compiler/asn1compiler.h
View File

@ -85,7 +85,7 @@ enum asn1c_flags {
*/
A1C_GEN_PER = 0x80000,
/*
* Generate converter-example.c and Makefile.am.example
* Generate converter-example.c and converter-example.mk
*/
A1C_GEN_EXAMPLE = 0x100000,
};

6
tests/tests-asn1c-smoke/check-asn1c-smoke.sh
View File

@ -8,7 +8,7 @@ top_builddir=${top_builddir:-../..}
top_srcdir=${top_srcdir:-../..}
cleanup() {
rm -rf *.[acho] Makefile.am.* *.txt *.asn
rm -rf *.[acho] Makefile.am.* *.mk *.txt *.asn
rm -f converter-example
}
@ -34,12 +34,12 @@ verify() {
{
echo "$asncmd"
echo "${MAKE:-make} -f Makefile.am.example"
echo "${MAKE:-make} -f converter-example.mk"
} > status.txt
echo "Module DEFINITIONS::=BEGIN T::=$type END" > test.asn
$asncmd
CFLAGS=-O0 ${MAKE:-make} -f Makefile.am.example | tail -10
CFLAGS=-O0 ${MAKE:-make} -f converter-example.mk | tail -10
}
verify_type_with_variants() {

2
tests/tests-c-compiler/check-assembly.sh
View File

@ -84,7 +84,7 @@ ASN_PROGRAM_SRCS = ${source_short}
CC ?= ${CC}
CXX ?= ${CXX}
-include Makefile.am.example
-include converter-example.mk
all: compiled-module
\$(MAKE) check-program

4
tests/tests-randomized/check-bundles.sh
View File

@ -286,7 +286,7 @@ asn_compile() {
echo "ASN_PROGRAM = random-test-driver"
echo "ASN_PROGRAM_SRCS = random-test-driver.c"
echo
echo "include Makefile.am.example"
echo "include converter-example.mk"
echo
echo "all-tests-succeeded: ${abs_top_builddir}/asn1c/asn1c \$(ASN_PROGRAM_SRCS) \$(ASN_MODULE_SRCS) \$(ASN_MODULE_HDRS)"
echo " @rm -f \$@"
@ -295,7 +295,7 @@ asn_compile() {
echo " @exit 1"
echo
} > Makefile
echo "Makefile.am.example -> Makefile"
echo "converter-example.mk -> Makefile"
}
# Make up to four different passes: