Skip to content

Commit a41eaa3

Browse files
mrfeodmrfeod
committed
Win: build installer
1 parent 7401d19 commit a41eaa3

28 files changed

+107
-82
lines changed

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ macOSPackage/
44
AmneziaVPN.dmg
55
AmneziaVPN.exe
66
AmneziaVPN_*.exe
7+
FRKN.dmg
8+
FRKN.exe
9+
FRKN_*.exe
710
deploy/build/*
811
deploy/build_32/*
912
deploy/build_64/*
@@ -49,6 +52,7 @@ client/Makefile*
4952
client/fastlane/build/
5053
client/*build-*
5154
client/AmneziaVPN.xcodeproj
55+
client/FRKN.xcodeproj
5256
client/Debug-iphonesimulator/
5357
client/amneziavpn_plugin_import.cpp
5458
client/amneziavpn_qml_plugin_import.cpp
@@ -73,6 +77,7 @@ CMakeLists.txt.user*
7377
deploy/AppDir
7478
deploy/Tools
7579
deploy/AmneziaVPN*Installer*
80+
deploy/FRKN*Installer*
7681

7782
# MACOS files
7883
.DS_Store

‎.vscode/launch.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"name": "Launch Qt App",
99
"type": "cppvsdbg",
1010
"request": "launch",
11-
"program": "${workspaceFolder}/build/client/Debug/AmneziaVPN.exe",
11+
"program": "${workspaceFolder}/build/client/Debug/FRKN.exe",
1212
"args": [],
1313
"stopAtEntry": false,
1414
"cwd": "${workspaceFolder}",

‎CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
22

3-
set(PROJECT AmneziaVPN)
3+
set(PROJECT FRKN)
44

55
project(${PROJECT} VERSION 4.8.2.3
6-
DESCRIPTION "AmneziaVPN"
7-
HOMEPAGE_URL "https://amnezia.org/"
6+
DESCRIPTION "FRKN"
7+
HOMEPAGE_URL "https://frkn.org/"
88
)
99

1010
string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
@@ -35,7 +35,7 @@ if(APPLE AND NOT IOS)
3535
set(CMAKE_OSX_ARCHITECTURES "x86_64")
3636
endif()
3737

38-
list(APPEND CMAKE_PREFIX_PATH "C:/Qt/6.7.2/msvc2019_64/lib/cmake")
38+
# list(APPEND CMAKE_PREFIX_PATH "C:/Qt/6.7.2/msvc2019_64/lib/cmake")
3939

4040
add_subdirectory(client)
4141

‎client/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
22

3-
set(PROJECT AmneziaVPN)
3+
set(PROJECT FRKN)
44
project(${PROJECT})
55

66

‎client/images/app.ico

22.2 KB
Binary file not shown.

‎client/platforms/windows/amneziavpn.rc.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
33

44
IDI_ICON1 ICON "../../images/app.ico"
55

6-
#define VER_COMPANYNAME_STR "AmneziaVPN"
6+
#define VER_COMPANYNAME_STR "FRKN"
77
#define VER_FILEDESCRIPTION_STR VER_COMPANYNAME_STR
88
#define VER_INTERNALNAME_STR VER_COMPANYNAME_STR
9-
#define VER_LEGALCOPYRIGHT_STR "AmneziaVPN."
9+
#define VER_LEGALCOPYRIGHT_STR "FRKN."
1010
#define VER_LEGALTRADEMARKS1_STR "All Rights Reserved"
1111
#define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR
12-
#define VER_ORIGINALFILENAME_STR "amneziavpn.exe"
12+
#define VER_ORIGINALFILENAME_STR "frkn.exe"
1313
#define VER_PRODUCTNAME_STR VER_COMPANYNAME_STR
1414

1515
VS_VERSION_INFO VERSIONINFO

‎client/ui/qml/Modules/Style/AmneziaStyle.qml

+13
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,17 @@ QtObject {
2323
readonly property color translucentWhite: Qt.rgba(1, 1, 1, 0.08)
2424
readonly property color barelyTranslucentWhite: Qt.rgba(1, 1, 1, 0.05)
2525
}
26+
27+
property QtObject frknColorPalette: QtObject {
28+
readonly property color mainBlue: '#2757FF'
29+
readonly property color clickBlue: '#002BC4'
30+
readonly property color white: '#FFFFFF'
31+
readonly property color black: '#121314'
32+
readonly property color grey: '#686A6D'
33+
readonly property color lightGrey: '#ABACAD'
34+
readonly property color errorRed: '#9B0104'
35+
readonly property color backgroundGrey: '#EFEFEF'
36+
37+
readonly property color test: '#FFFF00' // For debug purposes
38+
}
2639
}

‎client/ui/qml/Pages2/PageSetupWizardStart.qml

+9
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,18 @@ PageType {
133133
text: qsTr("Register")
134134

135135
clickedFunc: function() {
136+
// Generate BIP39 mnemonic phrase
137+
// SHA3_512 hex is the user id
136138
// TODO Receive mnemonic phrase from the server
137139
// TODO Set mnemonic phrase to textKey.textFieldText
138140
// This is valid only for testing purposes
141+
142+
// Redirect to login page with mnemophrase
143+
144+
// Auth with SHA3_512 in FRKN and receive configs
145+
146+
// Use mock server to receive configs
147+
139148
textKey.buttonText = ""
140149
textKey.textFieldText = "comfort search stem execute face relief exhaust happy erode movie swing one"
141150
textKey.textFieldEditable = false

‎deploy/build_windows.bat

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
CHCP 1252
44

5+
set QT_BIN_DIR=C:\Qt\6.7.2\msvc2019_64\bin
6+
set QIF_BIN_DIR=C:\Qt\Tools\QtInstallerFramework\4.8\bin
7+
set BUILD_ARCH=64
8+
59
REM %VAR:"=% mean dequoted %VAR%
610

711
set PATH=%QT_BIN_DIR:"=%;%PATH%
@@ -14,9 +18,9 @@ set PROJECT_DIR=%cd%
1418
set SCRIPT_DIR=%PROJECT_DIR:"=%\deploy
1519

1620
set WORK_DIR=%SCRIPT_DIR:"=%\build_%BUILD_ARCH:"=%
17-
set APP_NAME=AmneziaVPN
21+
set APP_NAME=FRKN
1822
set APP_FILENAME=%APP_NAME:"=%.exe
19-
set APP_DOMAIN=org.amneziavpn.package
23+
set APP_DOMAIN=org.frkn.package
2024
set OUT_APP_DIR=%WORK_DIR:"=%\client\release
2125
set PREBILT_DEPLOY_DATA_DIR=%PROJECT_DIR:"=%\client\3rd-prebuilt\deploy-prebuilt\windows\x%BUILD_ARCH:"=%
2226
set DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\windows\x%BUILD_ARCH:"=%
@@ -59,11 +63,11 @@ rem copy "%WORK_DIR%\client\%APP_FILENAME%" "%OUT_APP_DIR%"
5963

6064
echo "Signing exe"
6165
cd %OUT_APP_DIR%
62-
signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.exe
66+
@REM signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.exe
6367

6468
"%QT_BIN_DIR:"=%\windeployqt" --release --qmldir "%PROJECT_DIR:"=%\client" --force --no-translations "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%"
6569

66-
signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.dll
70+
@REM signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.dll
6771

6872
echo "Copying deploy data..."
6973
xcopy %DEPLOY_DATA_DIR% %OUT_APP_DIR% /s /e /y /i /f
@@ -87,7 +91,7 @@ echo "Creating installer..."
8791
timeout 5
8892

8993
cd %PROJECT_DIR%
90-
signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 "%TARGET_FILENAME%"
94+
@REM signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 "%TARGET_FILENAME%"
9195

9296
echo "Finished, see %TARGET_FILENAME%"
9397
exit 0

‎deploy/data/windows/x32/post_install.cmd

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sc stop AmneziaWGTunnel$AmneziaVPN
22
sc delete AmneziaWGTunnel$AmneziaVPN
3-
taskkill /IM "AmneziaVPN-service.exe" /F
4-
taskkill /IM "AmneziaVPN.exe" /F
3+
taskkill /IM "FRKN-service.exe" /F
4+
taskkill /IM "FRKN.exe" /F
55
exit /b 0

‎deploy/data/windows/x32/post_uninstall.cmd

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
set AmneziaPath=%~dp0
2-
echo %AmneziaPath%
1+
set FRKNPath=%~dp0
2+
echo %FRKNPath%
33

4-
"%AmneziaPath%\AmneziaVPN.exe" -c
4+
"%FRKNPath%\FRKN.exe" -c
55
timeout /t 1
6-
sc stop AmneziaVPN-service
7-
sc delete AmneziaVPN-service
6+
sc stop FRKN-service
7+
sc delete FRKN-service
88
sc stop AmneziaWGTunnel$AmneziaVPN
99
sc delete AmneziaWGTunnel$AmneziaVPN
10-
taskkill /IM "AmneziaVPN-service.exe" /F
11-
taskkill /IM "AmneziaVPN.exe" /F
10+
taskkill /IM "FRKN-service.exe" /F
11+
taskkill /IM "FRKN.exe" /F
1212
exit /b 0

‎deploy/data/windows/x64/post_install.cmd

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sc stop AmneziaWGTunnel$AmneziaVPN
22
sc delete AmneziaWGTunnel$AmneziaVPN
3-
taskkill /IM "AmneziaVPN-service.exe" /F
4-
taskkill /IM "AmneziaVPN.exe" /F
3+
taskkill /IM "FRKN-service.exe" /F
4+
taskkill /IM "FRKN.exe" /F
55
exit /b 0

‎deploy/data/windows/x64/post_uninstall.cmd

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
set AmneziaPath=%~dp0
2-
echo %AmneziaPath%
1+
set FRKNPath=%~dp0
2+
echo %FRKNPath%
33

4-
"%AmneziaPath%\AmneziaVPN.exe" -c
4+
"%FRKNPath%\FRKN.exe" -c
55
timeout /t 1
6-
sc stop AmneziaVPN-service
7-
sc delete AmneziaVPN-service
6+
sc stop FRKN-service
7+
sc delete FRKN-service
88
sc stop AmneziaWGTunnel$AmneziaVPN
99
sc delete AmneziaWGTunnel$AmneziaVPN
10-
taskkill /IM "AmneziaVPN-service.exe" /F
11-
taskkill /IM "AmneziaVPN.exe" /F
10+
taskkill /IM "FRKN-service.exe" /F
11+
taskkill /IM "FRKN.exe" /F
1212
exit /b 0

‎deploy/installer/config.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ elseif(LINUX)
1717
)
1818

1919
configure_file(
20-
${CMAKE_CURRENT_LIST_DIR}/config/AmneziaVPN.desktop.in
21-
${CMAKE_BINARY_DIR}/../AppDir/AmneziaVPN.desktop
20+
${CMAKE_CURRENT_LIST_DIR}/config/frkn.desktop.in
21+
${CMAKE_BINARY_DIR}/../AppDir/frkn.desktop
2222
)
2323
endif()
2424

2525
configure_file(
26-
${CMAKE_CURRENT_LIST_DIR}/packages/org.amneziavpn.package/meta/package.xml.in
27-
${CMAKE_BINARY_DIR}/installer/packages/org.amneziavpn.package/meta/package.xml
26+
${CMAKE_CURRENT_LIST_DIR}/packages/org.frkn.package/meta/package.xml.in
27+
${CMAKE_BINARY_DIR}/installer/packages/org.frkn.package/meta/package.xml
2828
)

‎deploy/installer/config/AmneziaVPN.desktop.in renamed to ‎deploy/installer/config/FRKN.desktop.in

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env xdg-open
22
[Desktop Entry]
33
Type=Application
4-
Name=AmneziaVPN
4+
Name=FRKN
55
Version=@CMAKE_PROJECT_VERSION@
6-
Comment=Client of your self-hosted VPN
7-
Exec=AmneziaVPN
8-
Icon=/usr/share/pixmaps/AmneziaVPN.png
6+
Comment=FRKN client application
7+
Exec=FRKN
8+
Icon=/usr/share/pixmaps/FRKN.png
99
Categories=Network;Qt;Security;
1010
Terminal=false

‎deploy/installer/config/controlscript.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ function appExecutableFileName()
2121
function appInstalled()
2222
{
2323
if (runningOnWindows()) {
24-
appInstalledUninstallerPath = installer.value("RootDir") + "Program Files/AmneziaVPN/maintenancetool.exe";
25-
appInstalledUninstallerPath_x86 = installer.value("RootDir") + "Program Files (x86)/AmneziaVPN/maintenancetool.exe";
24+
appInstalledUninstallerPath = installer.value("RootDir") + "Program Files/FRKN/maintenancetool.exe";
25+
appInstalledUninstallerPath_x86 = installer.value("RootDir") + "Program Files (x86)/FRKN/maintenancetool.exe";
2626
} else if (runningOnMacOS()){
2727
appInstalledUninstallerPath = "/Applications/" + appName() + ".app/maintenancetool.app/Contents/MacOS/maintenancetool";
2828
} else if (runningOnLinux()){

‎deploy/installer/config/frkn.icns

409 KB
Binary file not shown.

‎deploy/installer/config/frkn.ico

203 KB
Binary file not shown.

‎deploy/installer/config/frkn.png

22.4 KB
Loading

‎deploy/installer/config/linux.xml.in

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Installer>
3-
<Name>AmneziaVPN</Name>
3+
<Name>FRKN</Name>
44
<Version>@CMAKE_PROJECT_VERSION@</Version>
5-
<Title>AmneziaVPN</Title>
6-
<Publisher>AmneziaVPN</Publisher>
7-
<StartMenuDir>AmneziaVPN</StartMenuDir>
8-
<TargetDir>@ApplicationsDir@/AmneziaVPN</TargetDir>
5+
<Title>FRKN</Title>
6+
<Publisher>FRKN</Publisher>
7+
<StartMenuDir>FRKN</StartMenuDir>
8+
<TargetDir>@ApplicationsDir@/FRKN</TargetDir>
99
<WizardDefaultWidth>600</WizardDefaultWidth>
1010
<WizardDefaultHeight>380</WizardDefaultHeight>
1111
<WizardStyle>Modern</WizardStyle>
@@ -19,9 +19,9 @@
1919
<DisableAuthorizationFallback>true</DisableAuthorizationFallback>
2020
<RemoteRepositories>
2121
<Repository>
22-
<Url>https://amneziavpn.org/updates/linux</Url>
22+
<Url>https://frkn.org/updates/linux</Url>
2323
<Enabled>true</Enabled>
24-
<DisplayName>AmneziaVPN - repository for Linux</DisplayName>
24+
<DisplayName>FRKN - repository for Linux</DisplayName>
2525
</Repository>
2626
</RemoteRepositories>
2727
</Installer>

‎deploy/installer/config/macos.xml.in

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Installer>
3-
<Name>AmneziaVPN</Name>
3+
<Name>FRKN</Name>
44
<Version>@CMAKE_PROJECT_VERSION@</Version>
5-
<Title>AmneziaVPN</Title>
6-
<Publisher>AmneziaVPN</Publisher>
7-
<StartMenuDir>AmneziaVPN</StartMenuDir>
8-
<TargetDir>/Applications/AmneziaVPN.app</TargetDir>
5+
<Title>FRKN</Title>
6+
<Publisher>FRKN</Publisher>
7+
<StartMenuDir>FRKN</StartMenuDir>
8+
<TargetDir>/Applications/FRKN.app</TargetDir>
99
<WizardDefaultWidth>600</WizardDefaultWidth>
1010
<WizardDefaultHeight>380</WizardDefaultHeight>
1111
<WizardStyle>Mac</WizardStyle>
@@ -19,9 +19,9 @@
1919
<DisableAuthorizationFallback>true</DisableAuthorizationFallback>
2020
<RemoteRepositories>
2121
<Repository>
22-
<Url>https://amneziavpn.org/updates/macos</Url>
22+
<Url>https://frkn.org/updates/macos</Url>
2323
<Enabled>true</Enabled>
24-
<DisplayName>AmneziaVPN - repository for macOS</DisplayName>
24+
<DisplayName>FRKN - repository for macOS</DisplayName>
2525
</Repository>
2626
</RemoteRepositories>
2727
</Installer>

‎deploy/installer/config/windows.xml.in

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Installer>
3-
<Name>AmneziaVPN</Name>
3+
<Name>FRKN</Name>
44
<Version>@CMAKE_PROJECT_VERSION@</Version>
5-
<Title>AmneziaVPN</Title>
6-
<Publisher>AmneziaVPN</Publisher>
7-
<StartMenuDir>AmneziaVPN</StartMenuDir>
8-
<TargetDir>@RootDir@/Program Files/AmneziaVPN</TargetDir>
5+
<Title>FRKN</Title>
6+
<Publisher>FRKN.ORG</Publisher>
7+
<StartMenuDir>FRKN</StartMenuDir>
8+
<TargetDir>@RootDir@/Program Files/FRKN</TargetDir>
99
<WizardDefaultWidth>600</WizardDefaultWidth>
1010
<WizardDefaultHeight>380</WizardDefaultHeight>
1111
<WizardStyle>Modern</WizardStyle>
@@ -17,4 +17,7 @@
1717
<DependsOnLocalInstallerBinary>true</DependsOnLocalInstallerBinary>
1818
<SupportsModify>false</SupportsModify>
1919
<DisableAuthorizationFallback>true</DisableAuthorizationFallback>
20+
<ProductUrl>https://frkn.org</ProductUrl>
21+
<InstallerWindowIcon>frkn.png</InstallerWindowIcon>
22+
<InstallerApplicationIcon>frkn</InstallerApplicationIcon>
2023
</Installer>

‎deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js renamed to ‎deploy/installer/packages/org.frkn.package/meta/componentscript.js

File renamed without changes.

‎deploy/installer/packages/org.amneziavpn.package/meta/package.xml.in renamed to ‎deploy/installer/packages/org.frkn.package/meta/package.xml.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Package>
3-
<DisplayName>AmneziaVPN</DisplayName>
4-
<Description>Installation package for AmneziaVPN</Description>
3+
<DisplayName>FRKN</DisplayName>
4+
<Description>Installation package for FRKN</Description>
55
<Version>@CMAKE_PROJECT_VERSION@</Version>
66
<ReleaseDate>@RELEASE_DATE@</ReleaseDate>
77
<Default>true</Default>

‎metadata/en-US/full_description.txt

+4-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
1-
Get your own self-hosted VPN!
1+
FRKN — Free VPN for Free people
22

3-
AmneziaVPN is a multi-protocol, open-source VPN client that offers the option to set up your own server.
3+
We support freedom of speech and oppose all forms of censorship. We are developing a decentralized VPN that does not collect or store user data.
44

5-
Free open-source software to create a personal VPN on your server. Helps to access blocked content without revealing privacy even to VPN providers. Specify IP address, credentials for your server and Amnezia will configure it to connect via VPN automatically.
6-
7-
We are not a VPN service, you don't have to connect to our servers and pay us anything. You free to use your own self-hosted VPS or you could purchase any VPS from any provider. To connect, use your own or purchase any VPS from any provider.
8-
9-
Useful links
10-
11-
• https://amnezia.org - project website
12-
• https://www.reddit.com/r/AmneziaVPN - Reddit
13-
• https://t.me/amnezia_vpn_en - Telegram support channel (English)
14-
• https://t.me/amnezia_vpn - Telegram support channel (Russian)
15-
• https://t.me/amnezia_free_myanmar_bot - Telegram support channel (Burmese)
5+
• https://frkn.org - project website
6+
• https://t.me/frkn_support - Telegram support channel

‎metadata/en-US/title.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Amnezia VPN
1+
FRKN

‎service/server/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
22

3-
set(PROJECT AmneziaVPN-service)
3+
set(PROJECT FRKN-service)
44
project(${PROJECT})
55

66
set(CMAKE_CXX_STANDARD 20)

0 commit comments

Comments
 (0)