Commit Graph

269 Commits

Author SHA1 Message Date
Jason Rhinelander
0edb4435d4
Cmake cleanup: remove unneeded =1 from definitions
We only check for definedness, not truth, in the code so make the cmake
definitions agree with that.

This also avoids warnings when building on macos (because swift only
allowed defined/undefined but not values)
2022-06-21 18:57:36 -03:00
Jason Rhinelander
1de7b070d1
Add -DLOKINET_VERSIONTAG to override version tag
Currently I maintain a patch in the debs to do the same thing here, but
it fails to apply often enough; this change makes the behaviour
consistent with oxen-core/oxen-ss and will let me drop that patch and
just pass in the cmake option.

(Recommend ignore-whitespace for viewing the diff)
2022-06-13 20:00:35 -03:00
Jason Rhinelander
6a2114fa1d
Don't be dynamic for win32 rc crap 2022-05-30 17:08:08 -03:00
Jeff
1dfc2e883b
bump verions of all deps
bump submodules

Fix dynamic version generation

   - GIT_FOUND OR Git_FOUND wasn't available because we hadn't done a
     find_package(Git) yet.
   - required version variables weren't being passed through to the cmake
     script
2022-05-30 17:08:08 -03:00
Jeff
065e52ab80
move windows nsis parts for cpack into external files 2022-05-30 09:27:05 -04:00
Jeff
e480e36f3d
generate windows rc for each executable target so we can set the executable name right for each one 2022-05-30 09:06:48 -04:00
Jeff
f05c2ebc71
macro removals
clean up version cmake stuff

clean up generated cpp version stuff

make all the windows rc stuff get generated by cmake

bump release motto message

properly inject release motto into version
2022-05-30 09:06:48 -04:00
Jeff
3c92568881
typo 2022-05-02 17:48:46 -04:00
Jeff
d85d208156
bump libuv version with hashpin 2022-05-02 17:31:21 -04:00
Jeff
d05518be57 use the new electron gui in windows build 2022-04-18 17:25:16 -04:00
Jeff
e2a94b44bb bump zlib hashpin 2022-03-29 09:18:04 -04:00
Jason Rhinelander
d02558350a
Crank oxen-mq to (1.2.)11; switch to oxen-encoding
- Update oxen-mq submodule to latest stable
- Add oxen-encoding submodule
- Convert all oxenmq encoding usage to oxenc
- Modernize cmake handling of oxenmq/oxenc
2022-02-17 16:30:17 -04:00
majestrate
838183e36e
Merge pull request #1748 from majestrate/liblokinet-udp-api-2021-09-19
liblokinet updates
2022-02-06 13:19:08 -05:00
Jeff
48559bd282 fix up ppc64le cross target 2022-02-02 08:34:58 -05:00
Jeff
eae4d3cf74 fixup armhf target 2022-02-02 08:10:03 -05:00
Jeff
08a9e0ad39 add cross compile helpers and update/add toolchains 2022-02-02 07:35:39 -05:00
Jeff
95efe8f4e5 bump ngtcp2 to v0.1.0 tag 2022-01-31 13:05:03 -05:00
Jeff
3c983e2cd7 libcurl no long users --without-libmetalink so remove the flag 2022-01-31 12:03:15 -05:00
Jeff
199055a6aa chore: bump static deps versions 2022-01-31 11:57:26 -05:00
Jeff Becker
bf6dfaaef8 cmake fixups 2022-01-31 10:53:48 -05:00
Jeff Becker
b31cac4b71 nodejs dipshittery 2022-01-31 10:53:48 -05:00
Jeff Becker
51b1d41b12 disable gost in static build 2022-01-31 10:53:48 -05:00
Jeff Becker
5b8ebb269c changes for liblokinet-ffi
* cmake option BUILD_DAEMON for toggling building of daemon directory
* when WITH_BOOTSTRAP is OFF dont build curl or cpr
2022-01-31 10:53:48 -05:00
Jeff
996de3d4c6 make it so github sees the repo is gpl3 2022-01-28 11:20:22 -05:00
Jeff
388fc53380
match io loop event order on windows/apple to match linux.
on win32/apple reading packets from the interface does not count as an io operation.
manually trigger pump on win32/apple to pretend that it is an io event.
add platform quark function MaybeWakeUpperLayers on vpn::Interface to manaully wake up the other components on platforms that need that (ones on which packet io is not done via io events).
on non linux platforms, use uv_prepare_t instead of uv_check_t as the former triggers before blocking for io, instead of after. this better matches linux's order of operations in libuv.
2021-12-15 15:25:53 -05:00
Jeff Becker
b5f5d07f03
bump libunbound static dep hashpin 2021-10-25 11:35:50 -04:00
Jason Rhinelander
9c32058a50 Remove windows linefeeds 2021-10-16 15:16:55 -03:00
Jeff
12bca7031b
Merge pull request #1638 from majestrate/log-refactor-source-location-2021-05-11
refactor logging to use std::source_location
2021-10-06 15:14:55 -04:00
Jeff Becker
5c457ff486
refactor logging to use std::source_location
* use std::source_location instead of godawful macros in logging
* remove unused/absolutely haram af json logstream
* fix bug in android logger where it doesn't respect eLogNone
2021-10-06 11:10:48 -04:00
Jeff Becker
d354a35869
always build ngtcp2 as static
squashme
2021-10-06 10:09:04 -04:00
Jason Rhinelander
488ed47cda Remove duplicate handling of jemalloc
We were linking/loading it in different ways, one with cmake option
`USE_JELLOC` and the other, older version `WITH_JEMALLOC`.  This removes
the latter (which was default OFF) and keeps the former (which was added
and has been default ON since 0.9.4 or so).

