diff options
author | Lars Roland <Lars.Roland@gmx.net> | 2005-01-16 23:26:02 +0000 |
---|---|---|
committer | Lars Roland <Lars.Roland@gmx.net> | 2005-01-16 23:26:02 +0000 |
commit | 13bf5539af20a4c372bbcb58c0a0f8d051ab3dbc (patch) | |
tree | 6729af791c3a980a4455c5271cb71657d4587889 /asn1/cmip/Makefile.nmake | |
parent | ce032dd5cf1248a0611ae61902c721eed04888e0 (diff) |
When using Cygwin's python asn2eth.py
generates dissectors with mixed EOL! SVN doesn't allow you to commit such files.
Add a target to all nmake makefiles in asn1 subdirectory which will fix these files.
svn path=/trunk/; revision=13077
Diffstat (limited to 'asn1/cmip/Makefile.nmake')
-rw-r--r-- | asn1/cmip/Makefile.nmake | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/asn1/cmip/Makefile.nmake b/asn1/cmip/Makefile.nmake index 80708b4b2f..a1a7cef509 100644 --- a/asn1/cmip/Makefile.nmake +++ b/asn1/cmip/Makefile.nmake @@ -4,20 +4,38 @@ include ../../config.nmake -DISSECTOR_FILES=packet-cmip.c packet-cmip.h +UNIX2DOS=$(PERL) ../../tools/unix2dos.pl + +PROTOCOL_NAME=cmip +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CMIP.asn packet-cmip-template.c packet-cmip-template.h cmip.cnf +$(DISSECTOR_FILES): ../../tools/asn2eth.py CMIP.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn + $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template CMIP.asn +!ELSE + @echo Error: You need Python to use asn2eth.py + @exit 1 !ENDIF clean: - rm -f cmip-exp.cnf parsetab.py $(DISSECTOR_FILES) + rm -f $(PROTOCOL_NAME)-exp.cnf parsetab.py $(DISSECTOR_FILES) + +# Fix EOL in generated dissectors. Cygwin's python generates files with +# mixed EOL styles, which can't be commited to the SVN repository. +# Stuff included from template and "cnf" files has "\r\n" on windows, while +# the generated stuff has "\n". + +fix_eol: generate_dissector + move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp + move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp + $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c + $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h + del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp -copy_files: generate_dissector - xcopy packet-cmip.c ..\..\epan\dissectors /d /y - xcopy packet-cmip.h ..\..\epan\dissectors /d /y +copy_files: generate_dissector fix_eol + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y |