Commit Graph

5492 Commits

Author SHA1 Message Date
Jason Rhinelander
2be546557f Touch the magic file 2020-04-21 23:14:41 -03:00
Jason Rhinelander
d48a54363d Restore DNS via signal handler
If we get signalled we still want to run it, but a signal on the script
could result in us exiting early.
2020-04-21 22:55:11 -03:00
Stephen Shelton
04bba0f415
Merge pull request #1237 from notlesh/install-mac-script-with-execute-2020-04-21
Use install(PROGRAMS... instead of install(FILES...
2020-04-21 17:34:49 -06:00
Stephen Shelton
55ff55eec0
Use install(PROGRAMS... instead of isntall(FILES...
@ mac uninstall script
2020-04-21 17:11:21 -06:00
Jason Rhinelander
0a8aef0880
Merge pull request #1235 from jagerman/macos-deployment-target
Set -mmacosx-version-min the cmake way
2020-04-21 20:08:09 -03:00
Jason Rhinelander
053a5cb180 Set -mmacosx-version-min the cmake way 2020-04-21 20:00:37 -03:00
Jeff
8b72a5a400
Merge pull request #1233 from jagerman/dev-backport
0.7.1 - Backport minor fixes and packaging from dev to master
2020-04-21 18:23:19 -04:00
Stephen Shelton
47806b4408
Handle no-explicitly-set-dns case in launchd script 2020-04-21 14:51:17 -06:00
Jason Rhinelander
496451ebb9 Remove unwanted defines
Version definitions moved to CMakeLists.txt
2020-04-21 16:45:41 -03:00
Jason Rhinelander
a75015bc64 Disable thread safety annotations on AppleClang 2020-04-21 16:42:10 -03:00
Jason Rhinelander
b2bd555965 Bump version to 0.7.1
Including mostly windows/macos packaging changes, plus a few minor
fixes.
2020-04-21 16:27:21 -03:00
Jason Rhinelander
dacea9a2bc Add stapling after notarization 2020-04-21 16:25:30 -03:00
Stephen Shelton
b56ff52ad9 Include macos uninstall script 2020-04-21 16:25:30 -03:00
Jason Rhinelander
2036bcaf8f NOTARIZE only has one O 2020-04-21 16:25:30 -03:00
Jason Rhinelander
d49fe8118f Pass CMAKE_PREFIX_PATH through to lokinet-gui
Needed to build against the right Qt
2020-04-21 16:25:30 -03:00
Jason Rhinelander
6391f32627 Notarize has an "a" in it 2020-04-21 16:25:30 -03:00
Jason Rhinelander
44b6ccebbd Move release motto string into CMakeLists.txt
Right after project() which contains the version, so that version +
motto updates are basically in one place (and so that non-Makefile cmake
invocations get it).
2020-04-21 16:25:30 -03:00
Jason Rhinelander
35197a7620 codesigning and notarization
Codesigns and notarizes the package.  Requires a bunch of stuff to
actually get this working.  (see contrib/macos-signing.txt).

I'm currently also building with

    -DLOKINET_GUI_REPO=https://github.com/jagerman/loki-network-control-panel.git -DLOKINET_GUI_CHECKOUT=cmake

because it needs the camke-ification PR for the control panel to
properly sign everything there.
2020-04-21 16:25:30 -03:00
Jason Rhinelander
d65a0c97ed Add simple installer readme 2020-04-21 16:25:30 -03:00
Jason Rhinelander
1221a24c25 Change mac install prefix to /opt/lokinet
/usr/local is probably going to get stomped on by homebrew.
2020-04-21 16:25:30 -03:00
Jason Rhinelander
16d2296b11 Add -DBUILD_PACKAGE=ON to make cpack code opt-in 2020-04-21 16:25:29 -03:00
Jason Rhinelander
c9a8c67276 Build lokinet-gui with ExternalProject
Also installs it without the extra hack by specifying ../../Applications
for the destination.  (This definitely feels kind of nasty, but it works).
2020-04-21 16:20:15 -03:00
Jason Rhinelander
58133db753 Consolidate cmake vars & definitions
CMake will set version variables itself if you give the version in the
project(), which is cleaner.  Also removes some (nearly) duplicate
definitions and settings added in basic_definitions.cmake for unknown
reasons.

Removes some redundant settings (name, description, version) from the
cpack settings which already default to the values from the project()
call.
2020-04-21 16:20:09 -03:00
Stephen Shelton
0388a10f81 Bundle gui in mac installer 2020-04-21 16:19:38 -03:00
Stephen Shelton
e80f20ecb8 MacOS installer / runtime nonsense 2020-04-21 16:19:38 -03:00
Jeff Becker
c2fbc28bbf gut ui-* 2020-04-21 16:19:38 -03:00
Jeff Becker
8cfc02ca56 add plist 2020-04-21 16:19:38 -03:00
Jeff Becker
b630a3135a macos post install script that bootstraps, generates configs and registers plist 2020-04-21 16:19:38 -03:00
Jeff Becker
230f28f20a tinker with release scripts to hopefully appease the apple gods. 2020-04-21 16:11:39 -03:00
Jeff Becker
7ca8400e66 make apple builds build for older versions and embrace the bitrot 2020-04-21 16:11:39 -03:00
Jeff Becker
cc6d4e9401 turn off optimizations for releases 2020-04-21 16:11:39 -03:00
Jeff Becker
7c81c7502d static link on macos 2020-04-21 16:11:39 -03:00
Jeff Becker
012c0816a0 make gitlab mac runner poop out mac pkg builds too 2020-04-21 16:11:39 -03:00
Jeff Becker
0ca8c25b49 remove god awful "packaging" cruft that is no longer used. 2020-04-21 16:11:39 -03:00
Jeff Becker
fc14c25771 fix up cpack for macos 2020-04-21 16:11:39 -03:00
Jeff Becker
7e82a3fefb use 64 bit windows target for now 2020-04-21 16:11:39 -03:00
Jeff Becker
4ce2542bbf fix gitlab tag (again) 2020-04-21 16:11:39 -03:00
Jeff Becker
d3a503261e fix gitlab tag 2020-04-21 16:11:39 -03:00
Jeff Becker
bc575e1649 fix gitlab ci file 2020-04-21 16:11:39 -03:00
Jeff Becker
53bef479a3 more macos installer bits 2020-04-21 16:11:39 -03:00
Jeff Becker
b3eaf92588 add mac target for release 2020-04-21 16:11:39 -03:00
Jeff Becker
73eef0427a move cmake unix down 2020-04-21 16:11:39 -03:00
Jeff Becker
dbaed61100 make gitlab pump out 32 bit installers, no lto for builds as that is cursed for now. 2020-04-21 16:11:39 -03:00
Jeff Becker
744acce8d2 update lokinet-bootstrap 2020-04-21 16:11:39 -03:00
Jeff Becker
cf1cb3d304 allow fail 2020-04-21 16:11:39 -03:00
Jeff Becker
6c3fab84ec update ci for windows installers 2020-04-21 16:11:39 -03:00
Jeff Becker
a0b6357e0a make installer pull in tuntap driver 2020-04-21 16:11:39 -03:00
Jeff Becker
eb7ddae863 initial lokinet-bootstrap in powershell for windows 2020-04-21 16:11:39 -03:00
Jeff Becker
7f59cce443 set license 2020-04-21 16:11:39 -03:00
Jeff Becker
7406dbc964 cpack win32 2020-04-21 16:11:39 -03:00