diff --git a/uppsrc/ide/app.tpp/all.i b/uppsrc/ide/app.tpp/all.i index fbc681716..8f4adda14 100644 --- a/uppsrc/ide/app.tpp/all.i +++ b/uppsrc/ide/app.tpp/all.i @@ -98,10 +98,6 @@ TOPIC("index_en-us") #include "index_en-us.tppi" END_TOPIC -TOPIC("install_en-us") -#include "install_en-us.tppi" -END_TOPIC - TOPIC("install_macos_en-us") #include "install_macos_en-us.tppi" END_TOPIC diff --git a/uppsrc/ide/app.tpp/install_en-us.tpp b/uppsrc/ide/app.tpp/install_en-us.tpp deleted file mode 100644 index bb85f7b47..000000000 --- a/uppsrc/ide/app.tpp/install_en-us.tpp +++ /dev/null @@ -1,28 +0,0 @@ -topic "Ultimate++ Windows Installation"; -[l288;i704;a17;O9;~~~.992;2 $$1,0#10431211400427159095818037425705:param] -[a83;*R6 $$2,5#31310162474203024125188417583966:caption] -[H4;b83;*4 $$3,5#07864147445237544204411237157677:title] -[b167;a42;C2 $$4,6#40027414424643823182269349404212:item] -[b42;a42;ph2 $$5,5#45413000475342174754091244180557:text] -[l288;a17;2 $$6,6#27521748481378242620020725143825:desc] -[l321;t246;C@5;1 $$7,7#20902679421464641399138805415013:code] -[b2503;2 $$8,0#65142375456100023862071332075487:separator] -[ph*@(0.0.255)2 $$9,0#83433469410354161042741608181528:base] -[t4167;C2 $$10,0#37138531426314131251341829483380:class] -[l288;a17;*1 $$11,11#70004532496200323422659154056402:requirement] -[i417;b42;a42;O9;~~~.416;2 $$12,12#10566046415157235020018451313112:tparam] -[b167;C2 $$13,13#92430459443460461911108080531343:item1] -[i288;a42;O9;C2 $$14,14#77422149456609303542238260500223:item2] -[*@2$(0.128.128)2 $$15,15#34511555403152284025741354420178:NewsDate] -[l321;*C$7;2 $$16,16#03451589433145915344929335295360:result] -[l321;b83;a83;*C$7;2 $$17,17#07531550463529505371228428965313:result`-line] -[l160;t4167;*C+117 $$18,5#88603949442205825958800053222425:package`-title] -[2 $$0,0#00000000000000000000000000000000:Default] -[{_}%EN-US -[s2; Ultimate`+`+ Windows Installation&] -[s5;~~~320; Windows release is a simple archive [^http`:`/`/www`.7`-zip`.org`/^ .7z] -archive. Unpack to directory of your preference, then just run -theide.exe. U`+`+ does not write anything to registry or outside -its directory. The archive contains CLANG based Win32 toolchain -and also SDL 2, OpenSSL, MySql and PostgreSQL client libraries. -]] \ No newline at end of file diff --git a/uppsrc/ide/app.tpp/install_en-us.tppi b/uppsrc/ide/app.tpp/install_en-us.tppi deleted file mode 100644 index 99f24ce52..000000000 --- a/uppsrc/ide/app.tpp/install_en-us.tppi +++ /dev/null @@ -1,7 +0,0 @@ -TITLE("Ultimate++ Windows Installation") -COMPRESSED -120,156,133,84,93,115,227,68,16,252,43,91,229,64,65,162,56,59,179,223,210,75,168,132,2,170,66,14,48,87,60,184,124,88,177,55,177,64,145,124,210,134,92,142,34,191,157,94,197,119,225,13,187,44,219,165,237,153,238,158,30,45,91,246,190,106,156,212,85,77,174,122,19,170,231,231,231,121,8,92,177,56,58,162,66,206,72,106,69,76,164,165,212,236,200,4,25,140,39,47,149,211,108,156,52,229,190,30,234,251,213,178,246,170,58,254,197,2,197,133,153,41,82,36,201,178,198,41,169,36,107,98,67,222,107,114,198,171,96,109,185,169,247,169,233,187,213,242,123,93,221,100,168,6,82,1,41,157,183,154,128,211,134,149,51,26,120,173,137,240,155,140,179,206,149,169,73,109,92,45,111,200,186,170,214,92,93,100,166,186,176,51,48,100,7,168,102,109,181,242,172,200,51,219,160,116,208,160,78,92,54,41,130,232,13,48,25,183,223,101,160,65,75,109,52,41,9,125,206,40,28,116,248,214,50,16,163,175,151,198,160,101,252,144,86,203,201,170,236,82,198,89,52,100,103,242, -105,175,61,41,231,89,179,101,80,144,14,82,115,127,83,110,227,184,1,78,49,85,9,164,170,139,115,83,17,192,174,112,51,150,65,178,117,1,13,65,23,146,85,8,164,60,26,106,50,146,84,185,233,183,89,38,27,169,166,142,30,195,176,168,60,185,98,44,129,48,43,143,150,142,148,194,213,104,239,202,49,230,113,164,126,88,45,247,187,227,243,175,228,92,206,217,152,175,115,129,128,2,94,105,165,180,13,154,164,66,35,84,209,217,51,43,49,82,50,236,203,155,122,68,215,164,179,187,147,179,36,1,131,249,202,27,133,230,22,23,204,22,18,21,220,225,160,189,82,94,150,155,182,30,199,255,88,116,156,101,18,21,68,51,151,157,53,138,117,200,246,40,134,197,108,77,32,120,108,172,150,92,14,241,253,67,51,196,251,216,193,228,6,17,169,62,141,232,16,71,144,121,137,35,23,196,8,164,177,86,102,199,12,18,193,202,192,114,73,94,131,17,222,24,115,58,36,242,230,85,131,42,72,205,2,107,5,38,65,107,56,128,2,20,136,72,122,188,161,12,190,76,249,32,80,152, -68,188,180,127,129,235,130,244,204,33,202,152,85,208,185,125,80,217,63,198,0,216,74,131,73,240,11,156,87,203,227,115,62,130,239,196,62,127,38,231,201,20,132,157,0,69,50,6,186,21,172,102,15,237,6,222,171,41,227,228,124,121,29,31,199,203,58,197,67,100,142,47,142,94,178,70,182,32,59,147,25,111,124,192,0,73,103,255,148,214,129,131,82,134,131,81,86,194,199,241,161,77,7,112,222,169,105,37,63,23,113,5,57,108,23,180,26,3,245,19,12,202,29,101,42,236,131,205,46,28,138,172,79,219,166,203,60,144,140,234,37,12,199,23,39,68,46,23,242,88,25,239,173,84,1,102,192,3,105,144,117,60,20,60,6,141,57,51,22,33,63,21,54,127,214,119,113,125,122,88,215,76,33,39,73,254,207,171,188,140,183,245,36,227,239,223,255,249,226,219,235,211,183,11,177,28,185,18,111,219,212,220,195,156,245,201,250,68,252,214,116,219,254,113,20,63,116,99,170,219,182,206,143,146,47,87,203,209,228,188,96,25,170,207,39,134,216,70,68,90,52,163,168,197,216,220, -239,219,40,234,97,179,107,254,138,98,249,110,151,210,126,93,174,207,214,103,143,143,143,235,185,91,159,126,108,246,235,121,63,220,173,207,222,137,185,251,184,250,116,120,46,222,118,89,147,72,189,216,34,173,27,236,216,147,232,111,197,83,255,48,136,253,16,111,227,16,187,77,44,68,218,197,78,252,241,48,38,49,60,116,249,95,179,141,243,248,33,87,152,184,111,251,56,138,174,79,226,113,64,98,68,221,61,165,93,211,221,229,194,67,188,107,198,148,235,14,162,127,72,35,144,162,73,227,107,195,185,248,117,247,202,127,211,119,169,110,186,81,92,92,125,115,253,157,200,171,187,205,194,21,163,88,223,110,118,184,137,250,91,81,183,99,47,22,151,87,130,11,241,102,31,187,197,226,170,16,63,62,45,222,183,211,237,159,250,49,221,13,113,241,243,149,216,180,13,214,80,180,205,205,80,15,77,28,231,98,181,250,23,223,13,156,90, - diff --git a/uppsrc/ide/app.tpp/install_macos_en-us.tpp b/uppsrc/ide/app.tpp/install_macos_en-us.tpp index 07568d03c..9d48f01d7 100644 --- a/uppsrc/ide/app.tpp/install_macos_en-us.tpp +++ b/uppsrc/ide/app.tpp/install_macos_en-us.tpp @@ -1,16 +1,17 @@ topic "Ultimate++ MacOS Installation"; [a83;*R6 $$1,3#31310162474203024125188417583966:caption] [H4;b83;*4 $$2,3#07864147445237544204411237157677:title] -[b42;a42;2 $$3,3#45413000475342174754091244180557:text] +[b42;a42;ph2 $$3,3#45413000475342174754091244180557:text] +[2 $$4,4#589063B430329DC9D1C058DDB04EA569:code] [ $$0,0#00000000000000000000000000000000:Default] [{_}%EN-US [s1; U`+`+ Mac OS installation&] [s3; U`+`+ for POSIX (OpenBSD, FreeBSD) comes as single sandboxed archive. After downloading, you need to unpack this archive to suitable location with&] -[s3; tar xf upp`-posix`-14411.tar.xz&] +[ {{10000G1@7 [s4; tar xf upp`-posix`-14411.tar.xz]}}&] [s3; (replace 14411 with the revision you have downloaded). Of course, -you can use GUI tool to unpack as well.&] +you can use your desktop environment desktop GUI utility as well.&] [s3; 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].&] @@ -20,9 +21,9 @@ required in certain contexts):&] [s3;i150;O0;%- gdb&] [s3;i150;O0;%- openssl&] [s3;i150;O0;%- libssh2&] -[s3; As long as you keep theide (or umk) just in the original directory, -nothing will be written outside of it `- its `"sandboxed`". If -you get bored with U`+`+ and need to clean the space, simply +[s3; As long as you keep [*/ theide ](or [*/ umk]) just in the original +directory, nothing will be written outside of it `- its `"sandboxed`". +If you get bored with U`+`+ and need to clean the space, simply delete the `"upp`" folder.&] -[s3; If you move theide e.g. to `~/bin, it will start to write things -to `~/.config and `~/.cache.]] \ No newline at end of file +[s3; If you move theide e.g. to [/ `~/bin], it will start to write +things to[/ `~/.config ]and [/ `~/.cache].]] \ No newline at end of file diff --git a/uppsrc/ide/app.tpp/install_macos_en-us.tppi b/uppsrc/ide/app.tpp/install_macos_en-us.tppi index 9927f1d92..37d982969 100644 --- a/uppsrc/ide/app.tpp/install_macos_en-us.tppi +++ b/uppsrc/ide/app.tpp/install_macos_en-us.tppi @@ -1,7 +1,7 @@ TITLE("Ultimate++ MacOS Installation") COMPRESSED -120,156,133,83,219,142,219,54,16,253,149,193,38,41,118,19,75,22,117,177,28,251,41,109,154,118,31,26,7,53,22,104,97,56,37,37,141,45,118,105,82,37,169,181,157,32,253,246,14,101,185,23,228,161,6,100,145,26,158,153,115,206,12,55,98,158,45,95,254,60,131,231,207,217,36,123,150,177,140,37,108,150,230,101,158,38,89,146,230,44,45,216,124,158,179,178,152,103,175,103,179,69,45,58,47,141,222,110,126,204,151,85,128,230,132,76,9,153,148,243,89,206,8,151,23,105,86,22,57,225,243,156,49,90,179,162,156,149,229,194,75,175,112,187,169,242,116,41,232,73,9,151,17,46,47,114,150,37,73,146,151,69,150,167,172,164,119,158,188,102,41,129,231,73,81,16,14,79,126,187,161,211,201,36,121,150,252,207,111,241,22,119,162,87,4,248,252,219,151,23,223,191,143,30,214,176,113,108,9,15,252,21,127,5,63,137,26,86,107,144,218,121,161,148,8,74,190,217,110,92,118,141,239,140,133,15,171,245,253,47,112,187,234,80,127,187,126,59,129,119,22,145,22,119,80,155, -3,58,16,14,156,212,123,133,224,132,110,42,115,194,6,132,173,91,249,132,49,188,217,121,180,208,152,163,86,70,52,116,108,2,103,211,131,70,58,228,13,244,186,19,245,35,248,86,186,43,38,124,118,189,244,162,162,140,202,212,3,39,56,74,223,142,196,188,176,112,218,65,223,117,60,234,140,147,39,30,177,96,108,76,129,248,244,105,60,117,107,177,83,162,70,24,98,3,158,202,32,88,124,146,46,100,12,52,90,65,245,174,228,176,185,139,97,181,35,85,189,117,120,225,89,11,13,189,67,248,225,225,158,120,25,245,47,206,36,251,136,74,197,255,177,203,226,31,189,180,100,202,119,195,54,64,234,86,72,29,112,85,47,21,57,211,117,74,94,68,185,24,126,29,107,236,164,166,16,52,232,106,43,135,121,130,214,28,3,106,236,204,197,162,127,242,97,188,143,97,243,177,245,190,227,11,62,229,83,227,78,141,144,234,204,99,234,10,159,166,9,203,249,52,73,249,148,209,51,38,225,17,197,14,212,36,30,41,169,145,71,33,159,227,209,65,212,60,50,180,56,241,233,71,104,209, -226,246,42,107,77,45,6,67,198,217,161,56,117,137,136,42,89,89,97,37,201,12,220,43,188,146,164,158,14,62,95,120,185,11,177,202,226,145,199,174,29,82,83,182,176,223,198,240,206,40,101,142,52,16,16,220,20,251,48,72,54,180,39,80,68,77,221,128,91,178,56,88,215,226,25,14,114,223,250,80,106,116,184,9,145,26,173,15,102,212,70,135,59,225,238,22,23,214,146,21,201,114,149,44,95,68,176,111,170,175,190,25,26,100,231,212,87,223,73,150,115,109,58,42,127,227,104,250,136,30,145,8,147,240,136,216,5,42,178,65,184,165,75,209,31,30,239,224,247,222,249,145,34,24,43,247,82,11,5,13,209,171,189,177,231,9,104,114,46,72,60,74,234,32,145,63,90,233,61,106,48,189,119,33,145,217,129,244,192,35,250,119,192,111,254,190,63,252,38,134,251,221,80,119,143,36,219,216,171,181,151,49,11,77,184,94,161,90,161,184,48,112,228,36,205,173,147,135,78,157,105,150,20,122,28,2,252,38,92,150,27,186,204,170,65,123,109,237,88,224,96,158,240,42,108,152, -42,202,201,255,156,86,82,79,2,185,129,58,117,215,250,16,8,2,194,105,18,229,198,131,52,111,122,39,247,3,167,97,43,234,22,227,237,246,47,114,120,183,88, +120,156,133,84,109,111,219,54,16,254,43,135,164,29,146,214,150,245,66,249,245,203,146,184,237,242,97,245,176,32,192,6,67,29,105,233,108,113,161,73,141,164,98,123,65,250,219,119,148,237,14,67,63,204,128,108,138,199,187,123,158,231,30,122,41,198,217,236,221,175,67,120,243,38,233,101,151,89,146,37,113,50,76,217,136,165,113,22,167,44,73,243,100,60,102,201,40,31,103,147,225,112,90,138,198,75,163,139,229,79,108,182,10,169,140,50,83,202,140,71,227,33,75,40,143,229,105,54,202,25,229,51,150,36,180,78,242,209,112,52,154,122,233,21,22,203,21,75,103,130,158,166,78,41,51,163,76,150,179,36,139,227,152,141,242,140,165,201,136,126,89,60,73,82,74,31,199,121,78,153,184,247,197,50,28,103,61,118,153,143,39,241,48,187,101,89,156,165,147,249,221,100,158,220,197,249,120,62,191,141,217,135,155,124,56,153,150,166,162,62,116,58,238,197,151,241,255,124,166,115,92,139,86,81,253,151,63,94,223,126,248,220,127,124,128,165,75,102,240,200,223,243,247,240,179,40, +97,241,0,82,59,47,148,18,129,250,15,197,210,101,231,248,218,88,248,101,241,112,255,27,92,45,26,212,183,15,243,30,124,180,136,180,184,134,210,108,209,129,112,224,164,222,40,4,39,116,181,50,123,172,64,216,178,150,207,24,193,205,218,163,133,202,236,180,50,162,162,99,61,56,152,22,52,210,33,111,160,213,141,40,159,192,215,210,157,115,194,182,107,165,23,43,170,168,76,217,97,130,157,244,53,1,131,151,151,36,176,250,148,252,56,34,26,108,6,94,88,216,175,161,109,26,222,111,140,147,123,222,79,194,92,34,10,68,251,191,139,215,215,19,159,43,139,141,18,37,66,23,238,10,82,95,4,139,207,210,133,22,1,87,45,8,192,25,45,86,215,17,44,214,68,179,181,14,143,192,75,161,161,117,24,214,68,11,221,147,55,13,160,126,150,214,232,45,106,255,109,239,211,227,61,180,94,42,233,15,65,161,29,42,21,253,71,89,139,127,181,210,146,126,119,221,171,55,70,149,181,144,58,240,95,181,82,145,136,77,163,228,145,191,139,224,247,83,247,181,212,20,10,125,74,43, +59,175,66,109,118,33,235,52,196,163,154,255,214,195,104,19,193,242,75,237,125,195,167,124,192,7,198,237,43,33,213,129,71,52,64,62,72,227,132,241,65,156,242,65,66,207,169,8,239,83,108,75,243,228,125,37,53,242,126,168,231,120,127,43,74,222,55,180,216,243,193,23,168,209,98,113,166,245,64,110,0,67,146,218,174,57,13,148,128,42,185,178,194,74,162,25,176,175,240,12,146,198,223,77,224,136,203,29,129,173,44,238,120,228,234,174,52,85,11,239,69,4,31,141,82,102,71,222,129,96,22,177,9,158,179,97,112,1,34,106,154,19,92,145,196,65,186,26,15,176,149,155,218,135,86,39,133,171,16,41,209,250,32,70,105,116,184,109,238,122,122,68,45,147,60,158,45,226,217,219,62,108,170,213,119,123,134,60,239,156,250,110,159,104,57,87,167,39,230,55,142,140,74,240,8,68,240,200,19,98,3,203,119,131,0,71,86,8,197,21,93,162,240,222,110,159,138,107,248,179,117,254,4,22,140,149,27,169,133,130,138,128,150,222,216,67,15,52,105,24,200,238,36,205,146,104, +236,172,244,30,53,152,214,187,80,206,172,65,122,224,125,250,118,192,47,190,93,58,126,17,193,253,186,67,176,65,18,192,216,179,200,71,195,133,113,156,239,93,169,80,28,17,56,210,148,188,237,228,182,81,7,114,149,66,143,93,128,95,132,59,117,65,255,0,170,66,123,30,242,169,193,214,60,227,153,94,231,47,170,185,28,0,255,58,88,73,93,244,2,192,14,62,205,218,250,16,12,36,66,6,17,11,222,164,179,225,48,25,80,175,229,6,138,128,237,152,31,149,162,172,201,84,69,241,15,66,184,216,26, diff --git a/uppsrc/ide/app.tpp/install_posix_en-us.tpp b/uppsrc/ide/app.tpp/install_posix_en-us.tpp index 26a051313..bffb885fe 100644 --- a/uppsrc/ide/app.tpp/install_posix_en-us.tpp +++ b/uppsrc/ide/app.tpp/install_posix_en-us.tpp @@ -7,38 +7,39 @@ topic "U++ POSIX/X11 Tarball Installation"; [ $$0,0#00000000000000000000000000000000:Default] [{_}%EN-US [s1; U`+`+ POSIX Tarball Installation&] -[s2;po U`+`+ for POSIX (OpenBSD, FreeBSD) comes as single sandboxed +[s2; U`+`+ for POSIX (OpenBSD, FreeBSD) comes as single sandboxed archive. After downloading, you need to unpack this archive to suitable location with&] -[s2;po tar xf upp`-posix`-14411.tar.xz&] -[s2;po (replace 14411 with the revision you have downloaded). Of -course, you can use your desktop environment desktop utility -as well.&] -[s2;po This will produce `"upp`" folder full of files.&] -[s2;po cd upp&] -[s2;po to get into it. Now you have two options:&] -[s2;i150;poO0; Use ./install script that should resolve all dependencies +[ {{10000G1@7 [s4; tar xf upp`-posix`-14411.tar.xz]}}&] +[s2; (replace 14411 with the revision you have downloaded). Of course, +you can use your desktop environment desktop utility as well.&] +[s2; This will produce `"upp`" folder full of files.&] +[ {{10000G1@7 [s4; cd upp]}}&] +[s2; to get into it. Now you have two options:&] +[s2;i150;O0; Use [* ./install] script that should resolve all dependencies build theide as fast as possible (usually the process takes a couple of minutes).&] -[s2;i150;poO0; Resolve dependecies yourself and use `'make`'. (there -is no ./configure or make install, it is not necessarry). Even -if you do this, peeking into ./install is a good idea to get -a clue about dependecies required. You should also build umk -command line too with `'make `-f uMakefile`', also this is not -strictly necessarry for the first taste of U`+`+.&] -[s2;po At the end of this process, you should have two binaries in -the folder, ./theide and ./umk. Start ./theide to have some fun -with U`+`+.&] -[s2;po As long as you keep theide (or umk) just in the original directory, -nothing will be written outside of it `- its `"sandboxed`" (with -one exception described bellow). If you get bored with U`+`+ -and need to clean the space, simply delete the `"upp`" folder.&] -[s2;po If you move theide e.g. to `~/bin, it will start to write -things to `~/.config and `~/.cache.&] -[s2;po The exception to the sanboxing rule is single command invoked -from TheIDE menu, `"Setup`"/`"Install theide.desktop`". This -will write proper desktop file to `~/.local/share/applications +[s2;i150;O0; Resolve dependecies yourself and use [* make] to build +[*/ theide ](there is no [/ ./configure] or [/ make install], it is +not necessarry). Even if you do this, peeking into [* ./install] +is a good idea to get a clue about dependecies required. You +should also build [*/ umk] command line too with [* make `-f uMakefile], +also this is not strictly necessarry for the first taste of U`+`+.&] +[s2; At the end of this process, you should have two binaries in +the folder, [*/ theide] and [*/ umk]. Start [*/ theide] to have some +fun with U`+`+.&] +[s2; As long as you keep [*/ theide] (or [*/ umk]) just in the original +directory, nothing will be written outside of it `- its `"sandboxed`" +(with one exception described bellow). If you get bored with +U`+`+ and need to clean the space, simply delete the `"upp`" +folder.&] +[s2; If you move theide e.g. to [/ `~/bin], it will start to write +things to [/ `~/.config] and [/ `~/.cache].&] +[s2; The exception to the sanboxing rule is single command invoked +from TheIDE menu, [*/ Setup ][* / ][*/ Install theide.desktop]. This +will write proper .desktop file to [/ `~/.local/share/applications] `- the effect of this on most desktop environments is that TheIDE -will appear in the desktop menu somewhere, usually in Start menu -under Programming category. Sometimes desktop environment needs -restert to this to take effect.]] \ No newline at end of file +will appear in the desktop menu somewhere, usually in the Start +menu under [/ Programming] category. Sometimes desktop environment +needs restert to this to take effect.&] +[s2; ]] \ No newline at end of file diff --git a/uppsrc/ide/app.tpp/install_posix_en-us.tppi b/uppsrc/ide/app.tpp/install_posix_en-us.tppi index c62d73643..751085f59 100644 --- a/uppsrc/ide/app.tpp/install_posix_en-us.tppi +++ b/uppsrc/ide/app.tpp/install_posix_en-us.tppi @@ -1,8 +1,9 @@ TITLE("U++ POSIX/X11 Tarball Installation") COMPRESSED -120,156,133,85,107,79,227,70,20,253,43,35,216,118,161,24,227,103,30,240,9,8,171,242,161,203,106,97,165,86,8,213,19,251,58,153,198,241,184,243,32,208,170,253,237,61,51,118,18,86,187,82,145,192,38,115,239,157,115,206,61,247,230,145,79,210,139,159,62,143,216,187,119,113,144,28,166,113,26,71,241,40,201,198,89,18,165,81,146,197,73,30,79,38,89,60,206,39,233,116,52,58,47,121,103,132,108,159,30,231,89,114,193,241,219,45,19,228,38,200,205,242,44,78,163,40,202,198,121,154,37,241,24,207,44,154,198,73,150,197,147,40,207,199,231,134,94,204,211,227,207,217,197,220,221,153,33,45,69,90,52,158,140,178,24,23,102,121,146,34,5,23,35,35,198,123,156,143,71,99,164,9,211,208,211,163,187,38,11,178,195,124,50,141,70,233,85,150,70,105,50,157,93,79,103,241,117,148,79,102,179,171,40,187,185,204,71,211,243,82,86,8,247,119,156,196,241,24,105,121,144,31,38,151,215,201,135,25,40,221,76,174,103,89,58,154,102,201,245,245,116,154,142,179,217,36, -206,38,211,243,123,59,127,232,111,66,70,20,68,135,209,255,252,156,207,168,230,182,1,165,191,127,255,231,135,155,143,167,95,238,217,163,142,47,216,151,226,164,56,97,159,238,238,111,127,101,15,92,205,121,211,176,219,86,27,60,185,19,239,199,167,71,13,225,228,16,88,75,53,4,31,221,117,212,94,221,207,2,246,65,17,225,229,152,149,114,77,154,113,205,180,104,23,13,49,205,219,106,46,95,168,98,92,149,75,241,76,33,187,172,13,41,86,201,77,219,72,94,33,44,96,175,210,178,150,16,100,36,179,109,199,203,21,51,75,161,183,57,238,99,109,133,225,115,84,108,100,233,81,177,141,48,203,29,52,195,21,123,169,153,237,186,226,180,147,90,188,20,167,177,107,75,136,131,240,229,175,93,220,145,162,174,225,37,49,127,234,107,224,42,98,138,158,133,118,85,29,148,37,199,157,91,128,84,29,135,236,174,6,51,171,52,245,88,75,222,50,171,201,189,131,9,233,149,145,29,163,246,89,40,217,174,169,53,187,207,172,17,141,48,175,78,144,13,53,77,184,195,241,224,232,109, -4,148,238,148,172,44,0,21,7,14,252,1,228,109,42,232,83,91,156,201,154,213,162,33,189,207,43,43,199,113,79,91,178,5,25,38,90,188,8,19,178,143,114,179,103,96,54,146,73,111,127,125,222,103,136,56,143,144,118,23,161,233,128,31,158,137,190,205,76,151,74,116,6,74,112,195,244,82,218,166,130,34,90,54,168,226,142,43,66,163,43,106,75,129,230,206,173,192,49,68,19,21,57,98,53,215,198,61,33,187,22,174,67,71,86,91,100,189,122,97,65,175,36,173,209,160,149,51,134,147,177,67,12,152,173,69,107,13,233,227,240,27,108,159,135,171,135,107,253,173,175,94,254,166,102,48,148,215,190,120,191,70,201,226,125,200,142,112,143,34,6,65,91,9,78,165,108,107,177,176,248,4,70,117,49,108,96,25,64,162,62,202,192,109,14,21,87,234,21,221,189,121,166,150,137,218,43,87,73,111,189,128,117,68,43,152,179,215,118,175,148,115,37,91,72,89,49,208,231,219,6,128,87,99,161,198,92,90,243,21,108,69,127,90,161,168,10,217,111,40,62,72,203,27,45,7, -25,237,122,229,102,102,237,88,53,162,117,86,151,189,43,123,126,172,56,133,171,127,193,155,51,66,241,62,232,147,253,116,12,84,180,81,162,52,144,123,207,201,207,168,83,191,22,10,205,49,232,144,151,220,15,240,222,76,151,198,7,1,172,59,244,53,135,118,245,54,31,224,238,204,52,23,45,87,142,149,104,251,234,222,170,1,212,217,186,1,149,194,51,112,10,217,61,6,207,236,79,160,147,47,163,177,31,224,237,126,122,191,193,163,49,221,144,156,251,118,179,21,81,183,245,217,17,8,161,238,49,251,195,106,179,189,95,42,177,0,36,248,19,18,151,70,170,215,192,41,178,116,109,243,179,53,39,182,81,194,24,180,23,141,209,174,16,136,194,5,197,41,254,106,204,220,110,63,97,242,142,60,38,137,38,208,75,73,126,112,220,32,99,52,230,88,77,115,204,175,220,192,45,183,189,81,92,219,231,18,173,125,67,197,11,176,93,100,101,67,188,199,169,177,209,176,57,180,88,119,104,83,69,13,161,29,238,224,235,153,223,11,49,92,177,150,207,180,21,128,194,69,232,170,22,255, -158,161,13,222,202,158,162,246,58,227,192,17,117,209,32,175,135,192,176,31,5,143,202,255,203,203,37,189,221,65,111,153,26,217,99,229,45,244,112,10,42,219,248,161,26,54,249,214,165,162,125,150,43,48,172,149,92,187,18,183,179,27,134,157,103,3,176,185,39,99,193,231,172,56,24,190,63,6,244,225,176,15,139,131,240,205,230,235,17,195,113,29,237,183,168,179,249,22,190,91,245,205,153,94,114,69,103,188,235,26,209,111,126,237,218,231,141,91,215,104,251,206,187,32,177,150,218,124,111,33,251,97,241,219,109,64,236,1,160,38,225,123,99,112,211,54,205,145,241,62,221,184,181,18,176,237,54,67,88,111,106,31,96,91,183,165,63,41,185,80,124,189,118,122,1,28,45,224,65,120,31,201,70,184,47,194,239,125,55,56,127,184,197,128,153,236,59,231,193,187,167,155,247,158,83,248,244,244,31,82,167,253,96, +120,156,133,85,89,111,219,70,16,254,43,139,58,45,236,68,166,120,234,176,95,234,88,78,235,135,198,65,156,0,45,4,162,90,145,75,105,43,138,203,238,97,217,13,210,223,222,111,150,164,143,32,64,13,88,36,184,59,59,243,29,51,187,228,179,228,252,245,199,9,123,245,42,26,197,71,73,148,68,97,52,137,211,105,26,135,73,24,167,81,156,69,179,89,26,77,179,89,50,159,76,206,10,222,90,169,154,124,185,78,227,115,142,255,118,27,35,54,70,108,154,165,81,18,134,97,58,205,146,52,142,166,120,166,225,60,138,211,52,154,133,89,54,61,179,226,222,230,203,95,211,243,53,229,76,17,150,32,44,156,206,38,105,132,132,105,22,39,8,65,98,68,68,120,143,178,233,100,138,48,105,107,145,47,41,77,58,74,143,178,217,60,156,36,111,211,36,76,226,249,226,114,190,136,46,195,108,182,88,188,13,211,171,139,108,50,63,43,84,137,237,62,199,155,40,154,34,44,27,101,71,241,197,101,252,110,1,72,87,179,203,69,154,76,230,105,124,121,57,159,39,211,116,49,139,210, +217,252,236,214,173,63,117,153,16,17,142,194,163,240,127,254,206,22,162,226,174,6,164,47,127,126,253,241,234,253,233,231,91,182,52,209,57,251,188,122,179,122,195,62,220,220,94,255,206,62,113,189,230,117,205,174,27,99,241,228,68,222,79,249,210,196,195,182,74,233,126,235,241,77,43,154,183,183,139,17,123,167,133,192,203,9,43,212,94,24,198,13,51,178,217,212,130,25,222,148,107,117,47,74,198,117,177,149,119,34,96,23,149,21,154,149,234,208,212,138,151,216,54,98,15,202,177,70,96,147,85,204,53,45,47,118,204,110,165,25,98,232,179,113,210,242,53,78,172,85,225,107,98,7,105,183,40,140,125,249,18,17,184,95,162,159,167,64,147,158,51,203,53,187,175,152,107,219,213,105,171,140,188,95,157,70,36,80,128,133,224,254,159,252,235,215,30,207,177,22,109,205,11,193,252,178,63,16,121,5,211,226,78,26,74,65,117,109,57,10,24,170,21,229,73,192,110,42,192,116,218,136,174,240,130,55,204,25,65,239,128,37,204,206,170,150,137,230,78,106,213,236,69,99,31,191, +57,43,107,105,31,136,157,131,168,235,160,175,226,19,33,61,72,80,222,106,85,58,148,179,250,129,106,255,1,76,215,37,168,170,28,214,84,197,42,89,11,19,124,23,114,81,18,220,39,100,32,108,35,44,147,13,94,164,13,216,123,117,120,2,99,15,138,41,223,20,230,172,219,47,163,44,60,191,9,161,48,112,44,95,179,96,44,59,245,115,102,10,45,91,11,90,184,101,102,171,92,93,130,30,163,106,156,67,46,41,5,44,80,138,166,144,144,125,237,36,150,193,160,44,5,161,172,184,177,244,132,8,70,146,118,199,206,56,68,61,120,150,129,182,16,198,64,174,29,89,134,56,109,177,7,64,247,178,113,86,152,147,224,155,234,62,246,137,251,164,62,231,131,87,162,174,24,140,230,101,64,249,123,156,152,19,7,93,65,203,215,227,161,168,252,24,47,90,48,48,222,40,182,28,3,105,161,154,74,110,156,70,4,140,141,79,20,205,6,252,35,208,215,237,182,112,40,213,203,181,126,128,9,174,238,68,195,100,229,89,45,149,183,235,136,181,66,236,96,232,142,247,151,60,146,155, +217,70,169,146,161,14,62,8,4,212,181,3,87,107,229,236,11,88,90,252,237,164,22,101,192,254,64,130,158,120,94,155,231,152,220,126,151,83,195,237,9,122,45,27,234,19,213,185,184,39,129,173,78,209,7,191,225,141,188,3,48,254,4,223,90,61,38,99,181,44,44,20,121,2,231,27,156,4,170,164,134,126,22,34,122,85,124,247,15,166,189,176,126,11,234,165,37,127,98,175,103,215,20,125,197,143,126,91,203,134,107,2,38,155,238,108,111,237,209,51,109,114,175,224,128,43,96,183,232,86,251,98,29,156,249,243,12,102,12,154,162,155,0,223,148,101,48,31,32,0,247,198,96,59,33,218,23,71,28,147,196,125,138,19,246,151,51,118,40,72,105,185,65,141,112,52,104,47,172,210,15,35,34,104,75,114,250,230,92,11,118,208,210,90,200,14,177,12,185,9,200,225,142,213,41,126,13,154,246,113,214,161,117,143,125,109,10,154,136,251,66,248,102,163,57,128,102,90,99,204,173,209,254,234,0,23,93,119,6,34,43,172,21,228,126,6,201,211,49,12,197,162,22,188,171,211, +96,58,98,240,24,185,111,161,90,41,106,1,117,104,225,229,208,24,8,233,19,236,213,157,24,122,64,4,155,128,206,132,213,87,255,142,33,76,103,114,15,210,120,210,177,72,80,41,2,240,205,211,230,160,107,150,94,170,254,19,47,182,34,127,26,102,207,17,91,213,213,204,27,240,66,76,106,87,251,230,235,111,135,193,188,178,185,83,59,32,173,180,218,211,17,215,139,43,134,209,233,58,127,220,10,235,90,150,195,211,99,250,29,15,87,83,15,40,232,231,43,60,243,52,74,187,250,97,201,22,3,116,216,225,39,232,51,52,116,149,212,99,179,229,90,140,121,219,214,178,187,89,76,78,154,122,123,87,21,188,240,232,112,32,218,43,99,191,55,228,125,67,249,33,217,151,239,171,192,161,2,151,81,111,177,33,140,144,121,19,31,104,22,141,216,48,20,251,109,157,241,253,38,215,208,252,71,181,31,180,218,104,190,199,96,4,249,168,82,108,96,80,244,8,14,177,146,110,220,239,221,59,100,30,154,36,232,223,78,84,15,130,158,52,26,58,108,131,110,121,254,31,131,98,23,141, + diff --git a/uppsrc/ide/app.tpp/install_win32_en-us.tpp b/uppsrc/ide/app.tpp/install_win32_en-us.tpp index 14e8f0923..617df9853 100644 --- a/uppsrc/ide/app.tpp/install_win32_en-us.tpp +++ b/uppsrc/ide/app.tpp/install_win32_en-us.tpp @@ -20,12 +20,14 @@ topic "Ultimate++ Windows Installation"; [2 $$0,0#00000000000000000000000000000000:Default] [{_}%EN-US [s2; U`+`+ Windows Installation&] -[s5;po~~~320; Windows release is a simple archive [^http`:`/`/www`.7`-zip`.org`/^ .7z] +[s5; Windows release is a simple archive [^http`:`/`/www`.7`-zip`.org`/^ .7z] archive. Unpack to directory of your preference, then just run theide.exe. U`+`+ does not write anything to registry or outside its directory.&] -[s5;po~~~320; The archive contains CLANG based Win32 toolchain and -also SDL 2, OpenSSL, MySql and PostgreSQL client libraries.&] -[s5;po~~~320; U`+`+ minimum requirement is Windows 7 64 with latest -patches for theide to run and Windows 7 64 or 32 with latest -patches for applications.]] \ No newline at end of file +[s5; The archive contains CLANG based Win32 toolchain and also SDL +2, OpenSSL, MySql and PostgreSQL client libraries. TheIDE will +also setup Microsoft C`+`+ compiler if it finds one.&] +[s5; U`+`+ minimum requirement is Windows 7 64 with latest patches +for theide to run and Windows 7 64 or 32 with latest patches +for applications.&] +[s5; ]] \ No newline at end of file diff --git a/uppsrc/ide/app.tpp/install_win32_en-us.tppi b/uppsrc/ide/app.tpp/install_win32_en-us.tppi index fc9b3b187..4e8ca6ef7 100644 --- a/uppsrc/ide/app.tpp/install_win32_en-us.tppi +++ b/uppsrc/ide/app.tpp/install_win32_en-us.tppi @@ -1,8 +1,8 @@ TITLE("Ultimate++ Windows Installation") COMPRESSED -120,156,133,84,239,111,219,84,20,253,87,158,148,130,160,115,179,119,239,251,109,127,25,234,16,67,42,27,80,42,62,68,25,113,157,215,198,224,218,158,237,144,117,136,253,237,156,231,116,235,0,33,18,197,73,228,119,238,61,231,220,115,189,106,216,251,162,118,82,23,37,185,226,85,40,222,191,127,191,12,129,11,22,39,39,148,201,5,73,173,136,137,180,148,154,29,153,32,131,241,228,165,114,154,141,147,38,239,203,161,188,91,175,74,175,138,211,31,45,80,156,153,133,34,69,146,44,107,156,146,74,178,38,54,228,189,38,103,188,10,214,230,85,217,79,117,215,174,87,47,116,113,157,160,26,72,5,164,116,222,106,2,78,27,86,206,104,224,181,38,194,111,50,206,58,151,79,245,212,196,245,234,154,172,43,74,205,197,121,98,170,51,187,0,67,118,128,106,214,86,43,207,138,60,179,13,74,7,13,234,196,121,61,69,16,189,6,38,225,250,93,2,26,180,212,70,147,146,208,231,140,194,65,135,111,45,3,49,250,122,105,12,90,198,183,211,122,53,91,149,92,74,56,139,134,236, -76,58,237,181,39,229,60,107,182,12,10,210,65,106,234,111,242,109,28,43,224,20,83,49,129,84,113,254,204,20,4,176,203,220,130,101,144,108,93,64,67,208,133,100,21,2,41,143,134,154,140,36,149,87,221,54,201,100,35,213,220,209,99,24,22,149,103,87,140,37,16,102,229,209,210,145,82,184,26,237,93,62,198,52,142,169,27,214,171,126,119,250,236,11,185,148,75,54,230,203,84,32,160,128,87,90,41,109,131,38,169,208,8,85,116,242,204,74,140,148,12,251,252,186,28,209,117,210,201,221,217,89,146,128,193,124,229,141,66,115,139,11,102,11,137,10,238,112,208,94,41,47,243,170,41,199,241,19,139,78,147,76,162,140,104,225,146,179,70,177,14,201,30,197,176,152,173,9,4,143,141,213,146,243,33,190,217,215,67,188,139,45,76,174,17,145,226,195,136,30,226,8,50,199,56,114,70,140,64,26,107,101,114,204,32,17,172,12,44,151,228,53,24,225,141,49,79,15,137,188,126,212,160,50,82,139,192,90,129,73,208,26,14,160,0,5,34,146,30,111,40,131,47,115,62,8, -20,102,17,199,246,71,184,206,72,47,28,162,140,89,5,157,218,7,149,252,99,12,128,173,52,152,4,31,225,188,94,157,62,227,19,248,78,236,211,103,118,158,76,70,216,9,80,36,99,160,91,193,106,246,208,110,224,189,154,51,78,206,231,47,227,97,124,94,78,241,33,50,167,231,39,199,172,145,205,200,46,100,194,27,31,48,64,210,201,63,165,117,224,160,148,225,96,148,149,240,113,220,55,211,3,56,237,212,188,146,31,139,184,140,28,182,11,90,141,129,250,25,6,229,142,18,21,246,193,38,23,30,138,108,206,154,186,77,60,144,140,226,24,134,211,243,39,68,46,21,242,88,25,239,173,84,1,102,192,3,105,144,117,60,20,60,6,141,57,51,22,33,61,21,170,223,202,219,184,57,123,88,215,68,33,37,73,254,207,43,127,30,111,202,89,198,31,191,252,249,217,215,47,207,174,46,197,106,228,66,92,109,158,108,158,136,159,235,118,219,29,70,241,109,59,78,101,211,148,233,25,242,249,122,53,154,162,239,16,21,236,65,241,241,204,16,155,136,52,139,122,20,165,24,235,187, -190,137,162,28,170,93,253,123,20,171,215,187,105,234,55,249,230,233,230,233,225,112,216,44,221,230,236,93,221,111,150,221,112,187,121,250,90,44,221,187,245,135,195,75,113,213,38,57,98,234,196,22,65,173,176,94,247,162,187,17,247,221,126,16,253,16,111,226,16,219,42,102,98,218,197,86,252,186,31,39,49,236,219,244,175,222,198,101,124,155,42,204,236,183,93,28,69,219,77,226,48,32,44,162,108,239,167,93,221,222,166,194,67,188,173,199,41,213,29,68,183,159,70,32,69,61,141,143,13,151,255,148,249,211,238,81,78,213,181,83,89,183,163,56,191,248,234,229,55,34,45,241,54,249,160,24,181,187,166,218,225,38,218,109,69,217,140,157,184,124,126,33,56,19,175,250,216,94,94,94,100,226,187,251,203,55,205,124,251,251,110,156,110,135,120,249,195,133,168,154,26,11,41,154,250,122,40,135,58,142,255,234,127,148,116,87,183,245,221,254,78,124,178,196,201,240,15,51,112,194,106,113,168,167,157,192,172,34,140,233,203,169,218,193,133,27,232,60,26,52,171,223,31,233,253,13, -134,19,224,255,95,224,178,239,155,186,154,3,48,46,215,235,191,0,71,242,213,114, +120,156,133,84,93,111,219,70,16,252,43,7,200,45,90,135,86,110,239,251,196,151,20,118,208,6,112,146,182,110,208,7,65,169,104,234,100,93,75,147,12,121,170,226,20,205,111,239,28,37,39,233,67,81,9,162,36,240,102,119,102,118,150,203,70,56,87,70,203,85,89,145,45,95,251,242,227,199,143,115,239,69,41,216,217,25,21,124,70,92,73,18,68,138,115,37,44,105,207,189,118,228,184,180,74,104,203,245,162,175,134,234,126,181,172,156,44,207,127,54,64,137,66,207,36,73,226,100,132,194,41,46,185,80,36,52,57,167,200,106,39,189,49,139,186,234,83,236,218,213,242,7,85,222,102,168,2,82,2,201,173,51,138,128,83,90,72,171,21,240,74,17,225,55,105,107,172,93,164,152,154,176,90,222,146,177,101,165,68,121,153,153,170,194,204,192,80,88,64,149,80,70,73,39,36,57,33,140,151,202,43,80,39,177,136,41,128,232,45,48,25,215,239,50,80,163,165,210,138,36,135,62,171,37,14,90,124,43,238,73,160,175,227,90,163,101,120,159,86,203,201,170,236,82,198,25, +52,20,86,231,211,78,57,146,214,9,37,140,0,5,110,33,53,247,215,139,77,24,107,224,164,160,50,129,84,121,249,76,151,4,176,45,236,76,112,207,133,177,30,13,65,23,146,165,247,36,29,26,42,210,156,228,162,238,54,89,166,208,92,78,29,29,134,97,80,121,114,69,27,2,97,33,29,90,90,146,18,87,173,156,93,140,33,143,35,117,195,106,217,239,206,159,125,195,231,124,46,180,254,54,23,240,40,224,164,146,82,25,175,136,75,52,66,21,149,61,51,28,35,37,45,220,226,182,26,209,53,169,236,238,228,44,113,192,96,190,116,90,162,185,193,5,179,133,68,9,119,132,87,78,74,199,23,117,83,141,227,23,22,157,103,153,68,5,209,204,102,103,181,20,202,103,123,164,128,197,194,104,79,240,88,27,197,197,98,8,239,246,113,8,247,161,133,201,17,17,41,31,71,116,138,35,200,28,227,40,10,18,8,164,54,134,103,199,52,18,33,164,134,229,156,156,2,35,188,49,230,116,74,228,237,103,13,178,32,57,243,66,73,48,241,74,193,1,20,32,79,68,220,225,13,101, +240,101,202,7,129,194,36,226,216,254,8,87,5,169,153,69,148,49,43,175,114,123,47,179,127,2,3,16,134,107,76,66,28,225,98,181,60,127,38,206,224,59,9,151,63,147,243,164,11,194,78,128,34,105,13,221,18,86,11,7,237,26,222,203,41,227,100,221,226,85,56,140,87,85,10,167,200,156,95,158,29,179,70,166,32,51,227,25,175,157,199,0,73,101,255,164,82,94,120,41,181,240,90,26,14,31,199,125,147,78,224,188,83,211,74,126,42,98,11,178,216,46,104,213,26,234,39,24,148,91,202,84,132,243,38,187,112,42,178,190,104,98,155,121,32,25,229,49,12,231,151,79,136,108,46,228,176,50,206,25,46,61,204,128,7,92,35,235,120,40,56,12,26,115,22,88,132,252,84,168,255,168,238,194,250,226,180,174,153,66,78,18,255,159,215,226,42,108,171,73,198,95,191,253,253,213,243,87,23,111,110,216,114,20,37,123,179,126,178,126,194,126,141,237,166,59,140,236,69,59,166,170,105,170,252,12,249,122,181,28,117,249,233,214,16,154,128,16,179,56,178,138,141,241,190,111, +2,171,134,122,23,255,12,108,249,118,151,82,191,94,172,159,174,159,30,14,135,245,220,174,47,62,196,126,61,239,134,187,245,211,183,108,110,63,172,30,15,207,217,155,54,171,96,169,99,27,228,179,198,86,61,176,110,203,30,186,253,192,250,33,108,195,16,218,58,20,44,237,66,203,126,223,143,137,13,251,54,255,139,155,48,15,239,115,133,137,244,166,11,35,107,187,196,14,3,50,194,170,246,33,237,98,123,151,11,15,225,46,142,41,215,29,88,183,79,35,144,44,166,241,115,195,249,73,221,47,187,207,42,234,174,77,85,108,71,118,121,253,221,171,239,89,94,217,77,150,47,5,74,118,77,189,195,77,116,217,176,170,25,59,118,115,117,205,68,193,94,247,161,189,185,185,46,216,203,135,155,119,205,116,251,199,110,76,119,67,184,249,233,154,213,77,196,250,177,38,222,14,213,16,195,56,207,13,95,92,61,103,135,216,52,199,58,99,72,251,158,189,140,245,208,141,221,54,177,203,73,91,221,221,247,177,9,3,139,91,16,103,91,12,97,100,93,27,30,121,31,29,184,143,109,188, +223,223,179,47,86,61,207,231,113,100,150,25,133,78,105,199,48,209,0,31,251,42,213,59,152,182,133,45,71,63,39,179,246,71,89,255,130,225,4,116,255,23,184,234,251,38,214,83,76,198,71,74,171,213,63,251,206,228,93,