Ethereal-dev: Re: [Ethereal-dev] fixes for nsis-installer script and makefile

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Lars Roland <Lars.Roland@xxxxxxx>
Date: Tue, 03 Feb 2004 23:09:51 +0100
Hello Guy,

Guy Harris wrote:

On Tue, Feb 03, 2004 at 03:17:13PM +0100, Lars Roland wrote:


-EXE=../../ethereal.exe ../../tethereal.exe ../../editcap.exe \
+!IFDEF GTK1
+DEST=ethereal
+GTK_DIR=$(GTK1_DIR)
+!ELSE
+DEST=ethereal2
+GTK_DIR=$(GTK2_DIR)
+!ENDIF
+
+EXE=../../$(DEST).exe ../../tethereal.exe ../../editcap.exe \
	../../text2pcap.exe ../../mergecap.exe
DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll
DOC=../../doc/ethereal.html		\
@@ -49,16 +57,6 @@
DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(HELP) $(PLUGINS)


-
-!IFDEF GTK1
-DEST=ethereal
-GTK_DIR=$(GTK1_DIR)
-!ELSE
-DEST=ethereal2
-GTK_DIR=$(GTK2_DIR)
-!ENDIF
-
-
$(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake
	$(MAKENSIS) \
!IF "$(MAKENSIS_MODERN_UI)" != ""



I think there was some discussion as to what version numbers the
Ethereal executable image name should reflect.

Was it concluded that the image name should include "2" if Ethereal was
built for GTK+ 2.x?
No, it has this name only to enable building GTK1 and GTK2 version in one step. I would also appreciate a common name for both versions. But at the moment with two different names the GTK2 installer has some bugs which I'd like to have fixed. 



And, if we make GTK+ 2.x rather than 1.3[.x] the standard version for
Ethereal builds at some point, should the Ethereal executable still have
that "2" in its name?


I don't think so.

Regards,