Fully move to libreweb project
Melroy van den Berg
parent
f75388e2ed
commit
06701af7a7
|
|
@ -27,9 +27,9 @@ build:
|
|||
name: "Packages"
|
||||
expire_in: 2 weeks
|
||||
paths:
|
||||
- build_prod/browser-*.deb
|
||||
- build_prod/browser-*.rpm
|
||||
- build_prod/browser-*.tar.gz
|
||||
- build_prod/libreweb-browser-*.deb
|
||||
- build_prod/libreweb-browser-*.rpm
|
||||
- build_prod/libreweb-browser-*.tar.gz
|
||||
|
||||
static_code_analysis:
|
||||
stage: build
|
||||
|
|
@ -46,9 +46,9 @@ release:
|
|||
rules:
|
||||
- if: $CI_COMMIT_TAG
|
||||
script:
|
||||
- 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build_prod/browser-v${CI_COMMIT_TAG}.deb ${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.deb'
|
||||
- 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build_prod/browser-v${CI_COMMIT_TAG}.rpm ${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.rpm'
|
||||
- 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build_prod/browser-v${CI_COMMIT_TAG}.tar.gz ${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.tar.gz'
|
||||
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"DWeb Browser (Compressed binary)\",\"url\":\"${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.tar.gz\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
|
||||
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"DWeb Browser (Red-Hat/Fedora/openSUSE)\",\"url\":\"${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.rpm\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
|
||||
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"DWeb Browser (Debian/Ubuntu/Linux Mint)\",\"url\":\"${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.deb\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
|
||||
- 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build_prod/libreweb-browser-v${CI_COMMIT_TAG}.deb ${PACKAGE_REGISTRY_URL}/libreweb-browser-v${CI_COMMIT_TAG}.deb'
|
||||
- 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build_prod/libreweb-browser-v${CI_COMMIT_TAG}.rpm ${PACKAGE_REGISTRY_URL}/libreweb-browser-v${CI_COMMIT_TAG}.rpm'
|
||||
- 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build_prod/libreweb-browser-v${CI_COMMIT_TAG}.tar.gz ${PACKAGE_REGISTRY_URL}/libreweb-browser-v${CI_COMMIT_TAG}.tar.gz'
|
||||
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"LibreWeb Browser (Compressed binary)\",\"url\":\"${PACKAGE_REGISTRY_URL}/libreweb-browser-v${CI_COMMIT_TAG}.tar.gz\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
|
||||
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"LibreWeb Browser (Red-Hat/Fedora/openSUSE)\",\"url\":\"${PACKAGE_REGISTRY_URL}/libreweb-browser-v${CI_COMMIT_TAG}.rpm\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
|
||||
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"LibreWeb Browser (Debian/Ubuntu/Linux Mint)\",\"url\":\"${PACKAGE_REGISTRY_URL}/libreweb-browser-v${CI_COMMIT_TAG}.deb\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ add_subdirectory (lib/ipfs-http-client)
|
|||
add_subdirectory (src)
|
||||
|
||||
# Additional install files
|
||||
install(FILES misc/dweb-browser.desktop DESTINATION share/applications)
|
||||
install(PROGRAMS go-ipfs/ipfs DESTINATION share/dweb-browser/go-ipfs)
|
||||
install(DIRECTORY images DESTINATION share/dweb-browser)
|
||||
install(FILES images/icons/dweb-browser.png DESTINATION share/icons/hicolor/48x48/apps)
|
||||
install(FILES images/icons/dweb-browser.svg DESTINATION share/icons/hicolor/scalable/apps)
|
||||
install(FILES misc/libreweb-browser.desktop DESTINATION share/applications)
|
||||
install(PROGRAMS go-ipfs/ipfs DESTINATION share/libreweb-browser/go-ipfs)
|
||||
install(DIRECTORY images DESTINATION share/libreweb-browser)
|
||||
install(FILES images/icons/libreweb-browser.png DESTINATION share/icons/hicolor/48x48/apps)
|
||||
install(FILES images/icons/libreweb-browser.svg DESTINATION share/icons/hicolor/scalable/apps)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ I was inspired by Douglas Engelbart, Tim Berners-Lee and Ted Nelson as well as p
|
|||
|
||||
## Download
|
||||
|
||||
* [Download the latest release](https://gitlab.melroy.org/dwww/dbrowser/-/releases)
|
||||
* [Download the latest release](https://gitlab.melroy.org/libreweb/browser/-/releases)
|
||||
|
||||
## Screens
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ For the build you need at least:
|
|||
|
||||
### Documentation
|
||||
|
||||
See latest [DWeb Browser Docs](https://gitlab.melroy.org/dwww/dbrowser/-/jobs/artifacts/master/file/build/docs/html/index.html?job=doxygen).
|
||||
See latest [Developer Docs](https://gitlab.melroy.org/libreweb/browser/-/jobs/artifacts/master/file/build/docs/html/index.html?job=doxygen).
|
||||
|
||||
### Research
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
|
||||
# Example: https://github.com/MariaDB/server/tree/10.5/cmake
|
||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "DWeb Browser - Decentralized Web-Browser")
|
||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LibreWeb Browser - Decentralized Web-Browser")
|
||||
set(CPACK_PACKAGE_VENDOR "Melroy van den Berg")
|
||||
set(CPACK_PACKAGE_CONTACT "Melroy van den Berg <melroy@melroy.org>")
|
||||
set(CPACK_PACKAGE_HOMEPAGE_URL "https://melroy.org")
|
||||
set(CPACK_PACKAGE_HOMEPAGE_URL "https://libreweb.org")
|
||||
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
|
||||
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
|
||||
set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 157 KiB After Width: | Height: | Size: 157 KiB |
|
|
@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
|
|||
# title of most generated pages and in a few other places.
|
||||
# The default value is: My Project.
|
||||
|
||||
PROJECT_NAME = "DWeb Browser"
|
||||
PROJECT_NAME = "LibreWeb Browser"
|
||||
|
||||
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
|
||||
# could be handy for archiving the generated documentation or if some version
|
||||
|
|
@ -51,7 +51,7 @@ PROJECT_BRIEF = "Decentralized Web-browser"
|
|||
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
|
||||
# the logo to the output directory.
|
||||
|
||||
PROJECT_LOGO = misc/browser_logo_small.png
|
||||
PROJECT_LOGO = images/browser_logo_small.png
|
||||
|
||||
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
|
||||
# into which the generated documentation will be written. If a relative path is
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Name=DWeb Browser
|
||||
Comment=Decentralized Web-Browser
|
||||
Exec=/usr/bin/browser
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
Icon=dweb-browser
|
||||
Categories=Network;WebBrowser
|
||||
Keywords=Browser;Internet;WWW;Decentralized;Web
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[Desktop Entry]
|
||||
Name=LibreWeb Browser
|
||||
Comment=Decentralized Web-Browser
|
||||
Exec=/usr/bin/libreweb-browser
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
Icon=libreweb-browser
|
||||
Categories=Network;WebBrowser
|
||||
Keywords=Browser;Internet;WWW;Decentralized;Web;LibreWeb
|
||||
|
|
@ -14,7 +14,7 @@ if(NOT CYGWIN)
|
|||
endif()
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
set(PROJECT_TARGET browser)
|
||||
set(PROJECT_TARGET libreweb-browser)
|
||||
|
||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ About::About()
|
|||
devs.push_back("Melroy van den Berg <melroy@melroy.org>");
|
||||
logo.set(this->getLogoImage());
|
||||
|
||||
set_program_name("DWeb Browser");
|
||||
set_program_name("LibreWeb Browser");
|
||||
set_version(PROJECT_VER);
|
||||
set_comments("The fastest decentralized & distributed Browser on planet Earth.");
|
||||
set_logo(logo.get_pixbuf());
|
||||
set_website("https://melroy.org/");
|
||||
set_website("https://libreweb.org/");
|
||||
set_copyright("Copyright © 2020-2021 Melroy van den Berg");
|
||||
set_authors(devs);
|
||||
set_artists(devs);
|
||||
|
|
@ -43,7 +43,7 @@ std::string About::getLogoImage()
|
|||
// Try absolute path first
|
||||
for (std::string data_dir : Glib::get_system_data_dirs())
|
||||
{
|
||||
std::vector<std::string> path_builder{data_dir, "dweb-browser", "images", "browser_logo_small.png"};
|
||||
std::vector<std::string> path_builder{data_dir, "libreweb-browser", "images", "browser_logo_small.png"};
|
||||
std::string file_path = Glib::build_path(G_DIR_SEPARATOR_S, path_builder);
|
||||
if (Glib::file_test(file_path, Glib::FileTest::FILE_TEST_IS_REGULAR))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ void Draw::showStartPage()
|
|||
this->clearOnThread();
|
||||
|
||||
insertHeading1("Welcome to the Decentralized Web (DWeb)");
|
||||
insertText("You can surf the web as intended, by using IPFS as a decentralized solution. This is also the fastest browser in the world.\n\n\
|
||||
insertText("You can surf the web as intended via LibreWeb, by using IPFS as a decentralized solution. This is also the fastest browser in the world.\n\n\
|
||||
The content is fully written in markdown format, allowing you to easily publish your own site, blog article or e-book.\n\
|
||||
This browser has even a built-in editor. Check it out in the menu: File->New Document!\n\n");
|
||||
insertText("See an example page hosted on IPFS: ");
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ std::string IPFS::findIPFSBinary()
|
|||
// Try absolute path first
|
||||
for (std::string data_dir : Glib::get_system_data_dirs())
|
||||
{
|
||||
std::vector<std::string> path_builder{data_dir, "dweb-browser", "go-ipfs", "ipfs"};
|
||||
std::vector<std::string> path_builder{data_dir, "libreweb-browser", "go-ipfs", "ipfs"};
|
||||
std::string ipfs_binary_path = Glib::build_path(G_DIR_SEPARATOR_S, path_builder);
|
||||
if (Glib::file_test(ipfs_binary_path, Glib::FileTest::FILE_TEST_IS_EXECUTABLE))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@ int main(int argc, char *argv[])
|
|||
{
|
||||
case 'v':
|
||||
// Display version, and directly exit the program.
|
||||
std::cout << "DWeb Browser " << PROJECT_VER << std::endl;
|
||||
std::cout << "LibreWeb Browser " << PROJECT_VER << std::endl;
|
||||
exit(EXIT_SUCCESS);
|
||||
break;
|
||||
case 'h':
|
||||
case '?': // Unknown
|
||||
fprintf(stderr, "Usuage: browser [-v] \nDecentralized Web Browser\n\nOptions are:\n -v : output version information and exit\n\n");
|
||||
fprintf(stderr, "Usuage: browser [-v] \nDecentralized Web-Browser, part of the LibreWeb Project\n\nOptions are:\n -v : output version information and exit\n\n");
|
||||
exit(EXIT_SUCCESS);
|
||||
break;
|
||||
}
|
||||
|
|
@ -35,7 +35,7 @@ int main(int argc, char *argv[])
|
|||
else if (child_pid > 0)
|
||||
{
|
||||
// Parent process (child_pid is PID of child)
|
||||
auto app = Gtk::Application::create(argc, argv, "org.melroy.browser");
|
||||
auto app = Gtk::Application::create(argc, argv, "org.libreweb.browser");
|
||||
|
||||
MainWindow window;
|
||||
int exitCode = app->run(window);
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ MainWindow::MainWindow()
|
|||
m_vbox(Gtk::ORIENTATION_VERTICAL, 0),
|
||||
m_hboxToolbar(Gtk::ORIENTATION_HORIZONTAL, 0),
|
||||
m_hboxBottom(Gtk::ORIENTATION_HORIZONTAL, 0),
|
||||
m_appName("DWeb Browser"),
|
||||
m_appName("LibreWeb Browser"),
|
||||
m_iconTheme("flat"), // filled or flat
|
||||
m_requestThread(nullptr),
|
||||
requestPath(""),
|
||||
|
|
@ -520,7 +520,7 @@ std::string MainWindow::getIconImage(const std::string &iconFilename)
|
|||
// Try absolute path first
|
||||
for (std::string data_dir : Glib::get_system_data_dirs())
|
||||
{
|
||||
std::vector<std::string> path_builder{data_dir, "dweb-browser", "images", "icons", m_iconTheme, iconFilename};
|
||||
std::vector<std::string> path_builder{data_dir, "libreweb-browser", "images", "icons", m_iconTheme, iconFilename};
|
||||
std::string file_path = Glib::build_path(G_DIR_SEPARATOR_S, path_builder);
|
||||
if (Glib::file_test(file_path, Glib::FileTest::FILE_TEST_IS_REGULAR))
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue