diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-06-23 23:04:03 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-06-23 23:04:03 +0000 |
| commit | 0501a4855248a362295f250f3770aae28f001072 (patch) | |
| tree | c05161da208e83b868da29906642fa7917dbcfc1 /packaging | |
| parent | f1bb0e1735322bce3fb7b5549403992e8487d67e (diff) | |
Remove old PCRE references from the Windows build environment. We're not
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.
svn path=/trunk/; revision=37778
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 4 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 6885ab62d2..bc87353158 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -152,9 +152,6 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $( !IF "$(GNUTLS_DIR)" != "" /DGNUTLS_DIR=$(GNUTLS_DIR) \ !ENDIF -!IF "$(PCRE_DIR)" != "" - /DPCRE_DIR=$(PCRE_DIR) \ -!ENDIF !IF "$(ZLIB_DIR)" != "" /DZLIB_DIR=$(ZLIB_DIR) \ !ENDIF @@ -191,4 +188,3 @@ $(EXE) $(DLL): #### _FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory - diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 4ba65ff2e6..ed0919390d 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -34,7 +34,7 @@ InstType "un.All (remove all)" Name "${PROGRAM_NAME} ${VERSION} (${BITS}-bit)" -; +; VIAddVersionKey "ProductName" "${PROGRAM_NAME}" VIAddVersionKey "Comments" "It's a great product with a great story to tell. I'm pumped!" VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team" @@ -312,7 +312,7 @@ Function .onInit IDYES prep_uninstaller \ IDNO done Abort - + ; Copy the uninstaller to $TEMP and run it. ; The uninstaller normally does this by itself, but doesn't wait around ; for the executable to finish, which means ExecWait won't work correctly. @@ -333,7 +333,7 @@ silent_uninstall: cleanup: Delete "$TMP_UNINSTALLER" - + done: ;Extract InstallOptions INI files !insertmacro MUI_INSTALLOPTIONS_EXTRACT "AdditionalTasksPage.ini" @@ -391,10 +391,6 @@ File "${C_ARES_DIR}\bin\libcares-2.dll" !ifdef ADNS_DIR File "${ADNS_DIR}\..\${MSVC_VARIANT}\adns\adns_dll.dll" !endif -!ifdef PCRE_DIR -File "${PCRE_DIR}\bin\pcre3.dll" -File "${PCRE_DIR}\man\cat3\pcrepattern.3.txt" -!endif !ifdef KFW_DIR File "${KFW_PATH}\comerr32.dll" File "${KFW_PATH}\krb5_32.dll" |