osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Now that Python is mandatory on Windows, remove checks for it from nmakefiles 

Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a
Reviewed-on: https://code.wireshark.org/review/3392
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
This commit is contained in:
Роман Донченко 2014-08-03 23:47:42 +04:00 committed by Evan Huus
parent a4a94af0f7
commit dc748b1e7f
17 changed files with 17 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asn1/Makefile.inc.nmake
View File

@ -32,7 +32,6 @@ PROTO_OPT = -p $(PROTOCOL_NAME)
!ENDIF
$(DISSECTOR): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
!IFDEF PYTHON
$(PYTHON) "../../tools/asn2wrs.py" \
$(A2W_FLAGS) \
$(PROTO_OPT) \
@ -41,24 +40,15 @@ $(DISSECTOR): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
-D . \
-O ../../epan/dissectors \
$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
!ELSE
@echo Error: You need Python to use asn2wrs.py
@exit 1
!ENDIF
!IFDEF EXPORT_FILES
$(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXPORT_DEPENDS)
!IFDEF PYTHON
$(PYTHON) "../../tools/asn2wrs.py" \
-E $(A2W_FLAGS) \
$(PROTO_OPT) \
-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
@exit 1
!ENDIF
!ENDIF
# Don't clean these up until/unless we start building them...

22
epan/dissectors/Makefile.nmake
View File

@ -66,37 +66,19 @@ packet-rrc.obj : packet-rrc.c
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "dissectors", to indicate that we should build
# a register.c file for libwireshark.
# All subsequent arguments are the files to scan.
#
register.c: $(ALL_DISSECTORS_SRC) Makefile.common ..\..\tools\make-dissector-reg.py ..\..\tools\make-dissector-reg
!IFDEF PYTHON
@echo Making register.c (using python)
register.c: $(ALL_DISSECTORS_SRC) Makefile.common ..\..\tools\make-dissector-reg.py
@echo Making register.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . dissectors $(ALL_DISSECTORS_SRC)
!ELSE
@echo Making register.c (using sh)
@$(SH) ../../tools/make-dissector-reg . dissectors $(ALL_DISSECTORS_SRC)
!ENDIF
packet-ncp2222.c: ..\..\tools/ncp2222.py
!IFDEF PYTHON
@echo Making packet-ncp2222.c
$(PYTHON) "../../tools/ncp2222.py" -o packet-ncp2222.c
!ELSE
@echo Faking packet-ncp2222.c...
@echo Python is required to build the NCP disector
@echo Hiding packet-ncp.c...
mv packet-ncp.c packet-ncp.c.save
touch packet-ncp.c $@
!ENDIF
packet-ncp2222.obj: packet-ncp2222.inc

13
plugins/asn1/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/docsis/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/ethercat/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/gryphon/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/irda/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/m2m/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/mate/Makefile.nmake
View File

@ -71,25 +71,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) $(NODIST_REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES) $(NODIST_REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/opcua/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/profinet/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/unistim/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/wimax/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/wimaxasncp/Makefile.nmake
View File

@ -69,25 +69,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) $(NODIST_REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES) $(NODIST_REGISTER_SRC_FILES)
!ENDIF
!ENDIF

13
plugins/wimaxmacphy/Makefile.nmake
View File

@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
# reason.
#
# Therefore, we use a script to generate the register.c file.
# There are two versions of the script, a shell and a Python version.
# The Python script runs faster, since it uses caching to speed up
# repeated runs and doesn't invoke external processes, so we prefer
# that if Python is available.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py
@echo Making plugin.c (using python)
@echo Making plugin.c
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES)
!ELSE
plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg
@echo Making plugin.c (using sh)
@$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES)
!ENDIF
!ENDIF

16
ui/cli/Makefile.nmake
View File

@ -40,27 +40,13 @@ libcliui.lib : ..\..\config.h $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj
#
# We do this by grepping through sources.
#
# The shell script runs slowly, as multiple greps and seds are run
# for each input file; this is especially slow on Windows. Therefore,
# if Python is present (as indicated by PYTHON being defined), we run
# a faster Python script to do that work instead.
#
# Formatting conventions: The name of the tap_listener_register_*
# routines must start in column zero, or must be preceded only by
# "void " starting in column zero, and must not be inside #if.
#
!IFDEF PYTHON
tshark-tap-register.c: $(TSHARK_TAP_SRC) ..\..\tools\make-tap-reg.py
@echo Making tshark-tap-register.c using python
@$(PYTHON) ..\..\tools\make-tap-reg.py . tshark-taps $(TSHARK_TAP_SRC)
!ELSE
# The first argument is the name of the file to write.
# The second argument is the directory in which the source files live.
# All subsequent arguments are the files to scan.
tshark-tap-register.c: $(TSHARK_TAP_SRC) ..\..\tools\make-tapreg-dotc
@echo Making tshark-tap-register.c
@$(SH) ../../tools/make-tapreg-dotc tshark-tap-register.c . $(TSHARK_TAP_SRC)
!ENDIF
@$(PYTHON) ..\..\tools\make-tap-reg.py . tshark-taps $(TSHARK_TAP_SRC)
clean:
rm -f $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj libcliui.lib *.pdb \

13
ui/gtk/Makefile.nmake
View File

@ -84,25 +84,14 @@ wsiconcap.h:
for %n in (16 24 32 48 64) do \
gdk-pixbuf-csource --raw --name=wsiconcap_%n_pb_data ../../image/wsiconcap%n.png >> $@
# The shell script runs slowly, as multiple greps and seds are run
# for each input file; this is especially slow on Windows. Therefore,
# if Python is present (as indicated by PYTHON being defined), we run
# a faster Python script to do that work instead.
#
# The first argument is the directory in which the source files live.
# The second argument is "plugin", to indicate that we should build
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
!IFDEF PYTHON
wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) ../../tools/make-tap-reg.py
@echo Making wireshark-tap-register.c (using python)
@$(PYTHON) "../../tools/make-tap-reg.py" . taps $(WIRESHARK_TAP_SRC)
!ELSE
wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) ../../tools/make-tapreg-dotc Makefile.common
@echo Making wireshark-tap-register.c
@$(SH) ../../tools/make-tapreg-dotc wireshark-tap-register.c . $(WIRESHARK_TAP_SRC)
!ENDIF
@$(PYTHON) "../../tools/make-tap-reg.py" . taps $(WIRESHARK_TAP_SRC)
!IF "$(PORTAUDIO_VERSION)" == "18"
pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c