Commit Graph

90 Commits

Author SHA1 Message Date
ridiculousfish
b952606430 Teach CMake Mac App build to dynamically derive the version
Populate CFBundleShortVersionString with the fish version from
git_version_gen.sh. Note this happens at build generation time, not at
build time.
2019-02-05 22:14:43 -08:00
ridiculousfish
9396f79e3e Remove xcode project
This removes the Xcode project and associated headers.
A better Xcode project can be generated via CMake:

    cmake -G Xcode /path/to/fish-shell/
2019-02-05 22:14:43 -08:00
ridiculousfish
e0396d8ef8 CMake support for building Mac app 2019-02-05 22:14:43 -08:00
Mahmoud Al-Qudsi
f90cb3957f Add missing define for HAVE_WCSTOD_L to osx/config.h
I believe this should take care of the reported problem with the
corrected definition for `wcstod_l`. For future reference, any changes
to `config.h.in` should also be reflected in `osx/config.h`
2019-01-20 16:40:50 +08:00
David Adam
05222a055a Merge branch 'Integration_3.0.0' 2018-12-28 22:10:49 +08:00
David Adam
938ce48d25 Bump version for 3.0.0 2018-12-28 21:01:03 +08:00
David Adam
355cb88e38 Bump version for 3.0b1 2018-12-11 22:04:20 +08:00
David Adam
e0d7f0bc96 osx/config.h: update to match current configure output on 10.11 2018-12-11 21:59:45 +08:00
David Adam
83fbd881e7 osx/config.h: mirror changes in f2a829aa23
[ci skip]
2018-12-11 21:46:43 +08:00
David Adam
fe4354e5ed Merge branch 'Integration_2.7.1' 2018-01-01 08:48:41 +08:00
David Adam
b680db8ce6 Bump version for 2.7.1 2017-12-23 00:16:29 +08:00
David Adam
77cd0c1bf8 Merge branch 'Integration_2.7.0' 2017-11-24 19:16:24 +11:00
David Adam
f12164f7c7 Bump version for 2.7.0 2017-11-23 13:45:49 +08:00
David Adam
f5514543e4 Bump version for 2.7b1 2017-10-31 20:27:03 +08:00
David Adam
f5fc92747e Merge branch 'Integration_2.6.0' 2017-06-03 22:02:59 +08:00
David Adam
b0389cb77d Bump version for 2.6.0 2017-06-03 20:45:13 +08:00
David Adam
426653a9d7 Bump version for 2.6b1 2017-05-14 10:37:03 +08:00
David Adam
910f78dd74 osx/config.h: update to match current configure output on 10.11 2017-05-14 10:25:53 +08:00
David Adam
49e98cde4c Merge branch 'Integration_2.5.0' 2017-02-03 21:14:40 +08:00
David Adam
708d6b6911 Bump version for 2.5.0 2017-02-03 09:46:58 +08:00
ridiculousfish
2e47817adf Second attempt to fix Xcode build for PCRE2 changes
Update osx/shared_headers/pcre2.h

Fixes #3755
2017-01-22 00:11:40 -08:00
ridiculousfish
9361470070 Update Xcode build in response to PCRE2 upgrade
Replace the osx/pcre2/config.h with a new config.h
from the PCRE2 upgrade

Fixes #3755
2017-01-21 11:48:09 -08:00
mathbunnyru
7a80610300 Delete trailing spaces 2017-01-15 14:57:21 -08:00
David Adam
1f77c2d09d Bump version for 2.5b1 2017-01-14 08:19:35 +11:00
David Adam
6c906b365b osx/config.h: update to match current configure output on 10.11 2017-01-13 22:52:31 +08:00
ridiculousfish
eb3ed2680b Fix macOS Xcode build
React to Solaris fixes (0019c12af3) by hiding some more
functions from macOS. The Xcode build uses special weak-linking
magic.
2016-12-10 20:48:54 -08:00
ridiculousfish
8324893565 Update osx/config.h with HAVE_FLOCK macro
flock() is available on OS X
2016-12-03 13:46:10 -08:00
David Adam
a0d9db94cb osx/config.h: update to match current configure output 2016-11-30 18:50:23 +08:00
Fredrik Fornwall
df12ac24b2 Fix build on systems without shm_open()
Notably, this fixes building on Android.
2016-11-26 16:14:15 -05:00
David Adam
d7283cdaa1 Merge branch 'Integration_2.4.0' 2016-11-08 12:06:15 +08:00
David Adam
54360d8cfe Bump version for 2.4.0 2016-11-08 11:20:54 +08:00
Kurtis Rader
1fb8f4e277 lint: misc cleanups
Earlier lint cleanups overlooked a couple of modules because on macOS at
the moment oclint ignores them. I noticed this when I ran `make lint-all`
on Ubuntu.
2016-11-04 20:12:51 -07:00
David Adam
e9543617f6 Bump version for 2.4b1 2016-10-18 22:17:06 +08:00
David Adam
bf3466d82c Update osx/config.h
Regenerated with current autoconf tests for OS X El Capitan.

This avoids portability problems introduced with
8b9102d9fe and partially reverts that
commit.
2016-10-18 22:02:56 +08:00
Aaron Gyes
6d322dff73 Update osx/config.h
Needs update or the undefined symbol should cause the fallback
Android behavior on xcode builds inadvertently.
2016-10-15 17:29:20 -07:00
Aaron Gyes
8b9102d9fe Update osx/config.h
Regenerated with current autoconf tests on macOS Sierra.
2016-10-07 15:26:34 -07:00
David Adam
3cd1ef23ab Merge branch 'Integration_2.3.1'
Includes the `string` fallbacks for upgrades from 2.3.1 (as discussed in
issue #3057).
2016-07-03 22:18:55 +08:00
David Adam
e99c6104fe Bump version for 2.3.1 2016-07-03 19:38:28 +08:00
Aaron Gyes
c79e9c7d4e Lossless recompress of images with pngcrush+zopfli
And tweak RTF.
2016-07-01 14:58:56 -07:00
David Adam
ceee1ebfd9 update osx/config.h to match current configure output 2016-06-26 13:33:22 +08:00
Aaron Gyes
f04644f749 Lossless recompress of images with pngcrush+zopfli
And tweak RTF.
2016-06-18 10:03:26 -07:00
David Adam
6594c061be Merge branch 'Integration_2.3.0' 2016-05-20 23:48:12 +00:00
David Adam
216a45edee Bump version for VERSION 2016-05-20 22:48:00 +00:00
David Adam
7828f2303a osx/config.h: update to match current configure output 2016-05-20 22:44:47 +00:00
David Adam
28228627fc Merge branch 'Integration_2.3.0'
(Bump version numbers to reflect post-2.3b2)
2016-05-06 23:11:52 +01:00
David Adam
49838c768d bump version for 2.3b2 2016-05-05 06:02:57 +08:00
ridiculousfish
58d7c4b388 Remove use of __environ
It has apparently never worked. Fixes #2988
2016-04-30 17:46:14 -07:00
David Adam
43535cf5a5 Bump version for 2.3b1 2016-04-19 15:55:30 +08:00
David Adam
aefcf544ca Update Xcode build for new pcre2 version 2016-04-19 15:13:14 +08:00
David Adam
9c75546724 Update osx/config.h for removed ifdefs 2016-04-07 11:13:38 +08:00