From 13bf5539af20a4c372bbcb58c0a0f8d051ab3dbc Mon Sep 17 00:00:00 2001
From: Lars Roland <Lars.Roland@gmx.net>
Date: Sun, 16 Jan 2005 23:26:02 +0000
Subject: 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
---
 asn1/pkixtsp/Makefile.nmake | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'asn1/pkixtsp/Makefile.nmake')

diff --git a/asn1/pkixtsp/Makefile.nmake b/asn1/pkixtsp/Makefile.nmake
index f99021f00f..1f50c6edcb 100644
--- a/asn1/pkixtsp/Makefile.nmake
+++ b/asn1/pkixtsp/Makefile.nmake
@@ -4,7 +4,10 @@
 
 include ../../config.nmake
 
-DISSECTOR_FILES=packet-pkixtsp.c packet-pkixtsp.h
+UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
+
+PROTOCOL_NAME=pkixtsp
+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 PKIXTSP.asn packet-pkixtsp-template.c packet-pkixtsp-template.h pkixtsp.cnf
 !IFDEF PYTHON
-	$(PYTHON) ../../tools/asn2eth.py -X -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn
+	$(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.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-pkixtsp.c ..\..\epan\dissectors /d /y
-	xcopy packet-pkixtsp.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
-- 
cgit v1.2.1