rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:royqh1979/RedPanda-CPP

This commit is contained in:
Roy Qu 2023-09-27 13:57:47 +08:00
parent 039ca4ce9e ca13548ba0
commit 02a0ed049b
11 changed files with 42 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RedPandaIDE/compiler/compilermanager.cpp
View File

@ -325,7 +325,7 @@ void CompilerManager::run(
} + splitProcessCommand(arguments);
}
auto [filename, args, fileOwner] = wrapCommandForTerminalEmulator(
pSettings->environment().terminalPathForExec(),
pSettings->environment().terminalPath(),
pSettings->environment().terminalArgumentsPattern(),
execArgs
);

2
RedPandaIDE/debugger.cpp
View File

@ -3068,7 +3068,7 @@ void DebugTarget::run()
cmd= mGDBServer;
arguments = QString(" localhost:%1 \"%2\" %3").arg(mPort).arg(mInferior,mArguments);
#else
cmd= pSettings->environment().terminalPathForExec();
cmd= pSettings->environment().terminalPath();
arguments = QString(" -e \"%1\" localhost:%2 \"%3\"").arg(mGDBServer).arg(mPort).arg(mInferior);
#endif
QString workingDir = QFileInfo(mInferior).path();

6
RedPandaIDE/mainwindow.cpp
View File

@ -4680,7 +4680,7 @@ void MainWindow::onFilesViewOpenInTerminal()
#ifdef Q_OS_WIN
openShell(fileInfo.path(),"cmd.exe",getDefaultCompilerSetBinDirs());
#else
openShell(fileInfo.path(),pSettings->environment().terminalPathForExec(),getDefaultCompilerSetBinDirs());
openShell(fileInfo.path(),pSettings->environment().terminalPath(),getDefaultCompilerSetBinDirs());
#endif
}
}
@ -6888,7 +6888,7 @@ void MainWindow::on_actionOpen_Terminal_triggered()
#ifdef Q_OS_WIN
openShell(info.path(),"cmd.exe",getBinDirsForCurrentEditor());
#else
openShell(info.path(),pSettings->environment().terminalPathForExec(),getBinDirsForCurrentEditor());
openShell(info.path(),pSettings->environment().terminalPath(),getBinDirsForCurrentEditor());
#endif
}
}
@ -7225,7 +7225,7 @@ void MainWindow::on_actionProject_Open_In_Terminal_triggered()
#ifdef Q_OS_WIN
openShell(mProject->directory(),"cmd.exe",mProject->binDirs());
#else
openShell(mProject->directory(),pSettings->environment().terminalPathForExec(),mProject->binDirs());
openShell(mProject->directory(),pSettings->environment().terminalPath(),mProject->binDirs());
#endif
}

10
RedPandaIDE/resources/terminal-unix.json
View File

