From b002d09f80c62969426133c6b9686e877df546f9 Mon Sep 17 00:00:00 2001 From: Rick V Date: Mon, 9 Sep 2019 15:18:48 -0500 Subject: [PATCH] we grab a prebuilt bootstrap at build time fix iss makefile --- .gitignore | 3 +++ win32-setup/Makefile | 8 ++++++++ win32-setup/lokinet-win32.iss | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d21ebf252..06bd92264 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,6 @@ GTAGS GRTAGS GPATH version.txt + +lokinet-bootstrap.exe +regdbhelper.dll diff --git a/win32-setup/Makefile b/win32-setup/Makefile index c34b72de9..ef3412a62 100644 --- a/win32-setup/Makefile +++ b/win32-setup/Makefile @@ -1,6 +1,14 @@ # Makefile for windows install pkg and helper library +all: regdbhelper.dll lokinet-bootstrap.exe + +default: all + regdbhelper.dll: i686-w64-mingw32-gcc regdb_helper.c -o $@ -shared -Os -s + +lokinet-bootstrap.exe: + wget https://snowlight.net/loki/win32-dist/lokinet-bootstrap.exe + clean: rm *.dll *.exe diff --git a/win32-setup/lokinet-win32.iss b/win32-setup/lokinet-win32.iss index 590153cea..b048fddee 100644 --- a/win32-setup/lokinet-win32.iss +++ b/win32-setup/lokinet-win32.iss @@ -93,7 +93,7 @@ Source: "{#DevPath}build\lokinet-rcutil.exe"; DestDir: "{app}"; Flags: ignorever Source: "{#DevPath}LICENSE"; DestDir: "{app}"; Flags: ignoreversion ; delet this after finishing setup, we only need it to extract the drivers ; and download an initial RC. The UI has its own bootstrap built-in! -Source: "{#DevPath}lokinet-bootstrap.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall +Source: "lokinet-bootstrap.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall Source: "{tmp}\7z.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall external ; if nonexistent, then inet6 was already installed Source: "{tmp}\inet6.7z"; DestDir: "{app}"; Flags: ignoreversion external deleteafterinstall skipifsourcedoesntexist; MinVersion: 0,5.0; OnlyBelowVersion: 0,5.1