Revert "fix license", do the CRLF conversion at installer build time

This reverts commit 6fdbf6cb25988845ceef1c8b945a1bc93f6ee7e3.
pull/825/head
Rick V 5 years ago
parent 0ba4ab10a4
commit 37cf2c0bad
No known key found for this signature in database
GPG Key ID: C0EDC8723FDC3465

@ -5,3 +5,4 @@ curl-*/
include/
lib/
*.pem
LICENSE

@ -32,6 +32,7 @@ curl:
lokinet-bootstrap.exe: mbedtls curl
cp curl-7.66.0/src/curl.exe $@
wget -O rootcerts.pem https://curl.haxx.se/ca/cacert.pem
cp ../LICENSE .;unix2dos LICENSE LICENSE
else
all: regdbhelper.dll lokinet-bootstrap.exe
@ -42,6 +43,7 @@ regdbhelper.dll:
lokinet-bootstrap.exe:
scp despair@10.10.10.6:loki-network/win32-setup/*.exe .
wget -O rootcerts.pem https://curl.haxx.se/ca/cacert.pem
cp ../LICENSE .;unix2dos LICENSE LICENSE
endif
clean:

@ -90,7 +90,7 @@ Source: "{#DevPath}ui-win32\bin\release\lokinetui.pdb"; DestDir: "{app}"; Flags:
; eh, might as well ship the 32-bit port of everything else
Source: "{#DevPath}build\testAll.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#DevPath}build\lokinet-rcutil.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#DevPath}LICENSE"; DestDir: "{app}"; Flags: ignoreversion
Source: "LICENSE"; DestDir: "{app}"; Flags: ignoreversion
Source: "lokinet-bootstrap.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "rootcerts.pem"; DestDir: "{app}"; Flags: ignoreversion
; delet this after finishing setup, we only need it to extract the drivers

Loading…
Cancel
Save