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

Fix the U3 and PortableApps builds. 

svn path=/trunk/; revision=32441
This commit is contained in:
Gerald Combs 2010-04-09 23:51:22 +00:00
parent 6cd62e9e65
commit 64fce08dc7
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/nsis/Makefile.nmake
View File

@ -93,7 +93,6 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
/DWIRESHARK_TARGET_PLATFORM=$(WIRESHARK_TARGET_PLATFORM) \
/DMSVC_VARIANT=$(MSVC_VARIANT) \
/DWIRESHARK_LIBS=$(WIRESHARK_LIBS) \
/DBUILD_DIR=..\..\$(INSTALL_DIR) \
!IFDEF MSVCR_DLL
/DMSVCR_DLL="$(MSVCR_DLL)" \
!ENDIF

22
packaging/nsis/wireshark.nsi
View File

@ -403,10 +403,10 @@ File "..\..\epan\wslua\dtd_gen.lua"
!ifdef SMI_DIR
File "${SMI_DIR}\lib\smi.dll"
!endif
File "${BUILD_DIR}\COPYING.txt"
File "${BUILD_DIR}\NEWS.txt"
File "${BUILD_DIR}\README.txt"
File "${BUILD_DIR}\README.windows.txt"
File "..\..\wireshark-gtk2\COPYING.txt"
File "..\..\wireshark-gtk2\NEWS.txt"
File "..\..\wireshark-gtk2\README.txt"
File "..\..\wireshark-gtk2\README.windows.txt"
File "..\..\doc\AUTHORS-SHORT"
File "..\..\manuf"
File "..\..\services"
@ -652,13 +652,13 @@ File "..\..\wimaxasncp\dictionary.dtd"
SetOutPath $INSTDIR
SetOutPath $INSTDIR\help
File "${BUILD_DIR}\help\toc"
File "${BUILD_DIR}\help\overview.txt"
File "${BUILD_DIR}\help\getting_started.txt"
File "${BUILD_DIR}\help\capturing.txt"
File "${BUILD_DIR}\help\capture_filters.txt"
File "${BUILD_DIR}\help\display_filters.txt"
File "${BUILD_DIR}\help\faq.txt"
File "..\..\wireshark-gtk2\help\toc"
File "..\..\wireshark-gtk2\help\overview.txt"
File "..\..\wireshark-gtk2\help\getting_started.txt"
File "..\..\wireshark-gtk2\help\capturing.txt"
File "..\..\wireshark-gtk2\help\capture_filters.txt"
File "..\..\wireshark-gtk2\help\display_filters.txt"
File "..\..\wireshark-gtk2\help\faq.txt"
; Write the uninstall keys for Windows
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wireshark" "DisplayVersion" "${VERSION}"

2
packaging/portableapps/win32/makefile.nmake
View File

@ -46,7 +46,7 @@ dirs:
nsis-bits:
cd ../../nsis
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm NEWS.txt
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm
cd ../portableapps/win32
$(WSMANIFEST):

2
packaging/u3/win32/makefile.nmake
View File

@ -56,7 +56,7 @@ u3-dirs:
nsis-bits:
cd ../../nsis
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm NEWS.txt
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm
cd ../u3/win32
distribution.nmake: makenmake.pl