diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-11-27 18:07:00 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-11-27 18:07:00 +0000 |
| commit | a189f34b84345d6851a489c484c01c1bf21f56d1 (patch) | |
| tree | 7068ad64f13807f982f50b9e94ce37e235065d9c /packaging | |
| parent | d00e6fe59e3efb760453935657c547f804780dfc (diff) | |
Fixes to:
a) Check that UPX is configured correctly and offer solutions;
b) Ignore any errors generated from UPX (e.g. from previously compressed files); and
c) Clean up the tools directory when cleaning the U3 distribtion
svn path=/trunk/; revision=23622
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index 834f5d2908..251159f3f8 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -21,10 +21,13 @@ COPY = xcopy MKDIR = mkdir COPY_FLAGS = /d /y +UPX_FLAGS = -q + U3_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO) all: package + uuid.sed: $(TOPDIR)\config.nmake cd $(TOOLSDIR) $(MAKE) /$(MAKEFLAGS) -f makefile.nmake @@ -326,19 +329,28 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util $(COPY) $(TOPDIR)\tshark.exe $(HOST) $(COPY_FLAGS) $(COPY) u3util.exe $(HOST) $(COPY_FLAGS) +verify-tools: +!IFDEF UPX + @if not exist $(UPX) echo Error: $(UPX) not found. &&\ +echo Either: &&\ +echo a) run 'nmake -f makefile.nmake setup' at the toplevel; or &&\ +echo b) comment out UPX in config.nmake at the top level, to build without compressing the dlls and exes \ +&& exit 2 +!endif + pack: distribution !IFDEF UPX - $(UPX) $(DEVICE)\plugins\$(VERSION)\*.dll - $(UPX) $(HOST)\*.dll - $(UPX) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll - $(UPX) $(HOST)\$(GTK_WIMP_DLLDST_DIR)\*.dll - $(UPX) $(HOST)\*.exe + -$(UPX) $(UPX_FLAGS) $(DEVICE)\plugins\$(VERSION)\*.dll + -$(UPX) $(UPX_FLAGS) $(HOST)\*.dll + -$(UPX) $(UPX_FLAGS) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll + -$(UPX) $(UPX_FLAGS) $(HOST)\$(GTK_WIMP_DLLDST_DIR)\*.dll + -$(UPX) $(UPX_FLAGS) $(HOST)\*.exe !ENDIF test: pack wireshark.bat -D -package: test +package: verify-tools test zip -r wireshark-$(VERSION).u3p $(MANIFEST) $(DEVICE) $(DATA) $(HOST) wireshark.bat @@ -350,6 +362,9 @@ u3util.exe: u3util.obj $(LINK) /OUT:u3util.exe $(guiflags) $(LDFLAGS) u3util.obj $(u3util_LIBS) $(guilibsdll) clean: + cd ../tools + nmake -f makefile.nmake clean + cd ../win32 rm -rf manifest.u3i rm -rf uuid.sed rm -rf $(HOST) |