Moved some logic to C++, which will extract i2p if it's not already,

and then secondly fire up the router in a second java process when 
extraction is completed. Gonna use "optional" type in C++ to make
global variables a bit less painful to use.
This commit is contained in:
meeh
2018-07-08 13:16:07 +00:00
parent 27a0d4e51e
commit 21b3864dfd
8 changed files with 165 additions and 49 deletions

View File

@ -22,8 +22,11 @@ rule ar
rule cleanup
command = rm -fr *.o clauncher I2PLauncher.app
# TODO: There must exists a cleaner way to solve this.
rule bundledir
command = mkdir -p I2PLauncher.app/Contents/{MacOS,Resources,Frameworks} && cp Info.plist I2PLauncher.app/Contents/Info.plist
command = mkdir -p I2PLauncher.app/Contents/{MacOS,Resources,Frameworks} $
&& cp Info.plist I2PLauncher.app/Contents/Info.plist $
&& cp base.zip I2PLauncher.app/Contents/Resources/base.zip
rule copytobundledir
command = cp clauncher I2PLauncher.app/Contents/MacOS/I2PLauncher
@ -31,6 +34,9 @@ rule copytobundledir
rule copyimgtobundle
command = cp ItoopieTransparent.png I2PLauncher.app/Contents/Resources/ItoopieTransparent.png
rule builddir
command = mkdir -p build
build main.o: cxx main.mm
build StatusItemButton.o: cxx StatusItemButton.mm
build JavaRunner.o: cxx JavaRunner.cpp
@ -43,4 +49,5 @@ build copytobundle: copytobundledir | bundle clauncher
build clauncher: link main.o StatusItemButton.o JavaRunner.o
build appbundle: copyimgtobundle | clauncher bundle copytobundle
#build all: clauncher
default appbundle