Commit Graph

15 Commits

Author SHA1 Message Date
Dario Lombardo 035e404fff cmake: add creation of version.conf to be shipped in tarball.
Change-Id: I2bb66844b29cd4805d201891ffba342d26ee475f
Reviewed-on: https://code.wireshark.org/review/18731
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-11-21 09:02:11 +00:00
Dario Lombardo 231ad4f6ff cpack: improve source tarball generation by adding the "dist" target.
The source package must not contain compiled objects. If the build dir
is under the source tree, it is included too. By excluding /build/ we
avoid to add every build dir, but if the build dir doesn't contain
build the problem still persist.

Change-Id: I75021565c058c1a93945f43b9b49cb3d04c960d4
Reviewed-on: https://code.wireshark.org/review/18729
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-11-19 18:29:56 +00:00
João Valverde cbccf05f8b CMake: Use xz generator with cpack
We already do so with autotools.

Change-Id: I0d7ea052ee19a42d16e82134f2f7188b3a19ee1e
Reviewed-on: https://code.wireshark.org/review/18727
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
2016-11-09 21:37:55 +00:00
Dario Lombardo cb0697c99e CMake: fix cpack archive name to include version
CPACK_PACKAGE_VERSION is used before setting its value. Remove
spurious CPACK_SYSTEM_NAME usage.

Before:
  CPack: - package: wireshark/build-test/wireshark--.tar.bz2 generated.

After
  CPack: - package: wireshark/build-test/wireshark-2.3.0.tar.bz2 generated.

Change-Id: I6f12017113f64b9c759a3fbd930cb3ee0807811d
Reviewed-on: https://code.wireshark.org/review/18669
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-09 20:31:06 +00:00
Gerald Combs 44eda0c64e CPack: WiX updates.
WiX prefers rich text license files. Add an RTF version of the GPLv2. It
was created by converting the "standalone HTML" version of the license at

  http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html

to RTF using Pandoc 1.11.

Start splitting CPackConfig.txt into Win32 and non-Win32 sections. Add
a WiX section.

Change-Id: Ifcb233053c8a2158f087b69c69de7df869af65aa
Reviewed-on: https://code.wireshark.org/review/12980
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-01 01:00:08 +00:00
Gerald Combs a63b3090a0 Revert "CPack: Use COPYTING.txt as the license file."
Looks like we need to fix a dependency.

This reverts commit 61cde08a95.

Change-Id: I490b826f20fbefbf169b63816916bfe784609610
Reviewed-on: https://code.wireshark.org/review/12956
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-30 23:53:21 +00:00
Gerald Combs 61cde08a95 CPack: Use COPYTING.txt as the license file.
Otherwise The WiX generator complains with

    CPack Error: unsupported WiX License file extension ''

Change-Id: I4f3aeaf1babaf814c05cc96c4d07a84bd9dbc2a5
Reviewed-on: https://code.wireshark.org/review/12955
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-30 23:01:47 +00:00
Gerald Combs e00ac05cf3 CMake: Build an application bundle (Wireshark.app) on OS X.
Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on
OS X and disabled elsewhere. The bundle is currently bare-bones and only
contains the main executables, Info.plist, and application icon.

Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is
set and on Windows.

Start updating CPackConfig.txt for OS X packaging.

To do:

  - Add supporting libraries and frameworks.

  - Make the bundle standalone. I.e. call FIXUP_BUNDLE or
    replicate the relevant parts of osx-app.sh

Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb
Reviewed-on: https://code.wireshark.org/review/4577
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 20:07:48 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Jörg Mayer d05e4fd56f Binary and source tarballs should be compressed with bzip2 only
(xz is not an options that cmake offers).

svn path=/trunk/; revision=41360
2012-03-05 22:13:09 +00:00
Anders Broman b2633b05d8 From John Bradshaw:
Spelling fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6296

svn path=/trunk/; revision=38834
2011-09-01 04:35:57 +00:00
Jörg Mayer e4eecc5215 - Move cmake options into their own file, making it easier to
use a locally modified version of the stuff
- Some (still preliminary) CPack changes
- Add -fexcess-precision=fast (configure.in and CmakeLists.txt)
  to the compileflags (new gcc-4.5 feature to maintain backward
  compatibility with gcc-4.4 and IMO we don't need the slower but
  more exact implementation gcc 4.5 offers.

svn path=/trunk/; revision=32823
2010-05-15 20:41:53 +00:00
Jörg Mayer 6de362457d - Derive Wireshark version from configure.in for now.
Allow to overide that version in CMakefile.txt
- Minor update to README.cmake
- Turn off GTK_DEBUG


svn path=/trunk/; revision=32139
2010-03-07 19:40:25 +00:00
Jörg Mayer 9a69a7934e - Beginnings of cmake in docbook directory
- Add note about "make help"
- Move beginnings of packaging into its own file: CPackConfig.txt

svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00