@ -125,16 +125,6 @@
}
]
},
{
"group": "Bundled",
"terminals": [
{
"name": "Alacritty (Bundled)",
"path": "./alacritty",
"argsPattern": "$term -e $argv"
}
]
},
{
"group": "With minor issue",
"terminals": [

3
RedPandaIDE/resources/terminal-windows.json
View File

@ -1,10 +1,11 @@
[
{
"group": "Bundled",
"comment": "Use `%*APP_DIR*%` in path for application directory.",
"terminals": [
{
"name": "UTF-8 compatible Console Host",
"path": "%*APP_DIR*%/OpenConsole.exe",
"path": "OpenConsole.exe",
"argsPattern": "$term -- $argv"
}
]

11
RedPandaIDE/settings.cpp
View File

@ -3628,7 +3628,11 @@ void Settings::Environment::doLoad()
// check saved terminal path
mTerminalPath = stringValue("terminal_path", "");
#ifdef Q_OS_WINDOWS
// APP_DIR trick for windows portable app
// on other platforms multiple instances share the same configuration and thus the trick may break terminal path
mTerminalPath.replace("%*APP_DIR*%",pSettings->dirs().appDir());
#endif
mTerminalArgumentsPattern = stringValue("terminal_arguments_pattern", "");
checkAndSetTerminal();
@ -3804,6 +3808,7 @@ void Settings::Environment::checkAndSetTerminal()
if(fileExists(absoluteTerminalPath)) {
mTerminalPath = absoluteTerminalPath;
mTerminalArgumentsPattern = termItem.param;
return;
}
} else {
for (const QString &dirPath: pathList) {
@ -3812,7 +3817,7 @@ void Settings::Environment::checkAndSetTerminal()
if(fileExists(absoluteTerminalPath)) {
mTerminalPath = absoluteTerminalPath;
mTerminalArgumentsPattern = termItem.param;
break;
return;
}
}
}
@ -3902,9 +3907,13 @@ void Settings::Environment::doSave()
saveValue("current_folder",mCurrentFolder);
saveValue("default_open_folder",mDefaultOpenFolder);
QString terminalPath = mTerminalPath;
#ifdef Q_OS_WINDOWS
// APP_DIR trick for windows portable app
// on other platforms multiple instances share the same configuration and thus the trick may break terminal path
if (terminalPath.startsWith(pSettings->dirs().appDir())) {
terminalPath="%*APP_DIR*%"+terminalPath.mid(pSettings->dirs().appDir().length());
}
#endif
saveValue("terminal_path",terminalPath);
saveValue("terminal_arguments_pattern",mTerminalArgumentsPattern);

25
RedPandaIDE/utils.cpp
View File

@ -595,7 +595,32 @@ QStringList getExecutableSearchPaths()
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QString path = env.value("PATH");
QStringList pathList = path.split(PATH_SEPARATOR);
#ifdef Q_OS_WINDOWS
/* follow Windows `CreateProcessW` search semantics.
* ref. https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-createprocessw .
*/
QStringList searchList{};
wchar_t buffer[MAX_PATH];
// 1. the directory from which the application loaded
searchList.push_back(QApplication::instance()->applicationDirPath());
// 2. the current directory for the parent process
// here we add it because launching from GUI the current directory is relatively stable
searchList.push_back(QDir::currentPath());
// 3. the 32-bit Windows system directory
if (GetSystemDirectoryW(buffer, MAX_PATH) > 0)
searchList.push_back(QString::fromWCharArray(buffer));
if (GetWindowsDirectoryW(buffer, MAX_PATH) > 0) {
// 4. the 16-bit Windows system directory
searchList.push_back(QString::fromWCharArray(buffer) + "/System");
// 5. the Windows directory
searchList.push_back(QString::fromWCharArray(buffer));
}
// 6. the directories that are listed in the PATH environment variable
searchList.append(pathList);
return searchList;
#else
return pathList;
#endif
}
QString escapeArgument(const QString &arg, [[maybe_unused]] bool isFirstArg)

3
packages/appimage/01-in-docker.sh
View File

@ -24,9 +24,6 @@ ln -s usr/share/icons/hicolor/scalable/apps/redpandaide.svg redpandaide.svg
install -m755 /build/RedPanda-CPP/packages/appimage/AppRun.sh AppRun
install -m644 /build/RedPanda-CPP/platform/linux/redpandaide.png .DirIcon
# copy dependency
cp /usr/local/bin/alacritty usr/bin
# create AppImage
cd /build
mksquashfs RedPandaIDE.AppDir $APPIMAGE_FILE -offset $RUNTIME_SIZE -comp zstd -root-owned -noappend -b 1M -mkfs-time 0

16
packages/appimage/dockerfile-aarch64/Dockerfile
View File

@ -86,19 +86,3 @@ RUN mkdir -p /build/qt5 && \
# cleanup
cd / && \
rm -r /build/qt5
# Alacritty
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain 1.71.1 && \
. ~/.cargo/env && \
mkdir -p /build/alacritty && \
cd /build/alacritty && \
curl -L -o alacritty-${ALACRITTY_VERSION}.tar.gz "https://github.com/alacritty/alacritty/archive/refs/tags/v${ALACRITTY_VERSION}.tar.gz" && \
tar xf alacritty-${ALACRITTY_VERSION}.tar.gz && \
cd alacritty-${ALACRITTY_VERSION} && \
echo -e '[profile.minsize]\ninherits="release"\ndebug=false\nstrip=true\nopt-level="s"' >>Cargo.toml && \
cargo build --profile minsize && \
cp target/minsize/alacritty /usr/local/bin && \
# cleanup
cd / && \
rm -r /build/alacritty && \
rustup self uninstall -y

16
packages/appimage/dockerfile-riscv64/Dockerfile
View File

@ -68,19 +68,3 @@ RUN mkdir -p /build/qt5 && \
# cleanup
cd / && \
rm -r /build/qt5
# Alacritty
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain 1.71.1 && \
. ~/.cargo/env && \
mkdir -p /build/alacritty && \
cd /build/alacritty && \
curl -L -o alacritty-${ALACRITTY_VERSION}.tar.gz "https://github.com/alacritty/alacritty/archive/refs/tags/v${ALACRITTY_VERSION}.tar.gz" && \
tar xf alacritty-${ALACRITTY_VERSION}.tar.gz && \
cd alacritty-${ALACRITTY_VERSION} && \
/bin/echo -e '[profile.minsize]\ninherits="release"\ndebug=false\nstrip=true\nopt-level="s"' >>Cargo.toml && \
cargo build --profile minsize && \
cp target/minsize/alacritty /usr/local/bin && \
# cleanup
cd / && \
rm -r /build/alacritty && \
rustup self uninstall -y

17
packages/appimage/dockerfile-x86_64/Dockerfile
View File

@ -83,20 +83,3 @@ RUN mkdir -p /build/qt5 && \
# cleanup
cd / && \
rm -r /build/qt5
# Alacritty
RUN yum install -y cargo && \
mkdir -p /build/alacritty && \
cd /build/alacritty && \
curl -L -o alacritty-${ALACRITTY_VERSION}.tar.gz "https://github.com/alacritty/alacritty/archive/refs/tags/v${ALACRITTY_VERSION}.tar.gz" && \
tar xf alacritty-${ALACRITTY_VERSION}.tar.gz && \
cd alacritty-${ALACRITTY_VERSION} && \
echo -e '[profile.minsize]\ninherits="release"\ndebug=false\nstrip=true\nopt-level="s"' >>Cargo.toml && \
cargo build --profile minsize && \
cp target/minsize/alacritty /usr/local/bin && \
# cleanup
cd / && \
rm -r /build/alacritty && \
yum autoremove -y cargo && \
yum clean all && \
rm -r ~/.cargo