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/pkix1explicit | |
| parent | ce032dd5cf1248a0611ae61902c721eed04888e0 (diff) | |
| download | wireshark-13bf5539af20a4c372bbcb58c0a0f8d051ab3dbc.tar.gz wireshark-13bf5539af20a4c372bbcb58c0a0f8d051ab3dbc.tar.bz2 wireshark-13bf5539af20a4c372bbcb58c0a0f8d051ab3dbc.zip | |
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/pkix1explicit')
| -rw-r--r-- | asn1/pkix1explicit/Makefile.nmake | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/asn1/pkix1explicit/Makefile.nmake b/asn1/pkix1explicit/Makefile.nmake index 9d4ca6f483..19e15b6de2 100644 --- a/asn1/pkix1explicit/Makefile.nmake +++ b/asn1/pkix1explicit/Makefile.nmake @@ -4,7 +4,10 @@ include ../../config.nmake -DISSECTOR_FILES=packet-pkix1explicit.c packet-pkix1explicit.h +UNIX2DOS=$(PERL) ../../tools/unix2dos.pl + +PROTOCOL_NAME=pkix1explicit +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h all: generate_dissector @@ -12,12 +15,27 @@ generate_dissector: $(DISSECTOR_FILES) $(DISSECTOR_FILES): ../../tools/asn2eth.py PKIX1EXPLICIT93.asn packet-pkix1explicit-template.c packet-pkix1explicit-template.h pkix1explicit.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn + $(PYTHON) ../../tools/asn2eth.py -e -X -b -p $(PROTOCOL_NAME) -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn +!ELSE + @echo Error: You need Python to use asn2eth.py + @exit 1 !ENDIF clean: rm -f parsetab.py $(DISSECTOR_FILES) -copy_files: generate_dissector - xcopy packet-pkix1explicit.c ..\..\epan\dissectors /d /y - xcopy packet-pkix1explicit.h ..\..\epan\dissectors /d /y +# 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 fix_eol + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y |