Commit Graph

5699 Commits

Author SHA1 Message Date
Jeff
5a2141bae8
Merge pull request #1248 from notlesh/config-fixes-2020-04-29
Config fixes 2020 04 29
2020-04-29 16:59:19 -04:00
Stephen Shelton
f0f9b1abdd
Allow 0 as outbound port 2020-04-29 14:23:50 -06:00
Stephen Shelton
f8439dab61
Misc aesthetic tweaks 2020-04-29 14:19:48 -06:00
Stephen Shelton
7d83611a0a
Default outbound port to 0, not 1090 2020-04-29 14:19:35 -06:00
Stephen Shelton
c4de0f8493
Add more ignored config options 2020-04-29 13:42:06 -06:00
Stephen Shelton
517922e4c3
Reintroduce support for configurable key files 2020-04-29 13:41:39 -06:00
Stephen Shelton
5c6c7c7020
Expand on ConfigDefinition truthy/falsy unit test 2020-04-29 12:40:29 -06:00
Stephen Shelton
320564d792
Specialize ConfigOption for bool to accept "truthy" / "falsy" values 2020-04-29 12:32:07 -06:00
Stephen Shelton
331770b348
Add ability to tolerate (ignore) old config options
This allows us to explicitly ignore (with a warning) old options
that are no longer supported.
2020-04-29 10:47:51 -06:00
Stephen Shelton
cdd4439cff
Temporary fix for [dns]bind and [dns]local-dns 2020-04-29 10:10:33 -06:00
Stephen Shelton
936fbb2424
Fix config not falling back to undeclared handler for missing option 2020-04-29 09:41:07 -06:00
Jason Rhinelander
7ce8e4a830
Merge pull request #1234 from notlesh/i-love-apple-2020-04-21
Fix DNS "claiming" on Mac when no explicit DNS is set
2020-04-27 00:52:49 -03:00
Jeff
20dfd11d4e
Merge pull request #1245 from notlesh/potential-router-hive-fixes-post-config-cleanup-2020-04-24
Some maybe-fixes for RouterHive post config cleanup
2020-04-24 13:19:17 -04:00
Stephen Shelton
526b1320b7
Some maybe-fixes for RouterHive post config cleanup 2020-04-24 11:18:25 -06:00
Jeff
54a7843bc5
Merge pull request #1186 from notlesh/config-cleanup-2020-03-13
Config cleanup
2020-04-24 12:49:08 -04:00
Jeff
245c0004dd
Merge pull request #1243 from majestrate/fix-windows-ci-2020-04-22
fix ci for win32
2020-04-22 13:08:53 -04:00
Jeff Becker
783e72da73
fix ci for win32 2020-04-22 12:55:05 -04:00
Jeff
1b7fa7c978
Merge pull request #1242 from jagerman/fix-systemd-dev
No LINUX variable in cmake
2020-04-22 11:43:43 -04:00
Jason Rhinelander
6080a9427b No LINUX variable in cmake
Just let the pkg_check fail when libsystemd isn't install; it shouldn't
hurt anything.
2020-04-22 12:02:05 -03:00
Jason Rhinelander
9ce38fe54f
Merge pull request #1238 from notlesh/mac-uninstall-permissions-into-dev-2020-04-21
Use install(PROGRAMS... instead of isntall(FILES...
2020-04-21 20:40:13 -03:00
Stephen Shelton
67f023cf8a
Use install(PROGRAMS... instead of isntall(FILES... 2020-04-21 17:37:10 -06:00
Jason Rhinelander
ffae1a7f11
Merge pull request #1236 from jagerman/macos-deployment-target-dev
Set -mmacosx-version-min the cmake way
2020-04-21 20:08:18 -03:00
Jason Rhinelander
3048ccf3f8 Set -mmacosx-version-min the cmake way 2020-04-21 20:01:24 -03:00
Stephen Shelton
b4b2e91bb5
Handle no-explicitly-set-dns case in launchd script 2020-04-21 14:47:36 -06:00
Jeff
e685d1fcf9
Merge pull request #1232 from jagerman/stapling
Add stapling after notarization
2020-04-21 14:55:37 -04:00
Jason Rhinelander
4a0ee5c66f Add stapling after notarization 2020-04-21 15:53:46 -03:00
Jeff
edc0d1a3ed
Merge pull request #1225 from majestrate/macos-cpack-setup-and-bootstrap-2020-04-10
macos cpack installer infra
2020-04-21 14:50:16 -04:00
Jeff
dde4c4c67e
Merge pull request #1228 from despair86/win32-cleanup
Win32 cleanup
2020-04-21 07:47:04 -04:00
Stephen Shelton
0b1c57f650 Include macos uninstall script 2020-04-21 00:28:27 -03:00
Jason Rhinelander
6da26bfa43 NOTARIZE only has one O 2020-04-20 21:51:24 -03:00
Jason Rhinelander
9f208d2b6c Pass CMAKE_PREFIX_PATH through to lokinet-gui
Needed to build against the right Qt
2020-04-20 21:51:01 -03:00
Rick V
6eaaeab094
reeee 2020-04-20 19:09:35 -05:00
Rick V
337a21d6f6
ew stinki 2020-04-20 19:09:32 -05:00
Rick V
76aa0421ff
use a new read buffer every time 2020-04-20 19:09:32 -05:00
Rick V
1e51bfde2c
fix 2020-04-20 19:09:31 -05:00
Rick V
4e87e8dc08
correctly return true/false when writing 2020-04-20 19:09:28 -05:00
Rick V
c65eecf399
are we leaking data randomly 2020-04-20 19:09:27 -05:00
Rick V
46d4ab2708
this might just crash 2020-04-20 19:09:24 -05:00
Rick V
96fc3cdd55
fix pybind 2020-04-20 19:09:21 -05:00
Rick V
df634b7775
remove a ton of ded win32 code 2020-04-20 19:05:53 -05:00
Rick V
938f40efe1
probably got mangled in a patch
supposed to tick at the end
2020-04-20 19:05:36 -05:00
Jason Rhinelander
216b807cb3 Notarize has an "a" in it 2020-04-20 00:28:32 -03:00
Jason Rhinelander
f8209baf50 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-19 23:18:48 -03:00
Jason Rhinelander
8d74407d11 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-19 23:18:48 -03:00
Jason Rhinelander
0032f1fdde Add simple installer readme 2020-04-19 23:18:48 -03:00
Jason Rhinelander
daf0174e53 Change mac install prefix to /opt/lokinet
/usr/local is probably going to get stomped on by homebrew.
2020-04-19 23:18:48 -03:00
Jason Rhinelander
ebb1950941 Add -DBUILD_PACKAGE=ON to make cpack code opt-in 2020-04-19 23:18:41 -03:00
Jason Rhinelander
93311fbc99 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-19 23:16:23 -03:00
Jason Rhinelander
3dd3d48fbb 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-19 23:16:23 -03:00
Stephen Shelton
c20d5b186d Bundle gui in mac installer 2020-04-19 23:16:23 -03:00