github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

IDE changes for Flatpak sandbox (#177)

Browse source 
ide: Flatpak support
This commit is contained in:
Zbigniew Rębacz 2023-12-20 11:05:00 +01:00 • committed by GitHub
parent 9a5557e9f2
commit e65af45fa8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 90 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/Core/config.h
View file

@ -147,6 +147,10 @@
#endif
#endif
#ifdef flagFlatpak
#define FLATPAK 1
#endif
#ifdef _MSC_VER
#define COMPILER_MSC 1
#if _MSC_VER <= 1300

3
uppsrc/ide/About.cpp
View file

@ -52,6 +52,9 @@ String SplashCtrl::GenerateVersionInfo(char separator)
#ifdef GUI_GTK
h << " (Gtk)";
#endif
#ifdef FLATPAK
h << " (Flatpak)";
#endif
h << separator;
#ifdef bmTIME

4
uppsrc/ide/Builders/GccBuilder.cpp
View file

@ -16,7 +16,7 @@ String GccBuilder::CmdLine(const String& package, const Package& pkg)
String cc = CompilerName();
cc << " -c";
for(String s : pkg_config)
cc << " `pkg-config --cflags " << s << "`";
cc << " `" << Host::CMDLINE_PREFIX << "pkg-config --cflags " << s << "`";
cc << ' ' << IncludesDefinesTargetTime(package, pkg);
return cc;
}
@ -558,7 +558,7 @@ bool GccBuilder::Link(const Vector<String>& linkfile, const String& linkoptions,
if(!HasFlag("SOLARIS") && !HasFlag("OSX") && !HasFlag("OBJC"))
lnk << " -Wl,--start-group ";
for(String s : pkg_config)
lnk << " `pkg-config --libs " << s << "`";
lnk << " `" << Host::CMDLINE_PREFIX << "pkg-config --libs " << s << "`";
for(int pass = 0; pass < 2; pass++) {
for(i = 0; i < lib.GetCount(); i++) {
String ln = lib[i];

6
uppsrc/ide/Builders/Install.cpp
View file

@ -172,7 +172,7 @@ void CreateBuildMethods()
SaveFile(bm_path, bm);
}
#else
bool openbsd = ToLower(Sys("uname")).Find("openbsd") >= 0;
bool openbsd = ToLower(Sys(Host::CMDLINE_PREFIX + "uname")).Find("openbsd") >= 0;
auto Fix = [=](const char *s) {
String r = s;
if(openbsd) {
@ -185,8 +185,8 @@ void CreateBuildMethods()
String bm = ConfigFile("GCC.bm");
if(IsNull(LoadFile(bm)))
SaveFile(bm, Fix(gcc_bm));
if(Sys("clang --version").GetCount()) {
if(Sys(Host::CMDLINE_PREFIX + "clang --version").GetCount()) {
String bm = ConfigFile("CLANG.bm");
if(IsNull(LoadFile(bm)))
SaveFile(bm, Fix(clang_bm));

2
uppsrc/ide/Common/Util.cpp
View file

@ -248,7 +248,7 @@ bool CopyFolder(const char *dst, const char *src, Progress *pi)
bool HasSvn()
{
String dummy;
static bool b = Sys("svn", dummy) >= 0;
static bool b = HostSys("svn", dummy) >= 0;
return b;
}

9
uppsrc/ide/Console.cpp
View file

@ -225,7 +225,9 @@ int Console::Execute(const char *command, Stream *out, const char *envptr, bool
try {
Wait();
One<AProcess> p;
if(p.Create<LocalProcess>().ConvertCharset(!noconvert).Start(command, envptr))
if(p.Create<LocalProcess>()
.ConvertCharset(!noconvert)
.Start(Host::CMDLINE_PREFIX + command, envptr))
return Execute(pick(p), command, out, q);
}
catch(Exc e) {
@ -258,7 +260,8 @@ bool Console::Run(const char *cmdline, Stream *out, const char *envptr, bool qui
Wait(slot);
One<AProcess> sproc;
LLOG("Run " << sCmdLine(cmdline) << " in slot " << slot);
return sproc.Create<LocalProcess>().Start(cmdline, envptr) &&
return sproc.Create<LocalProcess>().Start(Host::CMDLINE_PREFIX + cmdline,
envptr) &&
Run(pick(sproc), cmdline, out, quiet, slot, key, blitz_count);
}
catch(Exc e) {
@ -281,7 +284,7 @@ bool Console::Run(One<AProcess> pick_ process, const char *cmdline, Stream *out,
Wait(slot);
Slot& pslot = processes[slot];
pslot.process = pick(process);
pslot.cmdline = cmdline;
pslot.cmdline = Host::CMDLINE_PREFIX + cmdline;
pslot.outfile = out;
pslot.output = Null;
pslot.quiet = quiet;

39
uppsrc/ide/Core/Host.cpp
View file

@ -5,9 +5,11 @@
#define LLOG(x)
#define METHOD_NAME "Host::" << UPP_FUNCTION_NAME << "(): "
Host::Host()
{
}
#ifdef FLATPAK
const String Host::CMDLINE_PREFIX = "host-spawn --no-pty ";
#else
const String Host::CMDLINE_PREFIX = "";
#endif
String Host::GetEnvironment()
{
@ -49,7 +51,7 @@ void Host::ChDir(const String& path)
SetCurrentDirectory(path);
#endif
#ifdef PLATFORM_POSIX
IGNORE_RESULT( chdir(path) );
IGNORE_RESULT(chdir(path));
#endif
if(cmdout)
*cmdout << "cd \"" << path << "\"\n";
@ -134,7 +136,7 @@ bool Host::StartProcess(LocalProcess& p, const char *cmdline)
try {
if(canlog) Log(cmdline);
p.NoConvertCharset();
if(p.Start(FindCommand(exedirs, cmdline), environment))
if(p.Start(FindCommand(exedirs, CMDLINE_PREFIX + cmdline), environment))
return true;
}
catch(...) {
@ -196,14 +198,25 @@ String ResolveHostConsole()
"/usr/local/bin/xterm -e",
};
#else
static const char *term[] = {
"/usr/bin/mate-terminal -x",
"/usr/bin/gnome-terminal --window -x",
"/usr/bin/konsole -e",
"/usr/bin/lxterminal -e",
"/usr/bin/io.elementary.terminal -n -x",
"/usr/bin/xterm -e",
};
#ifdef FLATPAK
static const char *term[] = {
"/run/host/bin/mate-terminal -x",
"/run/host/bin/gnome-terminal --window -x",
"/run/host/bin/konsole -e",
"/run/host/bin/lxterminal -e",
"/run/host/bin/io.elementary.terminal -n -x",
"/run/host/bin/xterm -e",
};
#else
static const char *term[] = {
"/usr/bin/mate-terminal -x",
"/usr/bin/gnome-terminal --window -x",
"/usr/bin/konsole -e",
"/usr/bin/lxterminal -e",
"/usr/bin/io.elementary.terminal -n -x",
"/usr/bin/xterm -e",
};
#endif
#endif
int ii = 0;
for(;;) { // If (pre)defined terminal emulator is not available, try to find one

13
uppsrc/ide/Core/Host.h
View file

@ -4,22 +4,25 @@ extern String HostConsole;
void AddHostFlags(Index<String>& cfg);
struct Host {
class Host {
public:
struct FileInfo : Time, Moveable<FileInfo> {
int length;
};
public:
static const String CMDLINE_PREFIX;
Vector<String> exedirs;
String environment;
String *cmdout;
bool canlog = true; // it does PutVerbose for commands
public:
void DoDir(const String& s);
Host();
void Log(const String& s) { if(canlog) PutVerbose(s); }
String GetEnvironment();

5
uppsrc/ide/Debuggers/Gdb.cpp
View file

@ -599,9 +599,10 @@ bool Gdb::Create(Host& host, const String& exefile, const String& cmdline, bool
#ifdef PLATFORM_POSIX
#ifndef PLATFORM_MACOS
IGNORE_RESULT(system("setxkbmap -option grab:break_actions")); // to be able to recover capture in breakpoint
IGNORE_RESULT(HostSys("setxkbmap -option grab:break_actions")); // to be able to recover capture in breakpoint
String xdotool_chk = ConfigFile("xdotool_chk");
if(!FileExists(xdotool_chk) && system("xdotool key XF86Ungrab")) {
String out;
if(!FileExists(xdotool_chk) && HostSys("xdotool key XF86Ungrab", out)) {
Exclamation("[* xdotool] utility is not installed or does not work properly.&"
"Debugger will be unable to ungrab debugee's mouse capture - "
"mouse might become unusable when debugee stops.");

2
uppsrc/ide/Debuggers/GdbCmd.cpp
View file

@ -161,7 +161,7 @@ String Gdb::Cmd(const char *command, bool start)
PutVerbose(result);
PutVerbose("===================");
#ifdef PLATFORM_POSIX
system("xdotool key XF86Ungrab"); // force X11 to relese the mouse capture
HostSys("xdotool key XF86Ungrab"); // force X11 to relese the mouse capture
#endif
return result;
}

4
uppsrc/ide/Install.cpp
View file

@ -85,6 +85,10 @@ bool Install(bool& hasvars)
#ifdef PLATFORM_COCOA
Scan(idir + "/uppsrc");
Scan(idir + "/*");
#endif
#ifdef FLATPAK
Scan(GetHomeDirFile("/.local/src/upp/uppsrc"));
Scan(GetHomeDirFile("/.local/src/upp/*"));
#endif
Scan(GetExeFolder() + "/uppsrc");
Scan(GetExeFolder() + "/*");

18
uppsrc/ide/Methods.cpp
View file

@ -808,7 +808,7 @@ String Ide::GetIncludePath()
ONCELOCK {
Index<String> r;
for(int pass = 0; pass < 2; pass++)
ExtractIncludes(r, Sys(pass ? "clang -v -x c++ -E /dev/null" : "gcc -v -x c++ -E /dev/null"));
ExtractIncludes(r, HostSys(pass ? "clang -v -x c++ -E /dev/null" : "gcc -v -x c++ -E /dev/null"));
r.FindAdd("/usr/include_path");
r.FindAdd("/usr/local/include_path");
sys_includes = Join(r.GetKeys(), ";");
@ -874,8 +874,9 @@ void Ide::IncludeAddPkgConfig(String& include_path, const String& clang_method)
String main_conf;
for(int i = 0; i < wspc.GetCount(); i++) {
const Package& pkg = wspc.GetPackage(i);
for(int j = 0; j < pkg.include.GetCount(); j++)
for(int j = 0; j < pkg.include.GetCount(); j++) {
MergeWith(include_path, ";", SourcePath(wspc[i], pkg.include[j].text));
}
for(String h : Split(Gather(pkg.pkg_config, cfg.GetKeys()), ' '))
pkg_config.FindAdd(h);
}
@ -885,11 +886,16 @@ void Ide::IncludeAddPkgConfig(String& include_path, const String& clang_method)
int q = cflags.Find(s);
if(q < 0) {
q = cflags.GetCount();
cflags.Add(s, Sys("pkg-config --cflags " + s));
cflags.Add(s, HostSys("pkg-config --cflags " + s));
}
for(String p : Split(cflags[q], CharFilterWhitespace))
if(p.TrimStart("-I"))
for(String p : Split(cflags[q], CharFilterWhitespace)) {
if(p.TrimStart("-I")) {
#ifdef FLATPAK
p.Replace("/usr", "/run/host/usr");
#endif
MergeWith(include_path, ";", p);
}
}
}
#endif
}
@ -937,7 +943,7 @@ String Ide::GetCurrentIncludePath()
MergeWith(include_path, ";", inc2);
IncludeAddPkgConfig(include_path, clang_method);
String main_conf;
const Workspace& wspc = AssistWorkspace();
for(int i = 0; i < wspc.GetCount(); i++) {

7
uppsrc/ide/clang/clang.cpp
View file

@ -42,7 +42,7 @@ String GetClangInternalIncludes()
cpp_version = LibClangCppVersion;
String dummy = ConfigFile("dummy.cpp");
Upp::SaveFile(dummy, String());
String h = Sys(
String h = HostSys(
#ifdef PLATFORM_WIN32
GetExeDirFile("bin/clang/bin/c++") +
#else
@ -55,6 +55,9 @@ String GetClangInternalIncludes()
Vector<String> ln = Split(h, '\n');
for(int i = 0; i < ln.GetCount(); i++) {
String dir = TrimBoth(ln[i]);
#ifdef FLATPAK
dir.Replace("/usr", "/run/host/usr");
#endif
if(DirectoryExists(dir))
MergeWith(includes, ";", NormalizePath(dir));
}
@ -100,7 +103,7 @@ bool Clang::Parse(const String& filename_, const String& content,
String includes = includes_;
MergeWith(includes, ";", GetClangInternalIncludes());
Vector<String> args;
INTERLOCKED // as there is just single static 'use'

13
uppsrc/ide/idebar.cpp
View file

@ -418,17 +418,20 @@ void Ide::Setup(Bar& menu)
}
});
#ifndef PLATFORM_FLATPAK
const Workspace& wspc = IdeWorkspace();
if(wspc[0] == "ide")
for(int i = 0; i < wspc.GetCount(); i++)
if(wspc[0] == "ide") {
for(int i = 0; i < wspc.GetCount(); i++) {
if(wspc[i] == "ide/Core") {
menu.Add("Upgrade TheIDE..", [=] { UpgradeTheIDE(); });
break;
}
#ifndef PLATFORM_COCOA
#ifndef PLATFORM_WIN32
menu.Add("Install theide.desktop", [=] { InstallDesktop(); });
}
}
#endif
#if !defined(PLATFORM_COCOA) && !defined(PLATFORM_WIN32) && !defined(FLATPAK)
menu.Add("Install theide.desktop", [=] { InstallDesktop(); });
#endif
if(menu.IsMenuBar())

4
uppsrc/ide/main.cpp
View file

@ -126,6 +126,10 @@ bool TryLoadLibClang()
return true;
if(LoadLibClang("/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib"))
return true;
#endif
#ifdef FLATPAK
if(LoadLibClang("/app/lib"))
return true;
#endif
// in Mint 21.1, clang installed is 14 but llvm defaults to 15
for(String s : Split(Sys("clang --version"), [](int c)->int { return !IsDigit(c); })) {