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

umk: Using curl to fetch upphub instead of HttpRequest+Core/SSL (makes statically linked umk32s possible with upphub support)

Browse source
This commit is contained in:
Mirek Fidler 2023-06-03 20:56:42 +02:00
parent 555e99a8d3
commit 02ce73828f
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppbox/MakePosixInstall/Main.cpp
View file

@ -127,7 +127,7 @@ CONSOLE_APP_MAIN
#endif #endif
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC32 " OPTS + "+NOSSL " + release + "/umks32"); Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC32 " OPTS + release + "/umks32");
#endif #endif
Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC +NOMM -rvsM"); Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC +NOMM -rvsM");

2
uppsrc/Core/Mt.cpp
View file

@ -258,7 +258,7 @@ void Thread::DumpDiagnostics()
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
INTERLOCKED { INTERLOCKED {
int s, i; int i;
void *stkaddr; void *stkaddr;
pthread_attr_t attr[1]; pthread_attr_t attr[1];

8
uppsrc/umk/UppHub.cpp
View file

@ -30,6 +30,13 @@ Value UppHubDlg::LoadJson(const String& url)
if(IsNull(s)) { if(IsNull(s)) {
PutVerbose("Fetching UppHub metadata from " << url); PutVerbose("Fetching UppHub metadata from " << url);
#ifdef PLATFORM_POSIX
s = Sys("curl --silent " + url);
if (IsNull(s)) {
String msg = "Failed to execute UppHub download nests request.";
return ErrorValue(msg);
}
#else
HttpRequest r(url); HttpRequest r(url);
r.Execute(); r.Execute();
if (!r.IsSuccess()) { if (!r.IsSuccess()) {
@ -38,6 +45,7 @@ Value UppHubDlg::LoadJson(const String& url)
} }
s = r.GetContent(); s = r.GetContent();
#endif
} }
Value v = ParseJSON(s); Value v = ParseJSON(s);

5
uppsrc/umk/umk.upp
View file

@ -3,7 +3,7 @@ description "Commandline U++ package/assembly builder\377";
uses uses
ide\Builders; ide\Builders;
uses(!NOSSL) Core/SSL; uses(!POSIX) Core/SSL;
file file
umake.h, umake.h,
@ -16,6 +16,5 @@ file
mainconfig mainconfig
"" = "", "" = "",
"" = "NOMM", "" = "NOMM";
"" = "NOSSL";