mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
ide: MacOS install issues
git-svn-id: svn://ultimatepp.org/upp/trunk@12808 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
c212d9775c
commit
964483aaad
7 changed files with 59 additions and 8 deletions
|
|
@ -141,17 +141,22 @@ void DoSpellerPath(String& pp, String dir)
|
|||
|
||||
Speller *sGetSpeller(int lang)
|
||||
{
|
||||
RTIMING("sGetSpeller");
|
||||
static ArrayMap<int, Speller> speller;
|
||||
int q = speller.Find(lang);
|
||||
if(q < 0) {
|
||||
String pp = spell_path;
|
||||
#ifdef PLATFORM_COCOA
|
||||
String Contents = GetFileFolder(GetFileFolder(GetExeFilePath()));
|
||||
DoSpellerPath(pp, Contents + "/Resources");
|
||||
DoSpellerPath(pp, Contents + "/SharedSupport");
|
||||
#endif
|
||||
DoSpellerPath(pp, GetExeDirFile("speller"));
|
||||
DoSpellerPath(pp, ConfigFile("speller"));
|
||||
pp << spell_path << ';' << getenv("LIB") << ';' << getenv("PATH") << ';';
|
||||
#ifdef PLATFORM_POSIX
|
||||
pp << "/usr/local/share/upp/speller;/usr/local/share/upp;/usr/share/upp/speller;/usr/share/upp";
|
||||
#endif
|
||||
RDUMP(pp);
|
||||
String path = GetFileOnPath(ToLower(LNGAsText(lang)) + ".udc", pp);
|
||||
if(IsNull(path))
|
||||
return NULL;
|
||||
|
|
|
|||
|
|
@ -97,14 +97,19 @@ bool Install(bool& hasvars)
|
|||
String myapps = GetHomeDirFile("MyApps");
|
||||
RealizeDirectory(out);
|
||||
|
||||
String uppsrc = FileExists(GetHomeDirFile("upp.src/uppsrc/ide/ide.upp")) ? GetHomeDirFile("upp.src/uppsrc")
|
||||
: GetHomeDirFile("uppsrc");
|
||||
String uppsrc;
|
||||
|
||||
auto MakeAssembly = [&](String b, String name = Null) {
|
||||
name = Nvl(name, GetFileTitle(b));
|
||||
String a = ass + '/' + name + ".var";
|
||||
if(name != "uppsrc")
|
||||
if(name == "uppsrc")
|
||||
uppsrc = Nvl(uppsrc, b);
|
||||
else {
|
||||
if(uppsrc.GetCount() == 0)
|
||||
uppsrc = FileExists(GetHomeDirFile("upp.src/uppsrc/ide/ide.upp"))
|
||||
? GetHomeDirFile("upp.src/uppsrc") : GetHomeDirFile("uppsrc");
|
||||
b << ';' << uppsrc;
|
||||
}
|
||||
if(!FileExists(a))
|
||||
SaveFile(a,
|
||||
"UPP = " + AsCString(b) + ";\r\n"
|
||||
|
|
@ -128,17 +133,26 @@ bool Install(bool& hasvars)
|
|||
}
|
||||
};
|
||||
|
||||
#ifdef PLATFORM_COCOA
|
||||
if(!hasvars) {
|
||||
Scan(GetFileFolder(GetFileFolder(GetExeFilePath())) + "/SharedSupport/uppsrc");
|
||||
Scan(GetFileFolder(GetFileFolder(GetExeFilePath())) + "/SharedSupport/*");
|
||||
}
|
||||
#endif
|
||||
|
||||
Scan(GetHomeDirFile("upp.src/uppsrc"));
|
||||
Scan(GetHomeDirFile("upp.src/*"));
|
||||
Scan(GetHomeDirFile("upp/uppsrc"));
|
||||
Scan(GetHomeDirFile("upp/*"));
|
||||
Scan(GetHomeDirFile("*"));
|
||||
for(FindFile ff(GetHomeDirFile("*")); ff; ff.Next())
|
||||
if(ff.IsFolder())
|
||||
Scan(ff.GetPath() + "/*");
|
||||
|
||||
|
||||
MakeAssembly(myapps);
|
||||
uppsrc = GetHomeDirFile("bazaar") + ';' + uppsrc;
|
||||
MakeAssembly(myapps, "MyApps-bazaar");
|
||||
#ifdef PLATFORM_OSX
|
||||
#ifdef PLATFORM_COCOA
|
||||
String bm = ConfigFile("CLANG.bm");
|
||||
if(IsNull(LoadFile(bm)))
|
||||
SaveFile(bm, clang_bm);
|
||||
|
|
|
|||
|
|
@ -424,7 +424,7 @@ void InstantSetup()
|
|||
|
||||
bool CheckLicense()
|
||||
{
|
||||
if(!FileExists((GetExeDirFile("license.chk"))))
|
||||
if(!FileExists(GetExeDirFile("license.chk")))
|
||||
return true;
|
||||
ShowSplash();
|
||||
Ctrl::ProcessEvents();
|
||||
|
|
|
|||
|
|
@ -122,6 +122,10 @@ TOPIC("install_en-us")
|
|||
#include "install_en-us.tppi"
|
||||
END_TOPIC
|
||||
|
||||
TOPIC("install_mac_en-us")
|
||||
#include "install_mac_en-us.tppi"
|
||||
END_TOPIC
|
||||
|
||||
TOPIC("install_ru-ru")
|
||||
#include "install_ru-ru.tppi"
|
||||
END_TOPIC
|
||||
|
|
|
|||
22
uppsrc/ide/app.tpp/install_mac_en-us.tpp
Normal file
22
uppsrc/ide/app.tpp/install_mac_en-us.tpp
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
topic "Ultimate++ MacOS release";
|
||||
[a83;*R6 $$1,3#31310162474203024125188417583966:caption]
|
||||
[H4;b83;*4 $$2,3#07864147445237544204411237157677:title]
|
||||
[b42;a42;ph2 $$3,3#45413000475342174754091244180557:text]
|
||||
[ $$0,0#00000000000000000000000000000000:Default]
|
||||
[{_}%EN-US
|
||||
[s1; Ultimate`+`+ MacOS release&]
|
||||
[s0; MacOS version of U`+`+ is released as single .zip file containing
|
||||
.app application bundle of theide development environment.&]
|
||||
[s0; &]
|
||||
[s0; U`+`+ requires C`+`+ toolchain to build applications. You can
|
||||
find a description how to install this toolchain e.g. [^http`:`/`/osxdaily`.com`/2014`/02`/12`/install`-command`-line`-tools`-mac`-os`-x`/^ h
|
||||
ere].&]
|
||||
[s0; &]
|
||||
[s0; Some other tools and libraries can be installed with [^https`:`/`/brew`.sh`/^ home
|
||||
brew]. Following packages are recommended (as in they might be
|
||||
required in certain contexts):&]
|
||||
[s0; &]
|
||||
[s0;%- [+92 gdb]&]
|
||||
[s0;%- [+92 openssl]&]
|
||||
[s0;%- [+92 libssh2]&]
|
||||
[s0;+92%- ]]
|
||||
6
uppsrc/ide/app.tpp/install_mac_en-us.tppi
Normal file
6
uppsrc/ide/app.tpp/install_mac_en-us.tppi
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
TITLE("Ultimate++ MacOS release")
|
||||
COMPRESSED
|
||||
120,156,133,82,223,111,212,48,12,254,87,44,109,67,192,214,94,146,166,215,219,221,35,63,196,11,32,49,237,1,85,29,73,91,239,26,145,38,165,201,237,110,32,254,119,220,91,39,216,94,168,20,197,177,253,125,254,108,183,212,171,108,243,250,203,18,78,79,249,69,118,146,241,140,51,190,20,178,144,130,101,76,72,46,114,190,90,73,94,228,171,236,114,185,92,55,122,136,198,187,170,252,32,55,245,4,149,132,20,132,100,197,106,41,57,225,100,46,178,34,151,132,151,146,115,178,121,94,44,139,98,29,77,180,88,149,181,20,27,77,103,232,4,33,51,66,202,92,242,140,49,38,139,60,147,130,23,116,75,118,201,5,193,87,44,207,9,137,135,88,149,148,205,46,216,9,251,207,183,126,139,183,122,103,9,240,235,219,239,179,119,159,146,235,43,40,3,223,192,181,141,166,215,17,213,185,58,135,143,186,249,124,5,35,90,212,1,95,84,101,96,155,217,119,135,99,160,6,193,223,194,245,49,213,132,199,188,22,116,128,96,220,214,34,164,63,205,0,183,134,172,198,187,168,141,35,
|
||||
55,164,122,24,128,142,53,141,158,166,4,245,206,181,148,66,92,177,67,211,34,180,120,135,214,15,61,186,8,232,238,204,232,221,100,167,179,132,249,122,40,60,226,143,157,25,49,192,155,227,51,122,111,155,142,42,145,69,196,198,182,255,150,10,41,124,245,59,104,180,35,85,142,66,84,42,52,163,57,110,11,58,191,159,80,198,133,168,173,37,49,212,212,95,62,76,183,41,148,55,93,140,131,90,171,133,90,248,112,104,181,177,247,42,109,124,175,22,130,113,169,22,76,168,5,167,51,147,168,132,98,189,118,173,74,172,113,168,146,137,47,168,164,215,141,74,60,25,7,181,184,129,14,71,172,158,117,119,229,123,26,9,13,100,60,106,8,64,36,96,77,61,234,209,80,183,83,11,53,62,106,165,161,239,77,236,102,121,225,65,95,61,226,94,165,161,59,86,32,182,233,93,165,240,222,91,235,247,211,34,6,221,124,215,91,34,211,35,210,28,39,165,232,90,226,122,73,27,156,38,216,225,61,244,102,219,197,169,212,60,232,118,138,52,56,78,219,60,110,149,126,187,240,106,253,68,
|
||||
252,89,2,229,249,165,128,109,91,87,79,61,126,64,23,130,125,230,165,182,66,232,196,236,37,15,5,170,234,15,115,201,22,156,
|
||||
|
||||
|
|
@ -150,7 +150,7 @@ void AppMain___()
|
|||
String home = Environment().Get("UPP_HOME", Null);
|
||||
if(!IsNull(home))
|
||||
SetHomeDirectory(home);
|
||||
FindFile ff(ConfigFile("*.var"));
|
||||
RDUMP(hasvars);
|
||||
if(!hasvars) {
|
||||
if(!Install(hasvars))
|
||||
return;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue