Replace GitAhead by Gittyup

This commit is contained in:
Martin Marmsoler 2021-10-19 15:05:47 +02:00
parent 1ee9922d92
commit 5683fa894b
27 changed files with 134 additions and 134 deletions

View File

@ -1,28 +1,28 @@
cmake_minimum_required(VERSION 3.6.2)
project(GitAhead)
project(Gittyup)
# Set name and version.
set(GITAHEAD_NAME "GitAhead")
set(GITAHEAD_VERSION_MAJOR 2)
set(GITAHEAD_VERSION_MINOR 6)
set(GITAHEAD_VERSION_PATCH 3)
set(GITAHEAD_VERSION
"${GITAHEAD_VERSION_MAJOR}.${GITAHEAD_VERSION_MINOR}.${GITAHEAD_VERSION_PATCH}"
set(GITTYUP_NAME "Gittyup")
set(GITTYUP_VERSION_MAJOR 2)
set(GITTYUP_VERSION_MINOR 6)
set(GITTYUP_VERSION_PATCH 3)
set(GITTYUP_VERSION
"${GITTYUP_VERSION_MAJOR}.${GITTYUP_VERSION_MINOR}.${GITTYUP_VERSION_PATCH}"
)
# Generate build date.
string(TIMESTAMP GITAHEAD_BUILD_DATE)
string(TIMESTAMP GITTYUP_BUILD_DATE)
# Lookup git revision.
find_package(Git)
if(GIT_FOUND)
execute_process(
COMMAND ${GIT_EXECUTABLE} --git-dir=${CMAKE_SOURCE_DIR}/.git show -s --format=%h HEAD
OUTPUT_VARIABLE GITAHEAD_BUILD_REVISION
OUTPUT_VARIABLE GITTYUP_BUILD_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else()
set(GITAHEAD_BUILD_REVISION "unknown")
set(GITTYUP_BUILD_REVISION "unknown")
endif()
# Explicitly disable shared libraries.

View File

@ -4,7 +4,7 @@ macro(add_helper NAME)
set(TARGET git-credential-${NAME})
add_executable(${TARGET} ${PATH}/${NAME}/${TARGET}.c)
set_target_properties(${TARGET} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY $<TARGET_FILE_DIR:gitahead>
RUNTIME_OUTPUT_DIRECTORY $<TARGET_FILE_DIR:gittyup>
)
if(${ARGC} GREATER 1)
@ -14,7 +14,7 @@ macro(add_helper NAME)
if(NOT APPLE)
install(TARGETS ${TARGET}
DESTINATION .
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endif()
endmacro()

View File

@ -21,7 +21,7 @@ file(GLOB_RECURSE SOURCE_FILES
)
foreach(LANGUAGE ${LANGUAGES})
set(TS_FILES ${TS_FILES} gitahead_${LANGUAGE}.ts)
set(TS_FILES ${TS_FILES} gittyup_${LANGUAGE}.ts)
endforeach()
if(UPDATE_TRANSLATIONS)
@ -32,16 +32,16 @@ else()
endif()
add_custom_target(translations DEPENDS ${QM_FILES})
add_dependencies(gitahead translations)
add_dependencies(gittyup translations)
set(CONTENTS_DIR ${GITAHEAD_NAME}.app/Contents)
set(CONTENTS_DIR ${GITTYUP_NAME}.app/Contents)
foreach(LANGUAGE ${LANGUAGES})
set(QT_QM_FILES ${QT_QM_FILES}
${QT_TRANSLATIONS_DIR}/qtbase_${LANGUAGE}.qm
)
if(APPLE)
get_target_property(DIR gitahead RUNTIME_OUTPUT_DIRECTORY)
get_target_property(DIR gittyup RUNTIME_OUTPUT_DIRECTORY)
add_custom_command(TARGET translations POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory
${DIR}/${CONTENTS_DIR}/Resources/${LANGUAGE}.lproj
@ -54,7 +54,7 @@ foreach(QM_FILE ${QM_FILES} ${QT_QM_FILES})
if(EXISTS ${QM_FILE})
install(FILES ${QM_FILE}
DESTINATION $<${MAC}:${CONTENTS_DIR}/>Resources/l10n
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endif()
endforeach()

View File

@ -2,7 +2,7 @@ set(CONF_DIR ${CMAKE_SOURCE_DIR}/conf)
set(RSRC_DIR ${CMAKE_SOURCE_DIR}/rsrc)
set(MAC $<PLATFORM_ID:Darwin>)
set(CONTENTS_DIR ${GITAHEAD_NAME}.app/Contents)
set(CONTENTS_DIR ${GITTYUP_NAME}.app/Contents)
# Install Qt plugins.
set(QT_PLUGINS
@ -44,7 +44,7 @@ foreach(QT_PLUGIN ${QT_PLUGINS})
DESTINATION $<${MAC}:${CONTENTS_DIR}/>Plugins/${DIR_NAME}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
if(WIN32)
@ -62,7 +62,7 @@ foreach(QT_PLUGIN ${QT_PLUGINS})
-s \"${CODESIGN_IDENTITY}\"
\${CMAKE_INSTALL_PREFIX}/${CONTENTS_DIR}/${PLUGIN_PATH}
)"
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endif()
else()
@ -71,7 +71,7 @@ foreach(QT_PLUGIN ${QT_PLUGINS})
"execute_process(COMMAND chrpath --delete
\${CMAKE_INSTALL_PREFIX}/${PLUGIN_PATH}
)"
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endif()
endforeach()
@ -85,7 +85,7 @@ foreach(QT_MODULE ${QT_MODULES})
set(DEST_DIR ${CONTENTS_DIR}/Frameworks)
install(DIRECTORY ${QT_FRAMEWORK}
DESTINATION ${DEST_DIR}
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
PATTERN "*.prl" EXCLUDE
PATTERN "*_debug" EXCLUDE
PATTERN "Headers" EXCLUDE
@ -110,7 +110,7 @@ foreach(QT_MODULE ${QT_MODULES})
DESTINATION .
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
RENAME ${TARGET_NAME}
)
@ -120,7 +120,7 @@ foreach(QT_MODULE ${QT_MODULES})
"execute_process(COMMAND chrpath --delete
\${CMAKE_INSTALL_PREFIX}/${TARGET_NAME}
)"
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endif()
endif()
@ -137,7 +137,7 @@ if(UNIX AND NOT APPLE)
DESTINATION .
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
RENAME ${LIB_NAME}.so.5
)
endif()
@ -169,7 +169,7 @@ if(FALSE) # NOT APPLE)
DESTINATION .
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
OPTIONAL # if we use the system libssh, we have not built openssl
)
endforeach()
@ -179,14 +179,14 @@ endif()
set(QT_CONF ${CONF_DIR}/qt.conf)
install(FILES ${QT_CONF}
DESTINATION $<${MAC}:${CONTENTS_DIR}/Resources/>.
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
if(NOT APPLE)
if(UNIX)
install(DIRECTORY ${RSRC_DIR}/GitAhead.iconset
install(DIRECTORY ${RSRC_DIR}/Gittyup.iconset
DESTINATION Resources
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endif()
endif()
@ -197,32 +197,32 @@ if(APPLE AND CODESIGN_IDENTITY)
"execute_process(COMMAND
codesign --deep --timestamp --options runtime
-s \"${CODESIGN_IDENTITY}\"
\${CMAKE_INSTALL_PREFIX}/${GITAHEAD_NAME}.app
\${CMAKE_INSTALL_PREFIX}/${GITTYUP_NAME}.app
)"
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endif()
# Add package rule.
if(APPLE)
set(CPACK_GENERATOR DragNDrop)
set(CPACK_DMG_VOLUME_NAME ${GITAHEAD_NAME})
set(CPACK_DMG_VOLUME_NAME ${GITTYUP_NAME})
set(CPACK_DMG_DS_STORE ${RSRC_DIR}/DS_Store)
set(CPACK_DMG_BACKGROUND_IMAGE ${RSRC_DIR}/background.png)
elseif(WIN32)
set(CPACK_GENERATOR NSIS)
set(CPACK_NSIS_CREATE_ICONS_EXTRA
"CreateShortCut \
\\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${GITAHEAD_NAME}.lnk\\\" \
\\\"$INSTDIR\\\\${GITAHEAD_NAME}.exe\\\""
\\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${GITTYUP_NAME}.lnk\\\" \
\\\"$INSTDIR\\\\${GITTYUP_NAME}.exe\\\""
)
set (CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
set (CPACK_NSIS_MUI_FINISHPAGE_RUN ${GITAHEAD_NAME}.exe)
set (CPACK_NSIS_MUI_FINISHPAGE_RUN ${GITTYUP_NAME}.exe)
if(CMAKE_CL_64)
install(FILES ${RSRC_DIR}/vcredist_x64.exe
DESTINATION .
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
"ExecWait '\\\"$INSTDIR\\\\vcredist_x64.exe\\\" /q /norestart'"
@ -231,7 +231,7 @@ elseif(WIN32)
else()
install(FILES ${RSRC_DIR}/vcredist_x86.exe
DESTINATION .
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
"ExecWait '\\\"$INSTDIR\\\\vcredist_x86.exe\\\" /q /norestart'"
@ -242,35 +242,35 @@ else()
set(CPACK_GENERATOR STGZ)
endif()
set(PACKAGE_FILE_NAME "${GITAHEAD_NAME}${PLATFORM}-${GITAHEAD_VERSION}")
set(PACKAGE_FILE_NAME "${GITTYUP_NAME}${PLATFORM}-${GITTYUP_VERSION}")
set(CPACK_MONOLITHIC_INSTALL true)
set(CPACK_INSTALL_CMAKE_PROJECTS
${CMAKE_BINARY_DIR} ${GITAHEAD_NAME} ${GITAHEAD_NAME} /
${CMAKE_BINARY_DIR} ${GITTYUP_NAME} ${GITTYUP_NAME} /
)
# Add Context Menu Shortcuts
if(WIN32)
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\GitAhead' '' 'Open with GitAhead'
WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\GitAhead' 'Icon' '\\\"$INSTDIR\\\\gitahead.exe\\\"'
WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\GitAhead\\\\command' '' '\\\"$INSTDIR\\\\gitahead.exe\\\" \\\"%V\\\"'
WriteRegStr HKCR 'Directory\\\\shell\\\\GitAhead' '' 'Open with GitAhead'
WriteRegStr HKCR 'Directory\\\\shell\\\\GitAhead' 'Icon' '\\\"$INSTDIR\\\\gitahead.exe\\\"'
WriteRegStr HKCR 'Directory\\\\shell\\\\GitAhead\\\\command' '' '\\\"$INSTDIR\\\\gitahead.exe\\\" \\\"%L\\\"'"
WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\Gittyup' '' 'Open with Gittyup'
WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\Gittyup' 'Icon' '\\\"$INSTDIR\\\\gittyup.exe\\\"'
WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\Gittyup\\\\command' '' '\\\"$INSTDIR\\\\gittyup.exe\\\" \\\"%V\\\"'
WriteRegStr HKCR 'Directory\\\\shell\\\\Gittyup' '' 'Open with Gittyup'
WriteRegStr HKCR 'Directory\\\\shell\\\\Gittyup' 'Icon' '\\\"$INSTDIR\\\\gittyup.exe\\\"'
WriteRegStr HKCR 'Directory\\\\shell\\\\Gittyup\\\\command' '' '\\\"$INSTDIR\\\\gittyup.exe\\\" \\\"%L\\\"'"
)
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}
DeleteRegKey HKCR 'Directory\\\\Background\\\\shell\\\\GitAhead'
DeleteRegKey HKCR 'Directory\\\\shell\\\\GitAhead'"
DeleteRegKey HKCR 'Directory\\\\Background\\\\shell\\\\Gittyup'
DeleteRegKey HKCR 'Directory\\\\shell\\\\Gittyup'"
)
endif(WIN32)
set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_FILE_NAME})
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${GITAHEAD_NAME})
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${GITTYUP_NAME})
set(CPACK_PACKAGE_VENDOR "Scientific Toolworks, Inc.")
set(CPACK_PACKAGE_VERSION_MAJOR ${GITAHEAD_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${GITAHEAD_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${GITAHEAD_VERSION_PATCH})
set(CPACK_PACKAGE_VERSION_MAJOR ${GITTYUP_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${GITTYUP_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${GITTYUP_VERSION_PATCH})
if(WIN32)
set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.md)
@ -288,9 +288,9 @@ if(WIN32)
${CMAKE_BINARY_DIR}/${PACKAGE_FILE_NAME}.exe
COMMAND ${CMAKE_COMMAND} -E make_directory ${PACKAGE_DIR}
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_BINARY_DIR}/GitAhead.exe ${PACKAGE_DIR}
${CMAKE_BINARY_DIR}/Gittyup.exe ${PACKAGE_DIR}
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_BINARY_DIR}/GitAhead.pdb ${PACKAGE_DIR}
${CMAKE_BINARY_DIR}/Gittyup.pdb ${PACKAGE_DIR}
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_BINARY_DIR}/indexer.exe ${PACKAGE_DIR}
COMMAND ${CMAKE_COMMAND} -E copy

