diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-08 09:57:07 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-08 09:57:07 +0000 |
| commit | ced157e4b7e0bea85f6a99826a107e45897a8700 (patch) | |
| tree | dec500d1030063773c855ed0082dc98796a2c2a1 /asn1/Makefile.inc.nmake | |
| parent | d36637e8f5b9201dac9b7420a84290df0b417c2e (diff) | |
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
Diffstat (limited to 'asn1/Makefile.inc.nmake')
| -rw-r--r-- | asn1/Makefile.inc.nmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake index a091dc9a78..c15f2c1476 100644 --- a/asn1/Makefile.inc.nmake +++ b/asn1/Makefile.inc.nmake @@ -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 << |