Also removes the `ifdef`ed JEMALLOC code in lokinet.cpp because we don't
need it; just linking to jemalloc is enough to get the malloc/free
replacements.
2021-09-13 13:26:12 -03:00
Jeff
baa89771fb
Merge pull request #1735 from majestrate/cmake-lokinet-bootstrap-tweaks-2021-09-10
make lokinet-bootstrap target toggleable
2021-09-10 22:13:34 -04:00
Jason Rhinelander
62d7192a50 Add mainnet/testnet bootstrap files into repo
We use them everywhere now (include the debs) so it makes sense to have
them bundled here rather than needing a download during package build
(in particular for debs that's considered a bad thing).
2021-09-10 19:38:32 -03:00
Jason Rhinelander
089fc026d8 Redo how we build ngtcp2 lib
ngtcp2's top-level CMakeLists.txt is not friendly to being used as a
subdirectory (for instance, it always adds a `check` target when cunit
is installed), so stop using it in favour of skipping directly into the
ngtcp2/lib subdir.

This requires some hackery to set up a couple of the things the
top-level cmake does, but it isn't *too* painful.
2021-09-10 15:12:57 -03:00
Jeff Becker
7e1236503c
make lokinet-bootstrap target toggleable
add cmake option to disable building lokinet-bootstrap binary
2021-09-10 10:41:42 -04:00
Jason Rhinelander
2b8ef416c3 Remove old mac installer packaging 2021-09-02 19:13:51 -03:00
jeff
0708a0d897
initial network extension code for macos
probably does not work
2021-09-02 14:17:08 -04:00
Jeff Becker
439183bf19
bump openssl static deps version for upstream security update 2021-08-31 12:05:01 -04:00
Jeff Becker
ae186f7000
use $(MAKE) only on makefile generator 2021-06-19 09:35:49 -04:00
Jeff Becker
e5bc34a7b1
[buildsystem] remove use of ninja entirely
* modify contrib/window.sh now uses makefiles
* create contrib/android.sh for building shared libs for android apk
* update drone ci jizz for android
* update cmake/StaticBuild.cmake to use $(MAKE) so that builds can parallelize (super epic)
* remove android directory as it is no longer needed
2021-06-18 11:48:23 -04:00
Jeff Becker
046ab3d453
export functions in liblokinet for win32 dll 2021-06-08 08:32:52 -04:00
Jeff Becker
37a9bd768e
fix linking on win32 for lokinet.dll
only apply static link flags for executables
2021-06-08 08:32:44 -04:00
Jeff Becker
d583f8bd72
windows cmake upgrades:
* dont call lokinet-bootstrap.exe on install
* bump lokinet gui version with hashpin update
2021-06-04 16:23:30 -04:00
Jeff Becker
499bb38e6f
fix route poking via rpc:
* immediately poke routes when we are told to use an exit so that packets get pushed which makes an exit path happen
* fix up cmake oddity in nsis section
2021-05-13 07:30:53 -04:00
Jeff Becker
8c0f448e12
add liblokinet option to nsis cpack installer 2021-05-13 06:30:40 -04:00
Jeff Becker
94f24b2fde
win32 installer
* make tuntap driver its own install component so that we can optionally not install it
2021-05-01 10:16:57 -04:00
Jeff Becker
16ff8b4149
link against core foundation as a fix for static macos build 2021-04-21 13:03:23 -04:00
Jeff Becker
c4dad12f2e
libunbound patch no longer needed as fixes have been upstreamed 2021-04-21 10:38:23 -04:00
Jason Rhinelander
b54d608b3f Fix curl hash
Hash was for the bz2 instead of xz
2021-04-21 11:33:57 -03:00
Jeff Becker
ecd41e7a31
bump libuv version to match the tarball fetched 2021-04-21 10:08:04 -04:00