View File

@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "GitAhead.ico"

1
rsrc/Gittyup.rc Normal file
View File

@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "Gittyup.ico"

View File

@ -58,13 +58,13 @@ static LONG WINAPI exceptionFilter(PEXCEPTION_POINTERS info)
GetTempPath(MAX_PATH, temp);
char dir[MAX_PATH];
StringCchPrintf(dir, MAX_PATH, "%sGitAhead", temp);
StringCchPrintf(dir, MAX_PATH, "%sGittyup", temp);
CreateDirectory(dir, NULL);
char fileName[MAX_PATH];
StringCchPrintf(fileName, MAX_PATH,
"%s\\%s-%s-%04d%02d%02d-%02d%02d%02d-%ld-%ld.dmp",
dir, GITAHEAD_NAME, GITAHEAD_VERSION,
dir, GITTYUP_NAME, GITTYUP_VERSION,
localTime.wYear, localTime.wMonth, localTime.wDay,
localTime.wHour, localTime.wMinute, localTime.wSecond,
GetCurrentProcessId(), GetCurrentThreadId());
@ -113,9 +113,9 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
{
Q_INIT_RESOURCE(resources);
setApplicationName(GITAHEAD_NAME);
setApplicationVersion(GITAHEAD_VERSION);
setOrganizationDomain("gitahead.com");
setApplicationName(GITTYUP_NAME);
setApplicationVersion(GITTYUP_VERSION);
setOrganizationDomain("gittyup.github.com");
// Register types that are queued at runtime.
qRegisterMetaType<git::Id>();
@ -126,7 +126,7 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
// Parse command line arguments.
QCommandLineParser parser;
parser.setApplicationDescription("GitAhead: Understand your history!");
parser.setApplicationDescription("Gittyup");
parser.addHelpOption();
parser.addVersionOption();
parser.addPositionalArgument(
@ -164,7 +164,7 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
// Load translation files.
QLocale locale;
QDir l10n = Settings::l10nDir();
QString name = QString(GITAHEAD_NAME).toLower();
QString name = QString(GITTYUP_NAME).toLower();
QTranslator *translator = new QTranslator(this);
if (translator->load(locale, name, "_", l10n.absolutePath())) {
installTranslator(translator);
@ -211,10 +211,10 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
#elif defined(Q_OS_LINUX)
QIcon icon;
icon.addPixmap(QPixmap(":/GitAhead.iconset/icon_16x16.png"));
icon.addPixmap(QPixmap(":/GitAhead.iconset/icon_32x32.png"));
icon.addPixmap(QPixmap(":/GitAhead.iconset/icon_64x64.png"));
icon.addPixmap(QPixmap(":/GitAhead.iconset/icon_128x128.png"));
icon.addPixmap(QPixmap(":/Gittyup.iconset/icon_16x16.png"));
icon.addPixmap(QPixmap(":/Gittyup.iconset/icon_32x32.png"));
icon.addPixmap(QPixmap(":/Gittyup.iconset/icon_64x64.png"));
icon.addPixmap(QPixmap(":/Gittyup.iconset/icon_128x128.png"));
setWindowIcon(icon);
#endif
@ -233,7 +233,7 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
// Read tracking settings.
settings.beginGroup("tracking");
QByteArray tid(GITAHEAD_TRACKING_ID);
QByteArray tid(GITTYUP_TRACKING_ID);
if (!tid.isEmpty() && settings.value("enabled", true).toBool()) {
// Get or create persistent client ID.
mClientId = settings.value("id").toString();
@ -360,16 +360,16 @@ void Application::track(const QUrlQuery &query)
QString sys = userAgentSystem();
QString language = QLocale().uiLanguages().first();
QString userAgent = kUserAgentFmt.arg(GITAHEAD_NAME, GITAHEAD_VERSION, sys);
QString userAgent = kUserAgentFmt.arg(GITTYUP_NAME, GITTYUP_VERSION, sys);
QUrlQuery tmp = query;
tmp.addQueryItem("v", "1");
tmp.addQueryItem("ds", "app");
tmp.addQueryItem("ul", language);
tmp.addQueryItem("ua", userAgent);
tmp.addQueryItem("an", GITAHEAD_NAME);
tmp.addQueryItem("av", GITAHEAD_VERSION);
tmp.addQueryItem("tid", GITAHEAD_TRACKING_ID);
tmp.addQueryItem("an", GITTYUP_NAME);
tmp.addQueryItem("av", GITTYUP_VERSION);
tmp.addQueryItem("tid", GITTYUP_TRACKING_ID);
tmp.addQueryItem("cid", mClientId);
QString header = "application/x-www-form-urlencoded";

View File

@ -2,11 +2,11 @@ set(CONF_DIR ${CMAKE_SOURCE_DIR}/conf)
set(RSRC_DIR ${CMAKE_SOURCE_DIR}/rsrc)
if(APPLE)
set(ICON ${RSRC_DIR}/GitAhead.icns)
set(ICON ${RSRC_DIR}/Gittyup.icns)
set(APP_IMPL_FILE Application_mac.mm)
set(THEME_IMPL_FILE CustomTheme_mac.mm)
elseif(WIN32)
set(RC_FILE ${RSRC_DIR}/GitAhead.rc)
set(RC_FILE ${RSRC_DIR}/Gittyup.rc)
endif()
set(EMOJI ${CONF_DIR}/emoji.json)
@ -54,10 +54,10 @@ add_library(app
target_compile_definitions(app
PUBLIC
GITAHEAD_NAME="${GITAHEAD_NAME}"
GITAHEAD_VERSION="${GITAHEAD_VERSION}"
GITTYUP_NAME="${GITTYUP_NAME}"
GITTYUP_VERSION="${GITTYUP_VERSION}"
PRIVATE
GITAHEAD_TRACKING_ID="${GITAHEAD_TRACKING_ID}"
GITTYUP_TRACKING_ID="${GITTYUP_TRACKING_ID}"
QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"
)
@ -74,8 +74,8 @@ set_target_properties(app PROPERTIES
)
# Add main executable.
add_executable(gitahead WIN32 MACOSX_BUNDLE
GitAhead.cpp
add_executable(gittyup WIN32 MACOSX_BUNDLE
Gittyup.cpp
${ICON}
${RC_FILE}
${CONFIG_FILES}
@ -91,25 +91,25 @@ add_executable(gitahead WIN32 MACOSX_BUNDLE
${PLUGIN_HTML}
)
target_link_libraries(gitahead app)
target_link_libraries(gittyup app)
set_target_properties(gitahead PROPERTIES
OUTPUT_NAME ${GITAHEAD_NAME}
set_target_properties(gittyup PROPERTIES
OUTPUT_NAME ${GITTYUP_NAME}
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
)
if(WIN32)
target_link_libraries(app Dbghelp.lib)
elseif(APPLE)
set_target_properties(gitahead PROPERTIES
set_target_properties(gittyup PROPERTIES
INSTALL_RPATH "/usr/local/qt;@loader_path/../Frameworks"
MACOSX_BUNDLE_INFO_PLIST ${RSRC_DIR}/Info.plist.in
MACOSX_BUNDLE_ICON_FILE ${GITAHEAD_NAME}
MACOSX_BUNDLE_BUNDLE_NAME ${GITAHEAD_NAME}
MACOSX_BUNDLE_BUNDLE_VERSION ${GITAHEAD_VERSION}
MACOSX_BUNDLE_LONG_VERSION_STRING ${GITAHEAD_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${GITAHEAD_VERSION}
MACOSX_BUNDLE_GUI_IDENTIFIER "com.gitahead.GitAhead"
MACOSX_BUNDLE_ICON_FILE ${GITTYUP_NAME}
MACOSX_BUNDLE_BUNDLE_NAME ${GITTYUP_NAME}
MACOSX_BUNDLE_BUNDLE_VERSION ${GITTYUP_VERSION}
MACOSX_BUNDLE_LONG_VERSION_STRING ${GITTYUP_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${GITTYUP_VERSION}
MACOSX_BUNDLE_GUI_IDENTIFIER "com.Murmele.Gittyup"
)
# Copy config files into bundle.
@ -135,17 +135,17 @@ elseif(APPLE)
MACOSX_PACKAGE_LOCATION Resources/lexers
)
else()
set_target_properties(gitahead PROPERTIES
set_target_properties(gittyup PROPERTIES
INSTALL_RPATH "$ORIGIN"
)
endif()
add_dependencies(gitahead indexer relauncher)
add_dependencies(gittyup indexer relauncher)
# Install application.
install(TARGETS gitahead
install(TARGETS gittyup
DESTINATION .
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
if(APPLE)
@ -154,7 +154,7 @@ if(APPLE)
get_filename_component(RPATH ${QT_FRAMEWORK} DIRECTORY)
# Fixup relauncher RPATH.
set(RELAUNCHER ${GITAHEAD_NAME}.app/Contents/MacOS/relauncher)
set(RELAUNCHER ${GITTYUP_NAME}.app/Contents/MacOS/relauncher)
install(CODE
"execute_process(COMMAND
${CMAKE_INSTALL_NAME_TOOL} -delete_rpath \"${RPATH}\"
@ -168,11 +168,11 @@ if(APPLE)
${CMAKE_INSTALL_NAME_TOOL} -add_rpath \"@loader_path/../Frameworks\"
\"\${CMAKE_INSTALL_PREFIX}/${RELAUNCHER}\"
)"
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
# Fixup indexer RPATH.
set(INDEXER ${GITAHEAD_NAME}.app/Contents/MacOS/indexer)
set(INDEXER ${GITTYUP_NAME}.app/Contents/MacOS/indexer)
install(CODE
"execute_process(COMMAND
${CMAKE_INSTALL_NAME_TOOL} -delete_rpath \"${RPATH}\"
@ -186,48 +186,48 @@ if(APPLE)
${CMAKE_INSTALL_NAME_TOOL} -add_rpath \"@loader_path/../Frameworks\"
\"\${CMAKE_INSTALL_PREFIX}/${INDEXER}\"
)"
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
else()
# Install config files.
if(CHANGELOG_HTML AND ACKNOWLEDGMENTS_HTML AND PRIVACY_HTML AND PLUGIN_HTML)
install(FILES ${CHANGELOG_HTML} ${ACKNOWLEDGMENTS_HTML} ${PRIVACY_HTML} ${PLUGIN_HTML}
DESTINATION Resources
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endif()
install(FILES ${EMOJI} ${MERGETOOLS}
DESTINATION Resources
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
foreach(CONFIG_FILE ${CONFIG_FILES})
install(FILES ${CONFIG_FILE}
DESTINATION Resources
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endforeach()
install(FILES ${DICTIONARIES}
DESTINATION Resources/dictionaries
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
install(FILES ${THEMES}
DESTINATION Resources/themes
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
install(FILES ${LUA_PLUGINS}
DESTINATION Resources/plugins
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
foreach(SCINTILLUA_LEXER ${SCINTILLUA_LEXERS})
install(FILES ${SCINTILLUA_LEXER}
DESTINATION Resources/lexers
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endforeach()
endif()

View File

@ -29,10 +29,10 @@
namespace {
const QString kEmail = "support@gitahead.com";
const QString kEmail = "TODO";
const QString kUrl =
"https://stackoverflow.com/questions/tagged/gitahead?sort=frequent";
"https://stackoverflow.com/questions/tagged/gittyup?sort=frequent";
const QString kSubtitleFmt =
"<h4 style='margin-top: 0px; color: gray'>%2</h4>";
@ -42,7 +42,7 @@ const QString kTextFmt =
"- %3 - %4<br>Copyright © 2016-2020 Scientific Toolworks, Inc. and "
"contributors</p><p> If you have a question that might benefit the "
"community, consider asking it on <a href='%5'>Stack Overflow</a> by "
"including 'gitahead' in the tags. Otherwise, contact us at "
"including 'gittyup' in the tags. Otherwise, contact us at "
"<a href='mailto:%6'>%6</a>";
const QString kStyleSheet =
@ -67,7 +67,7 @@ AboutDialog::AboutDialog(QWidget *parent)
setAttribute(Qt::WA_DeleteOnClose);
setWindowTitle(tr("About %1").arg(name));
QIcon icon(":/GitAhead.iconset/icon_128x128.png");
QIcon icon(":/Gittyup.iconset/icon_128x128.png");
IconLabel *iconLabel = new IconLabel(icon, 128, 128, this);
QIcon title(":/logo-type.png");
@ -83,8 +83,8 @@ AboutDialog::AboutDialog(QWidget *parent)
left->addWidget(subtitle);
left->addStretch();
QString revision = GITAHEAD_BUILD_REVISION;
QDateTime dateTime = QDateTime::fromString(GITAHEAD_BUILD_DATE, Qt::ISODate);
QString revision = GITTYUP_BUILD_REVISION;
QDateTime dateTime = QDateTime::fromString(GITTYUP_BUILD_DATE, Qt::ISODate);
QString date = dateTime.date().toString(Qt::DefaultLocaleLongDate);
QString text = kTextFmt.arg(name, version, date, revision, kUrl, kEmail);
QLabel *label = new QLabel(text, this);

View File

@ -30,8 +30,8 @@ add_library(dialogs
)
target_compile_definitions(dialogs PRIVATE
GITAHEAD_BUILD_DATE="${GITAHEAD_BUILD_DATE}"
GITAHEAD_BUILD_REVISION="${GITAHEAD_BUILD_REVISION}"
GITTYUP_BUILD_DATE="${GITTYUP_BUILD_DATE}"
GITTYUP_BUILD_REVISION="${GITTYUP_BUILD_REVISION}"
)
target_include_directories(dialogs PRIVATE

View File

@ -394,7 +394,7 @@ StartDialog::StartDialog(QWidget *parent)
setAttribute(Qt::WA_DeleteOnClose);
setWindowTitle(tr("Choose Repository"));
QIcon icon(":/GitAhead.iconset/icon_128x128.png");
QIcon icon(":/Gittyup.iconset/icon_128x128.png");
IconLabel *iconLabel = new IconLabel(icon, 128, 128, this);
QIcon title(":/logo-type.png");

View File

@ -112,7 +112,7 @@ private:
ThemeDialog::ThemeDialog(QWidget *parent)
: QDialog(parent)
{
setWindowTitle("Pick a theme for GitAhead");
setWindowTitle("Pick a theme for Gittyup");
ThemeButton *native = new ThemeButton(
tr("Native Theme"),

View File

@ -61,7 +61,7 @@ namespace git {
namespace {
const QString kConfigDir = "gitahead";
const QString kConfigDir = "gittyup";
const QString kConfigFile = "config";
const QString kStarFile = "starred";

View File

@ -14,7 +14,7 @@
namespace git {
const QString kUrl = "https://gitahead.com";
const QString kUrl = "https://github.com/Murmele/Gittyup";
Submodule::Submodule() {}

View File

@ -122,7 +122,7 @@ GitHub::GitHub(const QString &username)
// Read images.
QString icon;
QFile iconFile(":/GitAhead.iconset/icon_64x64.png");
QFile iconFile(":/Gittyup.iconset/icon_64x64.png");
if (iconFile.open(QFile::ReadOnly))
icon = iconFile.readAll().toBase64();
@ -366,7 +366,7 @@ bool GitHub::isAuthorizeSupported()
{
QByteArray id(GITHUB_CLIENT_ID);
QByteArray secret(GITHUB_CLIENT_SECRET);
QByteArray env = qgetenv("GITAHEAD_OAUTH");
QByteArray env = qgetenv("GITTYUP_OAUTH");
return (!id.isEmpty() && !secret.isEmpty() && !env.isEmpty());
}

View File

@ -27,11 +27,11 @@ target_link_libraries(index_test index Qt5::Widgets)
add_executable(indexer indexer.cpp)
target_link_libraries(indexer index)
target_compile_definitions(indexer PRIVATE
GITAHEAD_VERSION="${GITAHEAD_VERSION}"
GITTYUP_VERSION="${GITTYUP_VERSION}"
)
set_target_properties(indexer PROPERTIES
RUNTIME_OUTPUT_DIRECTORY $<TARGET_FILE_DIR:gitahead>
RUNTIME_OUTPUT_DIRECTORY $<TARGET_FILE_DIR:gittyup>
)
if(APPLE)
@ -49,6 +49,6 @@ else()
install(TARGETS indexer
DESTINATION .
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endif()

View File

@ -57,13 +57,13 @@ static LONG WINAPI exceptionFilter(PEXCEPTION_POINTERS info)
GetTempPath(MAX_PATH, temp);
char dir[MAX_PATH];
StringCchPrintf(dir, MAX_PATH, "%sGitAhead", temp);
StringCchPrintf(dir, MAX_PATH, "%sGittyup", temp);
CreateDirectory(dir, NULL);
char fileName[MAX_PATH];
StringCchPrintf(fileName, MAX_PATH,
"%s\\%s-%s-%04d%02d%02d-%02d%02d%02d-%ld-%ld.dmp",
dir, "indexer", GITAHEAD_VERSION,
dir, "indexer", GITTYUP_VERSION,
localTime.wYear, localTime.wMonth, localTime.wDay,
localTime.wHour, localTime.wMinute, localTime.wSecond,
GetCurrentProcessId(), GetCurrentThreadId());

View File

@ -185,7 +185,7 @@ RepoView::RepoView(const git::Repository &repo, MainWindow *parent)
if (status == QProcess::CrashExit) {
QString text =
tr("The indexer worker process crashed. If this problem "
"persists please contact us at support@gitahead.com.");
"persists please contact us at <TODO: replace.support@gitahead.com>.");
addLogEntry(text, tr("Indexer Crashed"));
}

View File

@ -26,8 +26,8 @@
namespace {
const QString kLinkFmt = "<a href='%1'>%2</a>";
const QString kSupportLink = "mailto:support@gitahead.com";
const QString kVideoLink = "https://gitahead.com/#tutorials";
const QString kSupportLink = "<TODO: replace mail. mailto:support@gitahead.com";
const QString kVideoLink = "TODO";
class DefaultWidget : public QFrame
{

View File

@ -858,7 +858,7 @@ ToolBar::ToolBar(MainWindow *parent)
currentView()->refresh();
});
if (!qgetenv("GITAHEAD_OAUTH").isEmpty()) {
if (!qgetenv("GITTYUP_OAUTH").isEmpty()) {
addWidget(new Spacer(4, this));
mPullRequestButton = new PullRequestButton(this);

View File

@ -29,7 +29,7 @@ add_executable(relauncher relauncher.cpp)
target_link_libraries(relauncher Qt5::Core)
set_target_properties(relauncher PROPERTIES
RUNTIME_OUTPUT_DIRECTORY $<TARGET_FILE_DIR:gitahead>
RUNTIME_OUTPUT_DIRECTORY $<TARGET_FILE_DIR:gittyup>
)
if(APPLE)
@ -43,6 +43,6 @@ elseif(UNIX)
install(TARGETS relauncher
DESTINATION .
COMPONENT ${GITAHEAD_NAME}
COMPONENT ${GITTYUP_NAME}
)
endif()

View File

@ -26,7 +26,7 @@ DownloadDialog::DownloadDialog(
setAttribute(Qt::WA_DeleteOnClose);
setWindowTitle(tr("Update %1").arg(QCoreApplication::applicationName()));
QIcon icon(":/GitAhead.iconset/icon_128x128.png");
QIcon icon(":/Gittyup.iconset/icon_128x128.png");
IconLabel *iconLabel = new IconLabel(icon, 64, 64, this);
QVBoxLayout *iconLayout = new QVBoxLayout;

View File

@ -20,7 +20,7 @@ UpToDateDialog::UpToDateDialog(QWidget *parent)
{
setWindowTitle(tr("Already Up-to-date"));
QIcon icon(":/GitAhead.iconset/icon_128x128.png");
QIcon icon(":/Gittyup.iconset/icon_128x128.png");
IconLabel *iconLabel = new IconLabel(icon, 64, 64, this);
QVBoxLayout *iconLayout = new QVBoxLayout;

View File

@ -45,7 +45,7 @@ UpdateDialog::UpdateDialog(
setAttribute(Qt::WA_DeleteOnClose);
setWindowTitle(tr("Update %1").arg(appName));
QIcon icon(":/GitAhead.iconset/icon_128x128.png");
QIcon icon(":/Gittyup.iconset/icon_128x128.png");
IconLabel *iconLabel = new IconLabel(icon, 128, 128, this);
QVBoxLayout *iconLayout = new QVBoxLayout;

View File

@ -44,9 +44,9 @@ namespace {
const QString kTemplateFmt = "%1-XXXXXX.%2";
const QString kLinkFmt =
"https://github.com/gitahead/gitahead/releases/download/v%1/GitAhead%2-%3.%4";
"TODO: replace by release link<https://github.com/gitahead/gitahead/releases/download/v%1/GitAhead%2-%3.%4>";
const QString kChangelogUrl =
"https://raw.githubusercontent.com/gitahead/gitahead/master/doc/changelog.md";
"https://raw.githubusercontent.com/Murmele/gittyup/master/doc/changelog.md";
} // anon. namespace

View File

@ -21,8 +21,8 @@ private slots:
void TestSanity::sanity()
{
QCOMPARE(QCoreApplication::applicationName(), QString(GITAHEAD_NAME));
QCOMPARE(QCoreApplication::applicationVersion(), QString(GITAHEAD_VERSION));
QCOMPARE(QCoreApplication::applicationName(), QString(GITTYUP_NAME));
QCOMPARE(QCoreApplication::applicationVersion(), QString(GITTYUP_VERSION));
}
TEST_MAIN(TestSanity)