From 1d37ebc826c6528c14b92bba55e8f7bdc68427f2 Mon Sep 17 00:00:00 2001 From: Adam Treat Date: Sun, 23 Apr 2023 22:57:37 -0400 Subject: [PATCH] Change name of exe. --- CMakeLists.txt | 4 ++-- cmake/deploy-qt-linux.cmake.in | 2 +- cmake/deploy-qt-mac.cmake.in | 2 +- cmake/installerscript.qs | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85cfb8c5..465fc4a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,8 +98,8 @@ qt_add_qml_module(chat ) set_target_properties(chat PROPERTIES - OUTPUT_NAME GPT4All - MACOSX_BUNDLE_GUI_IDENTIFIER gpt4all.chat + OUTPUT_NAME gpt4all + MACOSX_BUNDLE_GUI_IDENTIFIER gpt4all MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} MACOSX_BUNDLE TRUE diff --git a/cmake/deploy-qt-linux.cmake.in b/cmake/deploy-qt-linux.cmake.in index 3fb0825c..d38588aa 100644 --- a/cmake/deploy-qt-linux.cmake.in +++ b/cmake/deploy-qt-linux.cmake.in @@ -5,7 +5,7 @@ set(DATA_DIR ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/packages/${COMPONENT_NAME_MAIN set(BIN_DIR ${DATA_DIR}/bin) set(Qt6_ROOT_DIR "@Qt6_ROOT_DIR@") set(ENV{LD_LIBRARY_PATH} "${BIN_DIR}:${Qt6_ROOT_DIR}/../lib/") -execute_process(COMMAND ${LINUXDEPLOYQT} ${BIN_DIR}/chat -qmldir=${CMAKE_CURRENT_SOURCE_DIR} -bundle-non-qt-libs -qmake=${Qt6_ROOT_DIR}/bin/qmake -verbose=2) +execute_process(COMMAND ${LINUXDEPLOYQT} ${BIN_DIR}/gpt4all -qmldir=${CMAKE_CURRENT_SOURCE_DIR} -bundle-non-qt-libs -qmake=${Qt6_ROOT_DIR}/bin/qmake -verbose=2) file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-16.png" DESTINATION ${DATA_DIR}) file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-32.png" diff --git a/cmake/deploy-qt-mac.cmake.in b/cmake/deploy-qt-mac.cmake.in index 7e176db2..8a38bfff 100644 --- a/cmake/deploy-qt-mac.cmake.in +++ b/cmake/deploy-qt-mac.cmake.in @@ -1,7 +1,7 @@ set(MACDEPLOYQT "@MACDEPLOYQT@") set(COMPONENT_NAME_MAIN "@COMPONENT_NAME_MAIN@") set(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@") -execute_process(COMMAND ${MACDEPLOYQT} ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/packages/${COMPONENT_NAME_MAIN}/data/bin/chat.app -executable="${CMAKE_INSTALL_PREFIX}/bin/chat.app/Contents/Frameworks/llama.dylib" -qmldir=${CMAKE_CURRENT_SOURCE_DIR} -verbose=2) +execute_process(COMMAND ${MACDEPLOYQT} ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/packages/${COMPONENT_NAME_MAIN}/data/bin/gpt4all.app -qmldir=${CMAKE_CURRENT_SOURCE_DIR} -verbose=2) file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-16.png" DESTINATION ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/packages/${COMPONENT_NAME_MAIN}/data) file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-32.png" diff --git a/cmake/installerscript.qs b/cmake/installerscript.qs index 8843c91d..902060a0 100644 --- a/cmake/installerscript.qs +++ b/cmake/installerscript.qs @@ -16,7 +16,7 @@ Component.prototype.createOperations = function() var userProfile = installer.environmentVariable("USERPROFILE"); installer.setValue("UserProfile", userProfile); component.addOperation("CreateShortcut", - targetDirectory + "/bin/chat.exe", + targetDirectory + "/bin/gpt4all.exe", "@UserProfile@/Desktop/GPT4All.lnk", "workingDirectory=" + targetDirectory + "/bin", "iconPath=" + targetDirectory + "/favicon.ico", @@ -25,20 +25,20 @@ Component.prototype.createOperations = function() print("ERROR: creating desktop shortcut" + e); } component.addOperation("CreateShortcut", - targetDirectory + "/bin/chat.exe", + targetDirectory + "/bin/gpt4all.exe", "@StartMenuDir@/GPT4All.lnk", "workingDirectory=" + targetDirectory + "/bin", "iconPath=" + targetDirectory + "/favicon.ico", "iconId=0", "description=Open GPT4All"); } else if (systemInfo.productType === "osx") { - targetDirectory += "/chat.app/Contents/MacOS/" + targetDirectory += "/gpt4all.app/Contents/MacOS/" } else { // linux var homeDir = installer.environmentVariable("HOME"); if (!installer.fileExists(homeDir + "/Desktop/GPT4All.desktop")) { component.addOperation("CreateDesktopEntry", homeDir + "/Desktop/GPT4All.desktop", "Type=Application\nTerminal=false\nExec=\"" + targetDirectory + - "/bin/chat\"\nName=GPT4All\nIcon=" + targetDirectory + + "/bin/gpt4all\"\nName=GPT4All\nIcon=" + targetDirectory + "/logo-48.png\nName[en_US]=GPT4All"); } }