From 1fa3e4ff9866bcfe6b3341db1a8ed7e7d7bcdf65 Mon Sep 17 00:00:00 2001 From: smallboyc Date: Wed, 24 Jul 2024 16:35:23 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20:=20rename=20to=20Coollab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflows/create_launcher_installer.yml | 8 ++++---- CMakeLists.txt | 18 +++++++++--------- Lab | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/create_launcher_installer.yml b/.github/workflows/create_launcher_installer.yml index 7c4517c..5de32a2 100644 --- a/.github/workflows/create_launcher_installer.yml +++ b/.github/workflows/create_launcher_installer.yml @@ -8,7 +8,7 @@ on: env: cmake_configure_args: -D WARNINGS_AS_ERRORS_FOR_COOLLAB=ON -D COOLLAB_REQUIRE_ALL_FEATURES=ON cmakelists_folder: "." - cmake_target: Coollab-Launcher + cmake_target: Coollab jobs: create-release-executables: @@ -23,21 +23,21 @@ jobs: os: windows-latest, cmake_configure_args: -D CMAKE_C_COMPILER=cl CMAKE_CXX_COMPILER=cl -G Ninja, cpack_generator: NSIS, - installer_name: Coollab-Launcher-Windows.exe, + installer_name: Coollab-Windows.exe, } - { name: Linux, os: ubuntu-latest, cmake_configure_args: -D CMAKE_C_COMPILER=clang -D CMAKE_CXX_COMPILER=clang++ -G Ninja, cpack_generator: STGZ, - installer_name: Coollab-Launcher-Linux.sh, + installer_name: Coollab-Linux.sh, } - { name: MacOS, os: macos-latest, cmake_configure_args: -D CMAKE_C_COMPILER=clang -D CMAKE_CXX_COMPILER=clang++ -G Ninja -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib, cpack_generator: Bundle, - installer_name: Coollab-Launcher-Mac.dmg, + installer_name: Coollab-Mac.dmg, } steps: diff --git a/CMakeLists.txt b/CMakeLists.txt index 88da5c4..67b79cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(Coollab-Launcher) +project(Coollab) add_executable(${PROJECT_NAME}) target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20) @@ -86,13 +86,13 @@ else() endif() # Installer Info -set(CPACK_PACKAGE_NAME "Coollab-Launcher") +set(CPACK_PACKAGE_NAME "Coollab") set(CPACK_PACKAGE_VERSION "${COOLLAB_VERSION}") -set(CPACK_PACKAGE_INSTALL_DIRECTORY "Coollab-Launcher") # Don't put this in a Coollab parent folder. In NSIS this messes up the install and prevents our app to appear in "Apps and Features" to uninstall it for example. +set(CPACK_PACKAGE_INSTALL_DIRECTORY "Coollab") # Don't put this in a Coollab parent folder. In NSIS this messes up the install and prevents our app to appear in "Apps and Features" to uninstall it for example. set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}${SEP}Lab${SEP}app-resources${SEP}installer_banner.bmp") # Seems like it has to be .bmp, at least for NSIS. NB: if there is any transparency in the image, NSIS won't be able to render it at all. Exporting a fully opaque .bmp from Paint.net works. 150x57 pixels is the ideal size to avoid uggly downscale artifacts. set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}${SEP}Lab${SEP}LICENSE.txt") set(CPACK_PACKAGE_VENDOR "Coollab") -set(CPACK_PACKAGE_EXECUTABLES "Coollab-Launcher" "Coollab-Launcher") # Creates Start Menu shortcuts +set(CPACK_PACKAGE_EXECUTABLES "Coollab" "Coollab") # Creates Start Menu shortcuts set(CPACK_PACKAGE_CONTACT "coollab.lib@gmail.com") # TODO(Launcher) Quand on désinsrtalle le launchze, déqinstaller toutes les vrsions de coollab @@ -106,7 +106,7 @@ else() set(OS_NAME "Linux") endif() -set(CPACK_PACKAGE_FILE_NAME "Coollab-Launcher-${OS_NAME}") +set(CPACK_PACKAGE_FILE_NAME "Coollab-${OS_NAME}") # NSIS specifics set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) @@ -119,11 +119,11 @@ set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " WriteRegStr HKCR 'CoollabFile' '' 'Coollab File' WriteRegStr HKCR 'CoollabFile\\\\shell' '' 'open' WriteRegStr HKCR 'CoollabFile\\\\DefaultIcon' \\\\ - '' '$INSTDIR\\\\bin\\\\coollab-launcher.exe,0' + '' '$INSTDIR\\\\bin\\\\Coollab.exe,0' WriteRegStr HKCR 'CoollabFile\\\\shell\\\\open\\\\command' \\\\ - '' '$INSTDIR\\\\bin\\\\coollab-launcher.exe \\\"%1\\\"' + '' '$INSTDIR\\\\bin\\\\Coollab.exe \\\"%1\\\"' WriteRegStr HKCR 'CoollabFile\\\\shell\\\\edit\\\\command' \\\\ - '' '$INSTDIR\\\\bin\\\\coollab-launcher.exe \\\"%1\\\"' + '' '$INSTDIR\\\\bin\\\\Coollab.exe \\\"%1\\\"' System::Call \\\\ 'Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)' ") @@ -133,7 +133,7 @@ set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " ") # MacOS Bundle specifics -set(CPACK_BUNDLE_NAME "Coollab-Launcher") +set(CPACK_BUNDLE_NAME "Coollab") set(CPACK_BUNDLE_PLIST "${CMAKE_SOURCE_DIR}/Lab/app-resources/Info.plist") set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/Lab/app-resources/icon.icns") diff --git a/Lab b/Lab index e8a87f6..65fdfdc 160000 --- a/Lab +++ b/Lab @@ -1 +1 @@ -Subproject commit e8a87f6fc6833fba76f79178ea63561083279739 +Subproject commit 65fdfdc248446dffabc2e030fae35eef2e5d20be