mirror of
https://github.com/Murmele/Gittyup.git
synced 2024-09-11 02:35:41 +03:00
Use official name for macOS
This commit is contained in:
parent
57d7aff03c
commit
db6ce24fe8
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
@ -126,7 +126,7 @@ jobs:
|
|||||||
cmake_flags: "-DGENERATE_APPDATA=ON"
|
cmake_flags: "-DGENERATE_APPDATA=ON"
|
||||||
cmake_env: {}
|
cmake_env: {}
|
||||||
|
|
||||||
- name: mac
|
- name: macos
|
||||||
os: macos-latest
|
os: macos-latest
|
||||||
ninja_platform: mac
|
ninja_platform: mac
|
||||||
qt_platform: mac
|
qt_platform: mac
|
||||||
@ -232,21 +232,21 @@ jobs:
|
|||||||
if: matrix.env.ninja_platform == 'win'
|
if: matrix.env.ninja_platform == 'win'
|
||||||
uses: ilammy/setup-nasm@v1.2.0
|
uses: ilammy/setup-nasm@v1.2.0
|
||||||
|
|
||||||
- name: Build OpenSSL (linux)
|
- name: Build OpenSSL (Linux)
|
||||||
if: matrix.env.ninja_platform == 'linux'
|
if: matrix.env.ninja_platform == 'linux'
|
||||||
run: |
|
run: |
|
||||||
cd dep/openssl/openssl
|
cd dep/openssl/openssl
|
||||||
./config -fPIC
|
./config -fPIC
|
||||||
make
|
make
|
||||||
|
|
||||||
- name: Build OpenSSL (mac)
|
- name: Build OpenSSL (macOS)
|
||||||
if: matrix.env.ninja_platform == 'mac'
|
if: matrix.env.ninja_platform == 'mac'
|
||||||
run: |
|
run: |
|
||||||
cd dep/openssl/openssl
|
cd dep/openssl/openssl
|
||||||
./Configure ${{ matrix.env.openssl_arch }} no-shared
|
./Configure ${{ matrix.env.openssl_arch }} no-shared
|
||||||
make
|
make
|
||||||
|
|
||||||
- name: Build OpenSSL (win)
|
- name: Build OpenSSL (Windows)
|
||||||
if: matrix.env.ninja_platform == 'win'
|
if: matrix.env.ninja_platform == 'win'
|
||||||
run: |
|
run: |
|
||||||
cd dep/openssl/openssl
|
cd dep/openssl/openssl
|
||||||
@ -370,7 +370,7 @@ jobs:
|
|||||||
files: |
|
files: |
|
||||||
**/artifacts/Gittyup win64/Gittyup*.exe
|
**/artifacts/Gittyup win64/Gittyup*.exe
|
||||||
**/artifacts/Gittyup win32/Gittyup*.exe
|
**/artifacts/Gittyup win32/Gittyup*.exe
|
||||||
**/artifacts/Gittyup mac/Gittyup*.dmg
|
**/artifacts/Gittyup macos/Gittyup*.dmg
|
||||||
**/artifacts/Gittyup Flatpak/com.github.Murmele.Gittyup.yml
|
**/artifacts/Gittyup Flatpak/com.github.Murmele.Gittyup.yml
|
||||||
**/Gittyup-x86_64/*.flatpak
|
**/Gittyup-x86_64/*.flatpak
|
||||||
|
|
||||||
|
@ -76,12 +76,12 @@ How to Build
|
|||||||
# Start from root of gittyup repo.
|
# Start from root of gittyup repo.
|
||||||
cd dep/openssl/openssl
|
cd dep/openssl/openssl
|
||||||
|
|
||||||
Win:
|
Windows:
|
||||||
|
|
||||||
perl Configure VC-WIN64A
|
perl Configure VC-WIN64A
|
||||||
nmake
|
nmake
|
||||||
|
|
||||||
Mac:
|
macOS:
|
||||||
|
|
||||||
./Configure darwin64-x86_64-cc no-shared
|
./Configure darwin64-x86_64-cc no-shared
|
||||||
make
|
make
|
||||||
|
@ -5,7 +5,7 @@ Bug fix release
|
|||||||
#### Added
|
#### Added
|
||||||
* Distinguish between commit author and committer
|
* Distinguish between commit author and committer
|
||||||
* Show image preview also for deleted files
|
* Show image preview also for deleted files
|
||||||
* Official macOS X release
|
* Official macOS release
|
||||||
|
|
||||||
#### Changed
|
#### Changed
|
||||||
* Fix single line staging if not all hunks are loaded
|
* Fix single line staging if not all hunks are loaded
|
||||||
|
@ -10,7 +10,7 @@ The release version is available for
|
|||||||
The [development version](https://github.com/Murmele/Gittyup/releases) is available either as pre-built for
|
The [development version](https://github.com/Murmele/Gittyup/releases) is available either as pre-built for
|
||||||
- [flatpak for Linux](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup.flatpak),
|
- [flatpak for Linux](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup.flatpak),
|
||||||
- [32](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup-win32-1.1.0-dev.exe) / [64](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup-win64-1.1.0-dev.exe) binary for Windows,
|
- [32](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup-win32-1.1.0-dev.exe) / [64](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup-win64-1.1.0-dev.exe) binary for Windows,
|
||||||
- [macOS X](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup-1.1.0-dev.dmg)
|
- [macOS](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup-1.1.0-dev.dmg)
|
||||||
|
|
||||||
or, can be built from source by following the directions in the [Gittyup Repository](https://github.com/Murmele/Gittyup#how-to-build).
|
or, can be built from source by following the directions in the [Gittyup Repository](https://github.com/Murmele/Gittyup#how-to-build).
|
||||||
|
|
||||||
|
@ -200,7 +200,7 @@ if(NOT APPLE)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Sign bundle on Mac.
|
# Sign bundle on macOS.
|
||||||
if(APPLE AND CODESIGN_IDENTITY)
|
if(APPLE AND CODESIGN_IDENTITY)
|
||||||
install(
|
install(
|
||||||
CODE "execute_process(COMMAND
|
CODE "execute_process(COMMAND
|
||||||
|
@ -187,7 +187,7 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
|
|||||||
|
|
||||||
// Do platform-specific initialization.
|
// Do platform-specific initialization.
|
||||||
#if defined(Q_OS_MAC)
|
#if defined(Q_OS_MAC)
|
||||||
// Register service on Mac.
|
// Register service on macOS.
|
||||||
registerService();
|
registerService();
|
||||||
|
|
||||||
// Load SF Mono font from Terminal.app.
|
// Load SF Mono font from Terminal.app.
|
||||||
@ -198,7 +198,7 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
|
|||||||
foreach (const QString &name, dir.entryList({"SF*Mono-*.otf"}, QDir::Files))
|
foreach (const QString &name, dir.entryList({"SF*Mono-*.otf"}, QDir::Files))
|
||||||
QFontDatabase::addApplicationFont(dir.filePath(name));
|
QFontDatabase::addApplicationFont(dir.filePath(name));
|
||||||
|
|
||||||
// Create shared menu bar on Mac.
|
// Create shared menu bar on macOS.
|
||||||
(void)MenuBar::instance(nullptr);
|
(void)MenuBar::instance(nullptr);
|
||||||
|
|
||||||
#elif defined(Q_OS_WIN)
|
#elif defined(Q_OS_WIN)
|
||||||
|
@ -168,7 +168,7 @@ void ScintillaQt::paintEvent(QPaintEvent *event) {
|
|||||||
|
|
||||||
if (paintState == paintAbandoned) {
|
if (paintState == paintAbandoned) {
|
||||||
// FIXME: Failure to paint the requested rectangle in each
|
// FIXME: Failure to paint the requested rectangle in each
|
||||||
// paint event causes flicker on some platforms (Mac?)
|
// paint event causes flicker on some platforms (macOS?)
|
||||||
// Paint rect immediately.
|
// Paint rect immediately.
|
||||||
paintState = painting;
|
paintState = painting;
|
||||||
paintingAllText = true;
|
paintingAllText = true;
|
||||||
@ -318,9 +318,9 @@ void ScintillaQt::keyPressEvent(QKeyEvent *event) {
|
|||||||
// it was pressed in conjunction with alt for AltGr emulation.
|
// it was pressed in conjunction with alt for AltGr emulation.
|
||||||
bool input = (!ctrl || alt);
|
bool input = (!ctrl || alt);
|
||||||
|
|
||||||
// Additionally, on non-mac platforms, don't insert text
|
// Additionally, on non-macOS platforms, don't insert text
|
||||||
// if the alt key was pressed unless control is also present.
|
// if the alt key was pressed unless control is also present.
|
||||||
// On mac alt can be used to insert special characters.
|
// On macOS alt can be used to insert special characters.
|
||||||
#ifndef Q_OS_MAC
|
#ifndef Q_OS_MAC
|
||||||
input &= (!alt || ctrl);
|
input &= (!alt || ctrl);
|
||||||
#endif
|
#endif
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include <QVersionNumber>
|
#include <QVersionNumber>
|
||||||
|
|
||||||
#if defined(Q_OS_MAC)
|
#if defined(Q_OS_MAC)
|
||||||
#define PLATFORM "mac"
|
#define PLATFORM "macos"
|
||||||
#elif defined(Q_OS_WIN)
|
#elif defined(Q_OS_WIN)
|
||||||
#if defined(Q_OS_WIN64)
|
#if defined(Q_OS_WIN64)
|
||||||
#define PLATFORM "win64"
|
#define PLATFORM "win64"
|
||||||
@ -163,7 +163,7 @@ void Updater::update(bool spontaneous) {
|
|||||||
// The bundle does not have any version in its filename
|
// The bundle does not have any version in its filename
|
||||||
QString link = kLinkFmt.arg(platformArg, "", extension);
|
QString link = kLinkFmt.arg(platformArg, "", extension);
|
||||||
#else
|
#else
|
||||||
if (platform == "mac") {
|
if (platform == "macos") {
|
||||||
extension = "dmg";
|
extension = "dmg";
|
||||||
} else if (platform.startsWith("win")) {
|
} else if (platform.startsWith("win")) {
|
||||||
platformArg = QString("-%1").arg(platform);
|
platformArg = QString("-%1").arg(platform);
|
||||||
|
@ -58,7 +58,7 @@ void TestEditor::copyPaste() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void TestEditor::find() {
|
void TestEditor::find() {
|
||||||
// It's difficult to trigger the shortcut on Mac.
|
// It's difficult to trigger the shortcut on macOS.
|
||||||
MenuBar *menuBar = MenuBar::instance(mWindow);
|
MenuBar *menuBar = MenuBar::instance(mWindow);
|
||||||
QAction *findAction = menuBar->findChild<QAction *>("Find");
|
QAction *findAction = menuBar->findChild<QAction *>("Find");
|
||||||
QVERIFY(findAction);
|
QVERIFY(findAction);
|
||||||
|
Loading…
Reference in New Issue
Block a user