osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Make sure that we pass on the same set of parameters to asn2wrs.py on Unix/Windows. This fix ensures that the generated copyright headers are identical on both platforms. 

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3658

svn path=/trunk/; revision=29336
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-08 09:57:07 +00:00
parent d36637e8f5
commit ced157e4b7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
asn1/Makefile.inc.nmake
View File

@ -24,7 +24,6 @@
UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
generate_dissector: $(DISSECTOR_FILES)
generate_export: $(EXPORT_FILES)
@ -38,8 +37,9 @@ $(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
$(PYTHON) "../../tools/asn2wrs.py" \
$(A2W_FLAGS) \
$(PROTO_OPT) \
-c $(PROTOCOL_NAME).cnf \
-s packet-$(PROTOCOL_NAME)-template \
-c ./$(PROTOCOL_NAME).cnf \
-s ./packet-$(PROTOCOL_NAME)-template \
-D . \
$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
!ELSE
@echo Error: You need Python to use asn2wrs.py
@ -52,7 +52,8 @@ $(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES)
$(PYTHON) "../../tools/asn2wrs.py" \
-E $(A2W_FLAGS) \
$(PROTO_OPT) \
-c $(PROTOCOL_NAME).cnf \
-c ./$(PROTOCOL_NAME).cnf \
-D . \
$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
!ELSE
@echo Error: You need Python to use asn2wrs.py
@ -82,7 +83,7 @@ fix_eol: generate_dissector
IF "%1"=="" EXIT
move %1 %1.tmp
$(UNIX2DOS) < %1.tmp > %1
del /f %1.tmp
del /f %1.tmp
<<
<<fix_eol.bat
FOR %%A IN ($(DISSECTOR_FILES)) DO CALL fix_file.bat %%A
@ -90,5 +91,5 @@ FOR %%A IN ($(DISSECTOR_FILES)) DO CALL fix_file.bat %%A
copy_files: generate_dissector
<<copy_files.bat
FOR %%A IN ($(DISSECTOR_FILES)) DO xcopy %%A ..\..\epan\dissectors/d /y
FOR %%A IN ($(DISSECTOR_FILES)) DO xcopy %%A ..\..\epan\dissectors /d /y
<<

2
epan/dissectors/packet-x420.c
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-x420.c */
/* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn */
/* ../../tools/asn2wrs.py -b -e -p x420 -c ./x420.cnf -s ./packet-x420-template -D . IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn */
/* Input file: packet-x420-template.c */