diff --git a/contrib/tuntapv9-ndis/README.md b/contrib/tuntapv9-ndis/README.md deleted file mode 100644 index cf2d1b17c..000000000 --- a/contrib/tuntapv9-ndis/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# TUN/TAP driver v9 for Windows - -in order to set up tunnels on Windows, you will need -to instal this driver. - -* v9.9.2.3 is for Windows 2000/XP/2003 (NDIS 5.0-based) -* v9.21.2 is for Windows Vista/7/8.1 and 10 (NDIS 6.0, forward-compatible with NDIS 10.0) - -to instal, extract the corresponding version of the driver for your -platform and run `%ARCH%/install_tap.cmd` in an elevated shell - -to remove *ALL* virtual tunnel adapters, run `%ARCH%/del_tap.cmd` in an elevated shell. Use the -Device Manager snap-in to remove individual adapter instances. - -Both are signed by OpenVPN Inc, and are available for 32- and 64-bit archs. - --despair86 \ No newline at end of file diff --git a/contrib/tuntapv9-ndis/tap-windows-9.21.2.7z b/contrib/tuntapv9-ndis/tap-windows-9.21.2.7z deleted file mode 100644 index 9187b02bc..000000000 Binary files a/contrib/tuntapv9-ndis/tap-windows-9.21.2.7z and /dev/null differ diff --git a/contrib/tuntapv9-ndis/tap-windows-9.9.2_3.7z b/contrib/tuntapv9-ndis/tap-windows-9.9.2_3.7z deleted file mode 100644 index a13e055ed..000000000 Binary files a/contrib/tuntapv9-ndis/tap-windows-9.9.2_3.7z and /dev/null differ diff --git a/lokinet-bootstrap-testnet.exe b/lokinet-bootstrap-testnet.exe deleted file mode 100644 index 7cea73dc7..000000000 Binary files a/lokinet-bootstrap-testnet.exe and /dev/null differ diff --git a/lokinet-bootstrap.exe b/lokinet-bootstrap.exe deleted file mode 100644 index 8360f7e0b..000000000 Binary files a/lokinet-bootstrap.exe and /dev/null differ diff --git a/win32-setup/7z.exe b/win32-setup/7z.exe deleted file mode 100644 index ffdceed04..000000000 Binary files a/win32-setup/7z.exe and /dev/null differ diff --git a/win32-setup/Makefile b/win32-setup/Makefile new file mode 100644 index 000000000..c34b72de9 --- /dev/null +++ b/win32-setup/Makefile @@ -0,0 +1,6 @@ +# Makefile for windows install pkg and helper library + +regdbhelper.dll: + i686-w64-mingw32-gcc regdb_helper.c -o $@ -shared -Os -s +clean: + rm *.dll *.exe diff --git a/win32-setup/dbghelp32.dll b/win32-setup/dbghelp32.dll deleted file mode 100644 index 62d850863..000000000 Binary files a/win32-setup/dbghelp32.dll and /dev/null differ diff --git a/win32-setup/dbghelp64.dll b/win32-setup/dbghelp64.dll deleted file mode 100644 index f3bd78ff9..000000000 Binary files a/win32-setup/dbghelp64.dll and /dev/null differ diff --git a/win32-setup/lokinet-win32.iss b/win32-setup/lokinet-win32.iss index e46bc82dc..590153cea 100644 --- a/win32-setup/lokinet-win32.iss +++ b/win32-setup/lokinet-win32.iss @@ -68,14 +68,14 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip #ifdef SINGLE_ARCH Source: "{#DevPath}build\lokinet.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "{#DevPath}build\liblokinet-shared.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "dbghelp64.dll"; DestName: "dbghelp.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{tmp}\dbghelp64.dll"; DestName: "dbghelp.dll"; DestDir: "{app}"; Flags: ignoreversion external #else Source: "{#DevPath}build\lokinet.exe"; DestDir: "{app}"; Flags: ignoreversion 32bit; Check: not IsWin64 Source: "{#DevPath}build\liblokinet-shared.dll"; DestDir: "{app}"; Flags: ignoreversion 32bit; Check: not IsWin64 -Source: "dbghelp32.dll"; DestName: "dbghelp.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not IsWin64 +Source: "{tmp}\dbghelp32.dll"; DestName: "dbghelp.dll"; DestDir: "{app}"; Flags: ignoreversion external; Check: not IsWin64 Source: "{#DevPath}build64\lokinet.exe"; DestDir: "{app}"; Flags: ignoreversion 64bit; Check: IsWin64 Source: "{#DevPath}build64\liblokinet-shared.dll"; DestDir: "{app}"; Flags: ignoreversion 64bit; Check: IsWin64 -Source: "dbghelp64.dll"; DestDir: "{app}"; DestName: "dbghelp.dll"; Flags: ignoreversion; Check: IsWin64 +Source: "{tmp}\dbghelp64.dll"; DestDir: "{app}"; DestName: "dbghelp.dll"; Flags: ignoreversion external; Check: IsWin64 #endif ; UI has landed! #ifndef RELEASE @@ -94,7 +94,7 @@ 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: "{#DevPath}win32-setup\7z.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 ; Copy the correct tuntap driver for the selected platform @@ -192,15 +192,18 @@ begin begin // current versions of windows :-) // (Arguably, one could pull this from any of the forks.) - idpAddFile('https://github.com/despair86/loki-network/raw/master/contrib/tuntapv9-ndis/tap-windows-9.21.2.7z', ExpandConstant('{tmp}\tuntapv9_n6.7z')); + idpAddFile('https://snowlight.net/loki/win32-dist/tap-windows-9.21.2.7z', ExpandConstant('{tmp}\tuntapv9_n6.7z')); end; // Windows 2000 only, we need to install inet6 separately if (FileExists(ExpandConstant('{sys}\drivers\tcpip6.sys')) = false) and (Version.Major = 5) and (Version.Minor = 0) then begin idpAddFile('http://www.rvx86.net/files/inet6.7z', ExpandConstant('{tmp}\inet6.7z')); end; - idpDownloadAfter(wpReady); end; + idpAddFile('http://www.rvx86.net/files/7z.exe', ExpandConstant('{tmp}\7z.exe')); + idpAddFile('http://www.rvx86.net/files/dbghelp32.dll', ExpandConstant('{tmp}\dbghelp32.dll')); + idpAddFile('http://www.rvx86.net/files/dbghelp64.dll', ExpandConstant('{tmp}\dbghelp64.dll')); + idpDownloadAfter(wpReady); end; [Icons] diff --git a/win32-setup/regdbhelper.dll b/win32-setup/regdbhelper.dll deleted file mode 100644 index 97d6bf9d8..000000000 Binary files a/win32-setup/regdbhelper.dll and /dev/null differ