Brad King
5bfffd6f29
New version scheme to support branchy workflow
...
Prepare to switch to the workflow described by "git help workflows". In
this workflow, the "master" branch is always used to integrate topics
ready for release. Brand new work merges into a "next" branch instead.
We need a new versioning scheme to work this way because the version on
"master" must always increase.
We no longer use an even/odd minor number to distinguish releases from
development versions. Since we still support cvs checkout of our source
tree we cannot depend on "git describe" to compute a version number
based on the history graph. We can use the CCYYMMDD nightly date stamp
to get a monotonically increasing version component.
The new version format is "major.minor.patch.(tweak|date)". Releases
use a tweak level in the half-open range [0,20000000), which is smaller
than any current or future date. For tweak=0 we do not show the tweak
component, leaving the format "major.minor.patch" for most releases.
Development versions use date=CCYYMMDD for the tweak level. The
major.minor.patch part of development versions on "master" always
matches the most recent release.
For example, a first-parent traversal of "master" might see
v2.8.1 2.8.1.20100422 v2.8.2
| | |
----o----o----o----o----o----o----o----o----
Since the date appears in the tweak component, the next release can
increment the patch level (or any more significant component) to be
greater than any version leading to it. Topic branches not ready for
release are published only on "next" so we know that all versions on
master lead between two releases.
2010-04-23 09:44:23 -04:00
Zach Mullen
7049dff85a
Implement extra coverage globbing
2010-04-23 09:20:53 -04:00
KWSys Robot
6c76119777
KWSys Nightly Date Stamp
2010-04-23 00:01:04 -04:00
CMake Robot
d44a01a163
Nightly Start Time
...
--HG--
extra : rebase_source : 62aa08f3dd8f05138481b7cb8f423bb57d21394b
2010-04-22 21:00:00 -04:00
KWSys Robot
e498510de9
KWSys Nightly Date Stamp
2010-04-22 00:01:16 -04:00
CMake Robot
00e12f6dd8
Nightly Start Time
...
--HG--
extra : rebase_source : 5c429005a1600ab7cef0f870497a469a9afedec0
2010-04-21 21:00:00 -04:00
Alex Neundorf
d96371922d
-fix typo in HAS_CXX docs ( #10578 )
...
Alex
2010-04-21 21:01:06 +02:00
Alex Neundorf
b3843bab60
-fix linking to frameworks when crosscompiling from Linux to iPhone ( #10526 )
...
Alex
2010-04-21 21:01:06 +02:00
KWSys Robot
45d9106eef
KWSys Nightly Date Stamp
2010-04-21 00:01:03 -04:00
CMake Robot
206ab777f9
Nightly Start Time
...
--HG--
extra : rebase_source : 6f0ec56accf2c3830695e1e884620e97f86faf47
2010-04-20 21:00:00 -04:00
Bill Hoffman
7849674012
Fix release scripts.
2010-04-20 15:03:20 -04:00
KWSys Robot
22e9f2d0ab
KWSys Nightly Date Stamp
2010-04-20 00:01:03 -04:00
CMake Robot
6d8dcc94e4
Nightly Start Time
...
--HG--
extra : rebase_source : d6625e4bd8638cb12eebe2ae3fbc5b78751ec926
2010-04-19 21:00:00 -04:00
Brad King
60de059bff
KWSys Process: Add OpenBSD process tree kill support
...
Patch from Chuck Atkins <chuck.atkins@kitware.com>
2010-04-19 16:30:37 -04:00
Brad King
43072405e2
KWSys SharedForward: Add OpenBSD support
...
Patch from Chuck Atkins <chuck.atkins@kitware.com>
2010-04-19 16:30:23 -04:00
Alex Neundorf
0dbd6e8e16
-add more names for libpng, so it also support libpng 1.4 on Windows ( #10551 )
...
Alex
2010-04-19 18:32:10 +02:00
Alex Neundorf
41d6430b52
-don't add the INCLUDE env.var twice to the Eclipse project file
...
Alex
2010-04-19 18:32:10 +02:00
KWSys Robot
2c156fd18c
KWSys Nightly Date Stamp
2010-04-19 00:01:03 -04:00
CMake Robot
633b1da7df
Nightly Start Time
...
--HG--
extra : rebase_source : e463630c355f04bee5847cf9a8220921cb9e8b36
2010-04-18 21:00:00 -04:00
Kovarththanan Rajaratnam
272308a406
FindDart: use find_package_handle_standard_args()
2010-04-18 09:27:31 +02:00
Kovarththanan Rajaratnam
da4388045e
FindDart: mark DART_ROOT as advanced
2010-04-18 09:27:30 +02:00
Kovarththanan Rajaratnam
068fbd17a3
FindGLU: add deprecation message
2010-04-18 09:27:30 +02:00
Kovarththanan Rajaratnam
932d08adb8
FindGCCXML: document variables
2010-04-18 09:27:29 +02:00
Kovarththanan Rajaratnam
d359a72e79
FindGCCXML: mark executable as advanced
2010-04-18 09:27:28 +02:00
KWSys Robot
67c42804b9
KWSys Nightly Date Stamp
2010-04-18 00:01:05 -04:00
CMake Robot
79ee55f1e5
Nightly Start Time
...
--HG--
extra : rebase_source : 6d7559f4e0d70e6dea57c5bcd00838058d3ddfd6
2010-04-17 21:00:00 -04:00
Kovarththanan Rajaratnam
3ca4749558
FindLibXslt: move include statement + misc whitespace cleanup
2010-04-17 11:10:15 +02:00
Kovarththanan Rajaratnam
293d8aee07
FindAVIFile: use find_package_handle_standard_args()
2010-04-17 11:10:09 +02:00
Kovarththanan Rajaratnam
172e93bd96
FindPhysFS: use find_package_handle_standard_args()
2010-04-17 11:09:45 +02:00
Kovarththanan Rajaratnam
9629443616
FindQuickTime: use find_package_handle_standard_args()
2010-04-17 11:07:32 +02:00
Kovarththanan Rajaratnam
5abed16cc2
FindZLIB: only set INCLUDE_DIRECTORIES/LIBRARIES if zlib is found
2010-04-17 09:56:00 +02:00
Kovarththanan Rajaratnam
7c9e72ad23
FindLibXml2: move include statement
2010-04-17 08:31:26 +02:00
Kovarththanan Rajaratnam
db3134d2a1
Make VERBOSE_FLAG appear as first statement for consistency
2010-04-17 07:49:21 +02:00
KWSys Robot
c178660d96
KWSys Nightly Date Stamp
2010-04-17 00:01:03 -04:00
CMake Robot
9496af109a
Nightly Start Time
...
--HG--
extra : rebase_source : 12830e1048d3405b0351ce85425baca68db64237
2010-04-16 21:00:00 -04:00
Bill Hoffman
6202d9612c
Fix support of VS Express 10, but looking for MSBuild in the right place.
2010-04-16 12:48:23 -04:00
Kovarththanan Rajaratnam
bbd9392bc3
FindMPEG: mark variables in cache as advanced
2010-04-16 12:03:02 +02:00
Kovarththanan Rajaratnam
d4a9ce31ba
FindMPEG: also check if MPEG_vo_LIBRARY is valid
2010-04-16 11:26:25 +02:00
Kovarththanan Rajaratnam
d62d1fd73d
FindEXPAT: else() not needed
2010-04-16 11:04:23 +02:00
Kovarththanan Rajaratnam
d5b85448eb
FindJasper: don't put JASPER_LIBRARIES into cache
...
This means that the user no longer sees this value _but_ this is backwards compatible because setting JASPER_LIBRARIES had no effect previously because we would override it using set()
2010-04-16 11:01:05 +02:00
Kovarththanan Rajaratnam
8981fa35d8
FindJasper: don't set JASPER_LIBRARIES twice
2010-04-16 10:45:32 +02:00
Kovarththanan Rajaratnam
0f57a51f75
FindJasper: no need to set QUIETLY explicitly
2010-04-16 10:38:15 +02:00
Kovarththanan Rajaratnam
1f8a67b2ee
FindASPELL: no need to set QUIETLY explicitly
2010-04-16 10:30:33 +02:00
Kovarththanan Rajaratnam
32a3b1fb40
FindHSPELL: capitalize Hspell properly
2010-04-16 10:26:31 +02:00
Kovarththanan Rajaratnam
810d9a30ef
FindHSPELL: add version support
2010-04-16 10:25:02 +02:00
Kovarththanan Rajaratnam
99313f4fe9
FindHSPELL: no need to set QUIETLY explicitly
2010-04-16 10:09:07 +02:00
KWSys Robot
8df8fd8868
KWSys Nightly Date Stamp
2010-04-16 00:01:05 -04:00
CMake Robot
da7a098c3e
Nightly Start Time
...
--HG--
extra : rebase_source : 63fa2d3a6eb7ebaece531ed547a5324570942942
2010-04-15 21:00:00 -04:00
KWSys Robot
e04daebd73
KWSys Nightly Date Stamp
2010-04-15 00:01:03 -04:00
CMake Robot
00a2fba845
Nightly Start Time
...
--HG--
extra : rebase_source : a5accceb0047689a68f4303b9055d261d93c163c
2010-04-14 21:00:00 -04:00