From e640caea5e54aaabbecdf2548903e01c2c1887b1 Mon Sep 17 00:00:00 2001 From: dolik Date: Sun, 30 Sep 2012 10:59:17 +0000 Subject: [PATCH] .docs: umk && flags git-svn-id: svn://ultimatepp.org/upp/trunk@5396 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/app.tpp/Flags$en-us.tpp | 114 +++++++++++++++++++++++++--- uppsrc/ide/app.tpp/Flags$en-us.tppi | 13 ++-- uppsrc/ide/app.tpp/umk$en-us.tpp | 29 ++++--- uppsrc/ide/app.tpp/umk$en-us.tppi | 13 ++-- 4 files changed, 136 insertions(+), 33 deletions(-) diff --git a/uppsrc/ide/app.tpp/Flags$en-us.tpp b/uppsrc/ide/app.tpp/Flags$en-us.tpp index b3f28e708..f146072a6 100644 --- a/uppsrc/ide/app.tpp/Flags$en-us.tpp +++ b/uppsrc/ide/app.tpp/Flags$en-us.tpp @@ -1,9 +1,105 @@ -TITLE("Build flags") -COMPRESSED -120,156,141,86,13,111,26,71,16,253,43,43,225,84,182,131,233,206,126,220,238,129,42,213,193,56,65,2,219,50,118,82,21,209,112,192,26,159,114,220,209,251,200,71,163,228,183,247,45,224,64,93,18,199,200,96,150,121,111,230,189,153,89,60,20,236,224,128,215,121,141,63,241,211,60,115,119,81,149,148,163,97,34,172,109,197,134,171,86,68,166,117,25,182,190,126,253,218,8,67,209,242,84,4,42,226,74,146,32,82,156,43,97,72,135,60,212,150,44,151,70,9,109,184,110,46,163,60,90,140,134,145,149,173,227,235,0,40,81,215,53,73,146,56,5,66,33,138,75,46,20,9,77,214,42,50,218,202,48,8,154,211,104,89,198,89,58,26,78,60,206,39,147,128,113,99,3,69,0,41,45,164,209,10,96,165,136,240,55,105,19,24,211,44,227,50,113,0,81,96,90,145,18,173,182,71,170,122,80,67,121,194,0,170,132,10,148,180,66,146,21,34,8,165,10,21,234,38,209,140,75,135,42,39,192,120,156,135,105,36,84,90,145,132,33,202,104,137,48,131,87,197,67,18,200,106, -185,214,72,232,62,62,184,228,13,242,184,0,233,132,209,62,218,42,75,210,88,161,68,32,80,0,55,80,233,179,235,230,204,21,83,224,164,160,86,137,146,90,237,223,117,139,0,54,117,83,19,60,228,34,48,33,18,162,88,8,150,97,72,210,34,161,34,205,73,54,167,217,204,139,20,154,203,85,70,139,62,4,96,94,121,162,3,66,193,66,90,164,52,36,37,158,181,178,166,89,56,223,137,50,203,71,195,227,223,15,121,131,55,132,214,71,30,30,2,110,165,146,82,5,161,34,46,145,6,28,202,251,21,112,244,146,180,176,205,73,84,32,103,169,188,179,43,87,201,15,18,140,151,86,75,164,14,240,132,166,66,160,132,55,34,84,86,74,203,155,211,36,42,138,29,131,142,189,72,162,58,81,205,120,95,181,20,42,244,230,72,1,131,69,160,67,130,195,58,80,92,52,115,247,119,21,231,110,225,82,88,28,99,54,90,15,237,217,204,33,138,89,207,161,168,147,192,36,234,32,224,222,47,141,105,16,82,195,112,78,86,161,34,60,208,226,114,51,138,147,173,6,89,39,89,11, -133,146,168,36,84,10,14,128,128,66,34,226,22,15,40,131,47,171,217,32,148,176,18,177,78,191,134,171,58,169,154,193,12,163,83,161,242,233,67,233,253,19,176,95,4,92,163,15,98,13,23,222,117,113,0,223,73,88,255,187,114,158,116,157,176,12,40,145,180,134,110,9,171,133,133,118,13,239,229,106,190,201,216,230,133,251,80,156,69,165,219,12,204,113,251,96,61,105,20,212,41,168,113,143,215,54,68,3,73,121,255,164,82,161,8,165,212,34,212,50,224,240,177,88,239,178,7,251,125,90,237,226,55,18,83,39,131,205,130,86,173,161,126,5,131,114,67,190,20,97,195,192,187,176,33,25,159,36,113,234,235,192,100,180,214,195,112,220,126,78,100,60,145,197,194,88,27,112,25,194,12,120,192,53,38,29,183,129,69,163,209,103,129,53,240,215,193,244,93,52,119,227,147,205,170,126,126,251,229,89,231,226,228,118,192,134,133,104,177,246,248,249,248,57,123,81,197,201,140,221,37,209,188,248,101,52,44,100,139,245,163,56,101,211,44,189,139,231,21,166,24,87,195,246,99,222, -98,120,97,159,63,35,65,216,52,218,16,243,135,199,108,248,140,243,19,206,89,255,102,52,106,54,87,135,27,234,5,180,196,168,225,62,119,209,204,205,88,180,92,38,241,116,197,219,120,8,221,226,95,222,118,31,19,224,232,9,208,89,175,183,5,221,68,249,220,149,44,46,88,99,150,36,191,54,138,172,49,250,242,101,91,252,195,11,148,94,86,229,178,42,217,194,149,247,217,108,175,72,69,16,169,195,191,30,39,236,188,184,125,233,83,254,246,56,103,153,177,137,99,232,220,59,72,253,16,151,247,108,230,38,213,156,189,119,121,225,157,204,238,240,225,36,143,242,216,21,94,201,94,230,241,219,126,247,162,219,63,237,237,164,232,199,105,188,136,146,13,93,156,222,101,249,98,221,156,241,9,14,151,46,157,21,12,239,162,105,89,33,108,226,173,115,121,157,85,5,222,38,159,88,92,178,226,62,171,224,231,50,207,222,199,179,85,145,142,165,213,98,130,210,254,67,8,13,171,44,115,151,255,160,196,243,219,222,110,125,231,85,178,91,220,62,224,224,213,233,117,231,108,7,115,149, -187,59,151,179,217,167,52,90,196,211,173,49,236,195,189,75,87,38,198,233,124,47,211,229,14,75,15,113,44,205,210,241,201,194,79,238,102,234,11,22,21,80,28,229,232,195,150,248,240,97,38,142,26,172,187,192,76,225,108,93,214,190,52,47,122,221,155,63,119,50,221,22,142,77,146,184,252,103,109,239,222,202,6,29,177,131,232,166,69,153,87,211,178,192,66,45,150,113,2,181,112,183,2,143,15,100,135,241,194,119,3,69,156,95,177,165,203,87,61,72,167,174,142,4,37,52,161,103,213,114,153,229,37,68,160,49,203,28,203,124,133,59,58,174,22,138,181,175,110,139,163,239,206,246,85,18,149,158,110,255,238,6,126,119,213,163,218,223,116,47,164,216,46,210,155,56,149,98,207,182,245,186,23,183,127,108,195,96,127,245,113,79,216,249,117,167,243,98,112,182,13,60,207,157,195,193,158,208,193,101,239,244,186,59,216,134,14,178,4,253,42,190,43,238,220,107,194,180,149,46,95,96,47,210,57,43,239,221,195,204,179,67,111,26,90,59,99,147,79,223,14,215,75,126,244,83, -70,244,7,109,67,219,106,250,241,52,207,138,236,174,100,175,99,191,77,155,155,211,52,232,255,82,0,181,79,34,109,131,239,185,249,218,237,45,16,111,182,19,131,161,142,253,172,78,177,195,11,252,63,194,14,165,96,89,206,2,117,180,239,6,109,183,119,187,248,152,73,138,241,201,100,67,180,7,221,121,221,30,191,61,189,238,239,211,128,129,104,119,54,18,16,178,162,133,205,249,247,104,250,221,171,193,83,60,62,230,73,162,193,43,249,20,15,66,126,130,70,61,77,163,126,68,211,189,184,233,236,124,213,116,211,210,109,122,186,51,170,163,127,1,214,167,76,35, - +topic "Build flags"; +[2 $$0,0#00000000000000000000000000000000:Default] +[l288;i704;a17;O9;~~~.992;2 $$1,0#10431211400427159095818037425705:param] +[a83;*R6 $$2,5#31310162474203024125188417583966:caption] +[b83;*2 $$3,5#07864147445237544204411237157677:title] +[b167;a42;C2 $$4,6#40027414424643823182269349404212:item] +[b42;a42;2 $$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] +[*@(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] +[{_}%EN-US +[s2; C`+`+ Build flags&] +[s3; Main configuration flags&] +[s0; &] +[ {{2429:7571 [s0;%- [* MT]] +:: [s0; Build multi`-threaded application.] +:: [s0;%- [* GUI]] +:: [s0; Build GUI application.] +:: [s0;%- [* DLL]] +:: [s0; Target is .dll/.so.]}}&] +[s0; &] +[s0; &] +[s3; Output method flags&] +[s0; &] +[ {{2441:7559^ [s0;%- [* DEBUG]] +::= [s0; Target is to be linked with debug version of libraries.] +::^ [s0;%- [* DEBUG`_MINIMAL]] +::= [s0; Minimal debug information `- depends on actual builder, usually +it should provide line numbers information to debugger.] +::^ [s0;%- [* DEBUG`_FULL]] +::= [s0; Full debug info.] +::^ [s0;%- [* SHARED]] +::= [s0; Prefer dynamic libraries when linking.] +::^ [s0;%- [* SO]] +::= [s0; Link non`-main packages as shared libraries (.dll/.so). Implies +SHARED.] +::^ [s0;%- [* BLITZ]] +::= [s0; Use blitz build.] +::^ [s0;%- [* SSE2]] +::= [s0; Instructs compiler to use SSE2 (improves FP performance, but +not supported on pre`-Pentium4 CPUs).]}}&] +[s0; &] +[s0; &] +[s3; Platform flags&] +[s0; &] +[ {{2426:7574 [s0;%- [* WIN32]] +:: [s0; Win32.] +:: [s0;%- [* POSIX]] +:: [s0; Anything else then WIN32] +:: [s0;%- [* LINUX]] +:: [s0; Linux.] +:: [s0;%- [* FREEBSD]] +:: [s0; FreeBSD.] +:: [s0;%- [* SOLARIS]] +:: [s0; Solaris.]}}&] +[s0; &] +[s0; &] +[s3; Flags determining the builder (supplied by builder method)&] +[s0; &] +[ {{2426:7574 [s0;%- [* MSC71]] +:: [s0; Microsoft Visual C`+`+ 7.1] +:: [s0;%- [* MSC8]] +:: [s0; Microsoft Visual C`+`+ 8.0] +:: [s0;%- [* GCC]] +:: [s0; GCC compiler in implicit mode (32 or 64).] +:: [s0;%- [* GCC32]] +:: [s0; GCC compiler in 32`-bit mode.] +:: [s0;%- [* EVC`_ARM]] +:: [s0; Microsoft WinCE C`+`+ ARM complier.] +:: [s0;%- [* EVC`_MIPS]] +:: [s0; Microsoft WinCE C`+`+ MIPS complier.] +:: [s0;%- [* EVC`_SH3]] +:: [s0; Microsoft WinCE C`+`+ SH3 complier.] +:: [s0;%- [* EVC`_SH4]] +:: [s0; Microsoft WinCE C`+`+ SH4 complier.] +:: [s0;%- [* INTEL]] +:: [s0; Intel C`+`+.]}}&] +[s0; &] +[s0; &] +[s3; Other flags (to be supplied by user)&] +[s0; &] +[ {{2426:7574 [s0;%- [* NOGTK]] +:: [s0; On POSIX systems, this prevents linking against GTK libraries] +:: [s0;%- [* NONAMESPACE]] +:: [s0; Create all U`+`+ classes in global namespace instead of Upp`::] +:: [s0;%- [* USEMALLOC]] +:: [s0; Use malloc to allocate memory instead of U`+`+ allocator] +:: [s0;%- [* NOAPPSQL]] +:: [s0; Do not create global SQL/SQLR instances] +:: [s0;%- [* NOMYSQL]] +:: [s0; Disable MySql package] +:: [s0;%- [* NOPOSTGRESQL]] +:: [s0; Disable PostgreSQL package]}}&] +[s0; &] +[s0; ]] \ No newline at end of file diff --git a/uppsrc/ide/app.tpp/Flags$en-us.tppi b/uppsrc/ide/app.tpp/Flags$en-us.tppi index fe0706bf5..e48f66fd6 100644 --- a/uppsrc/ide/app.tpp/Flags$en-us.tppi +++ b/uppsrc/ide/app.tpp/Flags$en-us.tppi @@ -1,9 +1,10 @@ TITLE("Build flags") COMPRESSED -120,156,141,86,13,111,26,71,16,253,43,43,225,84,182,131,233,206,126,220,238,129,42,213,193,56,65,2,219,50,118,82,21,209,112,192,26,159,114,220,209,251,200,71,163,228,183,247,45,224,64,93,18,199,200,96,150,121,111,230,189,153,89,60,20,236,224,128,215,121,141,63,241,211,60,115,119,81,149,148,163,97,34,172,109,197,134,171,86,68,166,117,25,182,190,126,253,218,8,67,209,242,84,4,42,226,74,146,32,82,156,43,97,72,135,60,212,150,44,151,70,9,109,184,110,46,163,60,90,140,134,145,149,173,227,235,0,40,81,215,53,73,146,56,5,66,33,138,75,46,20,9,77,214,42,50,218,202,48,8,154,211,104,89,198,89,58,26,78,60,206,39,147,128,113,99,3,69,0,41,45,164,209,10,96,165,136,240,55,105,19,24,211,44,227,50,113,0,81,96,90,145,18,173,182,71,170,122,80,67,121,194,0,170,132,10,148,180,66,146,21,34,8,165,10,21,234,38,209,140,75,135,42,39,192,120,156,135,105,36,84,90,145,132,33,202,104,137,48,131,87,197,67,18,200,106, -185,214,72,232,62,62,184,228,13,242,184,0,233,132,209,62,218,42,75,210,88,161,68,32,80,0,55,80,233,179,235,230,204,21,83,224,164,160,86,137,146,90,237,223,117,139,0,54,117,83,19,60,228,34,48,33,18,162,88,8,150,97,72,210,34,161,34,205,73,54,167,217,204,139,20,154,203,85,70,139,62,4,96,94,121,162,3,66,193,66,90,164,52,36,37,158,181,178,166,89,56,223,137,50,203,71,195,227,223,15,121,131,55,132,214,71,30,30,2,110,165,146,82,5,161,34,46,145,6,28,202,251,21,112,244,146,180,176,205,73,84,32,103,169,188,179,43,87,201,15,18,140,151,86,75,164,14,240,132,166,66,160,132,55,34,84,86,74,203,155,211,36,42,138,29,131,142,189,72,162,58,81,205,120,95,181,20,42,244,230,72,1,131,69,160,67,130,195,58,80,92,52,115,247,119,21,231,110,225,82,88,28,99,54,90,15,237,217,204,33,138,89,207,161,168,147,192,36,234,32,224,222,47,141,105,16,82,195,112,78,86,161,34,60,208,226,114,51,138,147,173,6,89,39,89,11, -133,146,168,36,84,10,14,128,128,66,34,226,22,15,40,131,47,171,217,32,148,176,18,177,78,191,134,171,58,169,154,193,12,163,83,161,242,233,67,233,253,19,176,95,4,92,163,15,98,13,23,222,117,113,0,223,73,88,255,187,114,158,116,157,176,12,40,145,180,134,110,9,171,133,133,118,13,239,229,106,190,201,216,230,133,251,80,156,69,165,219,12,204,113,251,96,61,105,20,212,41,168,113,143,215,54,68,3,73,121,255,164,82,161,8,165,212,34,212,50,224,240,177,88,239,178,7,251,125,90,237,226,55,18,83,39,131,205,130,86,173,161,126,5,131,114,67,190,20,97,195,192,187,176,33,25,159,36,113,234,235,192,100,180,214,195,112,220,126,78,100,60,145,197,194,88,27,112,25,194,12,120,192,53,38,29,183,129,69,163,209,103,129,53,240,215,193,244,93,52,119,227,147,205,170,126,126,251,229,89,231,226,228,118,192,134,133,104,177,246,248,249,248,57,123,81,197,201,140,221,37,209,188,248,101,52,44,100,139,245,163,56,101,211,44,189,139,231,21,166,24,87,195,246,99,222, -98,120,97,159,63,35,65,216,52,218,16,243,135,199,108,248,140,243,19,206,89,255,102,52,106,54,87,135,27,234,5,180,196,168,225,62,119,209,204,205,88,180,92,38,241,116,197,219,120,8,221,226,95,222,118,31,19,224,232,9,208,89,175,183,5,221,68,249,220,149,44,46,88,99,150,36,191,54,138,172,49,250,242,101,91,252,195,11,148,94,86,229,178,42,217,194,149,247,217,108,175,72,69,16,169,195,191,30,39,236,188,184,125,233,83,254,246,56,103,153,177,137,99,232,220,59,72,253,16,151,247,108,230,38,213,156,189,119,121,225,157,204,238,240,225,36,143,242,216,21,94,201,94,230,241,219,126,247,162,219,63,237,237,164,232,199,105,188,136,146,13,93,156,222,101,249,98,221,156,241,9,14,151,46,157,21,12,239,162,105,89,33,108,226,173,115,121,157,85,5,222,38,159,88,92,178,226,62,171,224,231,50,207,222,199,179,85,145,142,165,213,98,130,210,254,67,8,13,171,44,115,151,255,160,196,243,219,222,110,125,231,85,178,91,220,62,224,224,213,233,117,231,108,7,115,149, -187,59,151,179,217,167,52,90,196,211,173,49,236,195,189,75,87,38,198,233,124,47,211,229,14,75,15,113,44,205,210,241,201,194,79,238,102,234,11,22,21,80,28,229,232,195,150,248,240,97,38,142,26,172,187,192,76,225,108,93,214,190,52,47,122,221,155,63,119,50,221,22,142,77,146,184,252,103,109,239,222,202,6,29,177,131,232,166,69,153,87,211,178,192,66,45,150,113,2,181,112,183,2,143,15,100,135,241,194,119,3,69,156,95,177,165,203,87,61,72,167,174,142,4,37,52,161,103,213,114,153,229,37,68,160,49,203,28,203,124,133,59,58,174,22,138,181,175,110,139,163,239,206,246,85,18,149,158,110,255,238,6,126,119,213,163,218,223,116,47,164,216,46,210,155,56,149,98,207,182,245,186,23,183,127,108,195,96,127,245,113,79,216,249,117,167,243,98,112,182,13,60,207,157,195,193,158,208,193,101,239,244,186,59,216,134,14,178,4,253,42,190,43,238,220,107,194,180,149,46,95,96,47,210,57,43,239,221,195,204,179,67,111,26,90,59,99,147,79,223,14,215,75,126,244,83, -70,244,7,109,67,219,106,250,241,52,207,138,236,174,100,175,99,191,77,155,155,211,52,232,255,82,0,181,79,34,109,131,239,185,249,218,237,45,16,111,182,19,131,161,142,253,172,78,177,195,11,252,63,194,14,165,96,89,206,2,117,180,239,6,109,183,119,187,248,152,73,138,241,201,100,67,180,7,221,121,221,30,191,61,189,238,239,211,128,129,104,119,54,18,16,178,162,133,205,249,247,104,250,221,171,193,83,60,62,230,73,162,193,43,249,20,15,66,126,130,70,61,77,163,126,68,211,189,184,233,236,124,213,116,211,210,109,122,186,51,170,163,127,1,214,167,76,35, +120,156,133,86,137,114,26,71,16,253,149,169,146,147,146,100,68,230,220,153,93,42,85,145,17,114,168,112,69,136,92,42,98,22,24,161,173,236,65,246,176,163,184,236,111,207,155,5,25,132,165,8,138,107,233,247,186,251,245,49,123,195,201,171,87,180,65,143,232,11,143,224,194,222,134,85,92,78,111,98,110,76,43,210,84,182,66,166,91,67,191,245,249,243,231,166,239,243,150,163,98,160,98,84,10,198,25,147,148,74,174,153,242,169,175,12,51,84,104,201,149,166,42,88,135,121,152,76,111,66,35,90,167,87,30,80,188,161,142,4,19,140,50,143,75,88,81,65,185,100,92,49,99,36,211,202,8,223,243,130,69,184,46,163,44,157,222,204,29,206,57,19,128,81,109,60,201,0,146,138,11,173,36,192,82,50,134,239,76,105,79,235,160,140,202,216,2,196,60,221,10,37,111,181,29,82,54,188,35,132,199,53,160,146,75,79,10,195,5,51,156,123,190,144,190,68,220,140,7,81,105,17,229,28,24,135,115,48,5,135,82,73,38,32,136,212,74,192,76,227,83,82,159,113,120,53, +84,41,56,180,255,60,168,228,4,114,56,15,238,184,86,206,218,72,195,132,54,92,114,143,35,0,170,145,165,243,174,130,165,45,22,192,9,206,90,37,66,106,181,127,80,45,6,176,110,232,35,78,125,202,61,237,195,33,130,69,194,194,247,153,48,112,40,153,162,76,4,139,108,233,146,228,138,138,218,163,65,29,60,48,215,154,40,143,33,96,46,12,92,106,38,4,222,149,52,58,40,172,171,68,153,229,211,155,211,31,142,105,147,54,185,82,39,14,238,3,110,132,20,66,122,190,100,84,192,13,56,164,211,203,163,168,37,83,220,4,243,176,128,207,82,58,101,107,85,153,107,36,8,47,140,18,112,237,225,13,69,69,130,2,218,112,95,26,33,12,13,22,113,88,20,123,2,157,186,36,25,107,48,118,164,157,174,74,112,233,59,113,4,135,192,220,83,62,131,194,202,147,148,7,185,253,187,138,114,155,216,20,18,71,232,141,214,67,121,182,125,136,96,54,125,200,27,140,163,19,149,231,81,167,151,66,55,112,161,32,56,101,70,34,34,60,81,226,114,219,138,243,93,14,162,193, +196,145,207,165,64,36,190,148,80,0,4,204,103,140,81,131,39,50,131,46,117,111,48,132,80,39,177,113,191,129,203,6,147,71,26,61,140,74,249,210,185,247,133,211,143,67,126,238,81,133,58,240,13,156,59,213,249,43,232,206,184,113,175,90,121,166,26,12,195,128,16,153,82,200,91,64,106,110,144,187,130,246,162,238,111,166,77,48,176,31,138,139,176,180,219,134,57,109,191,218,116,26,243,26,204,59,162,14,175,140,143,2,50,233,244,19,82,250,220,23,66,113,95,9,143,66,199,98,51,203,14,236,230,169,158,197,47,36,186,193,52,38,11,185,42,133,236,107,24,50,215,204,133,194,141,239,57,21,182,36,179,179,56,74,93,28,232,140,214,166,25,78,219,175,25,211,142,200,96,96,140,241,168,240,33,6,52,160,10,157,142,109,96,80,104,212,153,99,12,220,58,88,252,21,174,236,236,108,59,170,31,223,125,250,166,51,56,155,140,201,77,193,91,164,61,123,61,123,77,222,84,81,188,36,183,113,184,42,190,157,222,20,162,69,250,97,148,146,69,150,222,70,171,10,93,140, +213,176,251,155,182,8,62,200,199,143,112,224,7,90,105,70,220,197,111,206,200,205,41,233,95,79,167,65,80,95,216,210,38,200,35,130,255,187,220,134,75,187,36,225,122,29,71,139,154,179,249,96,186,193,190,157,116,15,193,184,244,63,128,139,94,111,7,184,14,243,149,45,73,84,144,230,50,142,191,107,22,89,115,250,233,211,46,224,135,15,100,55,172,202,117,85,146,196,150,119,217,242,201,196,36,67,98,202,255,115,223,89,231,205,228,173,115,247,253,161,191,50,35,115,75,80,169,191,144,222,135,168,188,35,75,59,175,86,228,189,205,11,167,92,118,139,63,231,121,152,71,182,112,25,124,197,58,123,215,239,14,186,253,243,222,30,125,63,74,163,36,140,183,84,81,122,155,229,201,166,16,179,51,92,92,219,116,89,16,252,10,23,101,5,179,185,147,203,230,13,82,21,248,25,223,147,168,36,197,93,86,65,195,117,158,189,143,150,117,128,150,164,85,50,71,88,143,8,17,127,237,101,101,243,103,194,187,156,244,246,99,187,172,226,253,192,14,65,227,31,207,175,58,23,123,246, +163,220,222,218,156,44,239,211,48,137,22,59,49,200,135,59,155,214,194,69,233,234,43,150,225,30,67,15,54,36,205,210,217,89,226,58,115,219,213,5,9,11,100,25,230,208,125,71,122,252,80,255,147,38,233,38,232,29,92,219,132,116,232,226,77,175,123,253,199,158,151,73,97,201,60,142,202,127,55,114,126,21,209,184,195,247,172,187,105,81,230,213,162,44,48,40,201,58,138,145,33,148,172,192,225,12,201,113,148,56,229,225,252,114,68,214,54,175,245,78,23,182,1,242,18,185,160,62,213,122,157,229,37,130,71,17,214,57,134,116,132,221,27,85,137,36,237,209,164,56,121,182,127,71,113,88,58,186,167,103,210,115,51,41,247,226,254,181,59,16,124,55,40,191,70,169,224,7,147,52,26,142,187,191,237,76,206,211,251,242,14,53,33,54,70,58,165,171,210,134,228,17,168,215,29,76,246,64,168,81,245,207,1,239,229,85,167,243,102,124,177,51,186,204,173,197,133,3,179,241,176,119,126,213,29,239,204,198,89,140,98,22,207,42,112,233,18,71,11,150,54,79,48,40,136,20, +65,62,12,1,57,118,202,162,238,75,50,191,255,114,113,51,237,39,47,170,213,31,183,53,219,69,210,143,22,121,86,100,183,37,249,37,114,163,181,93,153,186,201,30,167,0,152,121,17,101,154,244,96,229,181,219,59,16,126,236,90,9,93,30,185,230,93,96,144,19,220,128,144,99,193,73,150,19,79,158,28,174,205,118,123,191,188,135,44,130,207,206,230,91,146,3,100,231,151,246,236,221,249,85,255,169,184,209,37,237,206,54,108,152,212,148,144,52,127,138,162,223,29,141,95,226,112,54,255,75,50,254,81,188,196,1,147,23,40,228,203,20,242,57,138,238,224,186,179,119,158,116,211,210,110,235,246,252,65,130,174,203,55,83,72,142,55,199,192,126,235,97,23,228,47,55,220,96,248,246,250,167,157,223,97,186,153,70,82,220,23,184,147,41,26,104,109,28,50,216,15,239,177,29,138,135,117,73,194,21,54,97,81,18,128,119,203,239,113,70,131,225,224,188,223,25,143,206,219,157,29,127,27,231,112,105,9,14,9,50,169,37,169,239,25,173,59,18,200,42,206,230,104,86,172,105, +91,96,199,90,226,60,224,216,118,71,216,100,189,158,5,193,99,7,147,113,7,167,86,111,184,215,196,110,135,226,220,138,179,133,219,134,245,23,231,46,177,73,150,223,63,226,171,157,111,13,112,155,124,16,249,249,104,52,254,121,175,28,23,89,189,51,23,155,232,183,129,194,226,59,188,174,106,94,183,92,191,18,160,255,251,99,150,168,8,231,177,37,253,251,241,223,241,195,49,114,136,129,252,215,111,175,58,79,2,71,89,81,174,114,139,255,190,160,15,123,99,58,253,15,56,87,247,211, diff --git a/uppsrc/ide/app.tpp/umk$en-us.tpp b/uppsrc/ide/app.tpp/umk$en-us.tpp index 71d9a56a2..287966c06 100644 --- a/uppsrc/ide/app.tpp/umk$en-us.tpp +++ b/uppsrc/ide/app.tpp/umk$en-us.tpp @@ -13,17 +13,16 @@ topic "umk"; [{_}%EN-US [s10; [+184 umk]&] [s0;3 &] -[s0; [3 umk is commandline utility to build the U`+`+ program, with +[s0; [3 Umk is commandline utility to build the U`+`+ program, with U`+`+ assembly/package/build method system.]&] [s0;3 &] -[s0;i224;O9; [*C3 umk ][*C@(0.0.255)3 assembly package][*C@4;3 ][*C3 `[`-`[][*C@4;3 a][*C3 `]`[][*C@4;3 b -][*C3 `]`[][*C@4;3 e][*C3 `]`[][*C@4;3 r][*C3 `]`[][*C@4;3 s][*C3 `]`[][*C@4;3 S][*C3 `]`[][*C@4;3 v][*C3 `] -`[][*C@4;3 1][*C3 `]`[][*C@4;3 2][*C3 `]`[][*C@4;3 m][*C3 `]`[][*C@4;3 d][*C3 `]`[][*C@4;3 M][*C3 `]`[ -][*C@4;3 l][*C3 `]`[][*C@4;3 x][*C3 `]`[][*C@4;3 X][*C3 `]`[][%-*C@4;3 H][%-*/C@3;3 n][*C3 `]`]][*C@4;3 -][*C3 `[`+][*C@(0.0.255)3 FLAG][*C3 `[,][*C@(0.0.255)3 FLAG][*C3 `]...`]][*C@4;3 -][*C3 `[][*C@(0.0.255)3 out][*C3 `]]&] +[s0;i224;O9; [*C3 umk ][*C@(0.0.255)3 assembly package build`_method][*C@4;3 +][*C3 `[`-`[][*C@4;3 a][*C3 `]`[][*C@4;3 b][*C3 `]`[][*C@4;3 e][*C3 `]`[][*C@4;3 r][*C3 `]`[][*C@4;3 s +][*C3 `]`[][*C@4;3 S][*C3 `]`[][*C@4;3 v][*C3 `]`[][*C@4;3 1][*C3 `]`[][*C@4;3 2][*C3 `]`[][*C@4;3 m][*C3 `] +`[][*C@4;3 d][*C3 `]`[][*C@4;3 M][*C3 `]`[][*C@4;3 l][*C3 `]`[][*C@4;3 x][*C3 `]`[][*C@4;3 X][*C3 `]`[ +][%-*C@4;3 H][%-*/C@3;3 n][*C3 `]`]][*C@4;3 ][*C3 `[`+][*C@(0.0.255)3 FLAG][*C3 `[,][*C@(0.0.255)3 F +LAG][*C3 `]...`]][*C@4;3 ][*C3 `[][*C@(0.0.255)3 out][*C3 `]]&] [s0;3 &] -[s0; [3 where ][*C@(0.0.255)3 out][3 is the output directory or file and]&] [s0;3 &] [s0; [*C@(0.0.255)3 assembly][3 can be a predefined assembly (in .var file) which is in Win32 in directory where is located umk.exe @@ -40,8 +39,9 @@ build method (which is then searched for in ][@3;3 `~][3 , ][@3;3 `~/.upp/umk][3 ][@3;3 `~/.upp/theide][3 ][@3;3 `~/.upp/theide][3 directories) or it is a direct path to the .bm file.]&] [s0;*C@4;3 &] -[s0; [*C@(0.0.255)3 FLAG][3 are compilation flags. If flags are not -specified, the first main configuration entry is used.]&] +[s0; [*C@(0.0.255)3 FLAG][3 s are ][^topic`:`/`/ide`/app`/Flags`$en`-us^3 compilation +flags][3 . If flags are not specified, the first main configuration +entry in .upp file is used.]&] [s0;3 &] [s0; [*C@(0.0.255)3 out][3 is output file or directory]&] [s0;*C@4;3 &] @@ -89,7 +89,12 @@ is number of logical cores available.]]}}&] [s0;3 &] [s0; [3 Examples:]&] [s0;3 &] -[s0; [*C@5+92 umk examples Bombs GCC `-ab `+GUI,SHARED `~/bombs`\n]&] -[s0; [*C@5+92 umk examples,uppsrc Bombs `~/GCC.bm `-rv `+GUI,SHARED +[s0; [*C@5+92 umk uppsrc ide GCC `-br `+GUI,SSE2,SHARED `~/theide]&] +[s0; [*C@5+92 umk uppsrc ide /usr/share/upp/GCC.bm `-br `+GUI,SSE2,SHARED +`~/theide]&] +[s0;*C@5+92 &] +[s0; [*C@5+92 umk examples Bombs GCC `-ab `+GUI,SHARED `~/bombs]&] +[s0; [*C@5+92 umk upp/examples,upp/uppsrc Bombs `~/GCC.bm `-rv `+GUI,SHARED `~/bin]&] +[s0; &] [s0; ]] \ No newline at end of file diff --git a/uppsrc/ide/app.tpp/umk$en-us.tppi b/uppsrc/ide/app.tpp/umk$en-us.tppi index 43853661a..11a27ba5e 100644 --- a/uppsrc/ide/app.tpp/umk$en-us.tppi +++ b/uppsrc/ide/app.tpp/umk$en-us.tppi @@ -1,9 +1,10 @@ TITLE("umk") COMPRESSED -120,156,173,87,11,79,220,70,16,254,43,43,145,180,16,140,217,93,191,239,84,137,4,104,130,154,71,21,138,26,245,234,230,214,246,222,221,22,191,234,221,35,208,40,252,246,206,218,198,224,187,77,168,212,70,17,220,141,231,251,230,61,99,102,20,61,121,130,45,188,131,31,249,55,57,225,11,182,206,85,60,19,174,27,78,25,245,166,151,63,189,139,166,26,79,0,239,4,196,9,61,135,184,212,135,31,196,33,212,163,142,75,66,26,185,161,227,132,120,146,230,76,202,120,150,211,48,108,65,212,162,59,52,240,40,9,220,208,13,137,19,132,20,176,20,99,138,3,234,17,215,9,169,55,201,184,76,227,25,6,117,7,108,68,190,19,97,130,113,64,8,118,104,128,29,207,37,196,161,64,65,3,74,176,55,225,101,22,207,94,249,83,13,112,117,80,158,15,174,251,192,230,186,24,216,53,204,117,136,131,169,227,145,200,243,39,9,95,138,210,20,146,247,104,72,1,158,8,197,139,62,34,230,78,159,29,121,83,2,80,223,242,119,2,48,235,122,96,44,210,17,57,0,163,212,247, -34,226,185,224,146,139,233,164,225,127,173,69,195,11,94,170,158,65,16,66,201,52,33,193,20,92,184,189,189,181,137,139,187,76,5,224,11,193,224,55,37,32,131,56,2,226,69,56,242,66,18,98,39,112,169,23,64,232,53,107,88,209,71,146,184,116,218,199,17,90,225,142,79,124,200,40,14,193,127,47,2,2,12,65,192,111,72,164,7,255,157,112,162,122,176,198,105,80,100,69,59,144,36,199,195,65,132,3,55,240,92,136,132,18,159,64,34,177,142,31,202,48,41,171,166,96,121,60,99,161,51,125,246,222,215,109,160,251,8,178,75,48,241,169,11,142,97,72,180,11,86,73,24,186,36,240,66,39,242,253,73,202,106,37,42,72,250,231,143,95,158,158,190,61,184,56,71,51,73,240,20,205,246,73,232,162,117,113,25,127,23,207,36,158,58,168,251,141,102,142,150,34,33,81,90,21,5,43,179,92,148,28,173,149,200,133,186,65,170,66,201,90,228,25,82,43,142,46,230,251,243,125,84,55,213,18,2,178,208,39,161,86,189,12,154,143,23,73,126,115,88,179,244,146,45,249, -97,7,42,184,90,85,25,146,55,18,106,105,111,88,22,148,186,58,145,104,246,236,184,243,33,134,79,71,187,216,198,54,228,114,207,25,88,81,207,218,62,119,129,160,213,116,208,124,54,63,152,207,6,41,235,165,241,3,89,98,144,113,131,172,49,200,164,65,118,110,144,93,25,100,196,32,163,6,89,97,144,101,6,217,27,131,44,55,200,174,13,178,15,15,101,79,15,122,233,171,246,243,225,241,145,3,95,202,65,37,54,36,121,127,179,48,63,190,126,254,242,238,169,245,141,135,177,109,219,38,198,77,72,181,86,119,8,67,123,126,90,241,134,111,53,71,139,1,78,104,92,221,155,240,181,94,43,148,193,216,167,170,106,110,80,213,160,133,200,57,130,142,222,226,52,183,89,75,151,178,18,37,128,130,54,231,25,95,192,44,100,247,125,184,43,74,100,95,177,142,121,15,28,19,233,74,59,0,226,95,69,233,80,253,225,222,131,206,111,120,156,87,41,83,192,3,61,110,243,107,174,93,3,197,159,223,157,159,125,232,103,67,62,68,10,46,33,218,182,46,243,91,237,148,117,255, -245,208,94,215,245,161,30,99,147,28,18,33,50,222,198,1,54,190,250,208,70,207,115,197,155,146,41,113,197,243,27,11,9,165,221,100,189,7,72,114,133,170,197,200,31,181,98,10,53,28,146,34,97,169,110,76,61,0,244,142,211,33,38,55,104,254,189,53,255,126,115,216,55,115,62,76,244,125,5,11,6,57,232,229,104,151,221,237,153,97,5,237,61,66,217,42,205,63,118,59,231,142,120,180,135,218,32,180,181,74,151,120,45,193,223,209,126,131,224,224,6,139,114,137,160,74,233,90,177,36,231,22,146,53,79,197,66,128,50,135,133,199,27,8,27,149,172,224,58,69,35,250,221,161,31,64,173,132,164,176,38,93,1,108,209,213,251,63,151,244,235,79,30,84,106,175,237,174,113,61,107,6,139,26,34,213,49,218,73,209,118,239,93,129,250,209,52,167,180,27,101,48,192,160,145,225,60,212,34,103,250,188,160,69,206,150,210,70,103,139,238,83,251,188,172,212,125,174,172,214,216,66,52,82,117,133,77,171,114,33,150,235,166,195,67,15,193,128,128,143,186,8,143,245,202,131, -73,239,167,188,29,108,136,115,152,181,173,96,208,231,207,4,135,209,36,140,8,89,145,233,17,65,119,219,228,93,119,32,227,201,100,16,157,192,123,80,35,6,249,31,71,20,13,126,116,135,5,164,63,12,234,239,121,87,118,150,231,118,171,63,214,78,198,218,23,146,163,23,175,207,126,249,205,164,203,199,186,103,125,71,233,22,92,48,145,75,232,62,85,213,221,165,45,184,148,122,52,146,234,218,68,149,143,169,206,33,69,48,168,69,149,113,147,118,49,214,62,110,56,140,47,116,76,193,234,190,61,182,49,205,102,26,114,206,32,56,109,2,205,15,218,196,194,59,139,9,73,190,141,60,23,127,27,13,210,71,96,53,215,205,179,141,203,198,184,19,168,215,178,67,233,68,86,250,76,180,34,121,83,36,85,46,77,20,114,187,136,114,5,93,158,161,92,36,13,211,147,102,130,157,63,14,211,7,169,223,27,176,72,254,13,233,213,152,244,5,71,87,188,73,42,105,204,217,27,99,97,11,118,201,219,161,217,133,53,208,126,128,115,218,234,247,195,181,103,226,186,30,115,157,94,215, -85,163,244,94,254,83,111,21,77,117,127,236,54,249,44,216,161,173,122,85,194,129,208,38,239,134,125,219,206,135,255,195,14,76,99,103,198,24,201,27,163,137,81,90,190,110,227,1,227,211,131,129,243,114,163,203,170,118,3,102,208,164,144,112,197,154,37,87,95,231,212,47,7,101,239,58,76,187,217,2,188,162,221,191,160,141,140,189,93,23,9,92,34,184,64,106,5,21,206,186,220,182,151,102,88,32,187,18,126,66,108,153,88,10,181,103,163,254,79,76,189,70,203,1,158,87,75,145,178,28,214,115,163,91,243,10,150,142,190,122,224,207,151,47,227,173,252,240,141,236,244,154,21,53,164,122,98,218,220,222,126,68,219,215,121,222,107,161,23,85,145,72,244,242,248,24,166,150,37,104,190,255,242,226,204,58,127,245,252,253,233,137,190,102,137,126,60,255,189,140,191,69,98,193,201,147,77,218,115,1,10,232,244,45,155,31,52,87,219,140,98,32,139,227,127,0,183,189,143,227, +120,156,173,87,11,111,219,54,16,254,43,4,210,174,73,163,216,124,232,105,99,64,218,36,109,131,245,49,212,11,86,204,80,39,74,162,109,46,122,77,148,221,100,69,243,219,119,148,100,39,118,152,166,192,22,4,177,124,226,125,247,250,238,142,153,82,244,228,9,182,240,30,126,228,103,116,42,102,124,153,53,225,84,218,182,63,230,212,25,95,254,242,33,24,107,125,2,250,204,35,204,119,24,177,169,11,127,8,35,212,161,204,38,62,13,108,159,49,31,143,146,140,43,21,78,51,234,251,173,18,181,232,30,245,28,74,60,219,183,125,194,60,159,130,46,197,152,98,143,58,196,102,62,117,70,169,80,73,56,197,112,156,129,141,192,101,1,38,24,123,132,96,70,61,204,28,155,16,70,1,130,122,148,96,103,36,138,52,156,190,113,199,90,193,214,65,57,46,184,238,2,154,109,99,64,215,106,54,35,12,83,230,144,192,113,71,177,152,203,194,20,146,243,104,72,30,30,201,70,228,125,68,220,30,63,63,118,198,4,84,93,203,221,243,192,172,237,128,177,64,71,196,64,141,82,215, +9,136,99,131,75,54,166,163,90,252,189,148,181,200,69,209,244,8,146,16,74,198,49,241,198,224,194,205,205,205,128,216,184,203,148,7,190,16,12,126,83,2,50,136,195,35,78,128,3,199,39,62,102,158,77,29,15,66,175,120,205,243,62,146,216,166,227,62,14,223,242,247,92,226,66,70,177,15,254,59,1,0,96,8,2,62,33,145,14,252,50,127,212,244,202,90,79,43,5,86,176,7,73,98,14,246,2,236,217,158,99,67,36,148,184,4,18,137,117,252,80,134,81,81,214,57,207,194,41,247,217,248,249,71,87,211,64,243,8,178,75,48,113,169,13,142,97,72,180,13,86,137,239,219,196,115,124,22,184,238,40,225,85,35,75,72,250,215,63,191,61,61,123,127,116,49,65,83,69,240,24,77,15,137,111,163,101,126,25,254,20,78,21,30,51,212,125,162,41,67,23,249,37,146,10,37,101,158,243,34,205,100,33,208,178,145,153,108,174,81,83,162,120,41,179,20,53,11,129,46,162,195,232,16,85,117,57,135,128,44,244,69,54,139,94,6,228,19,121,156,93,15,43,158,92,242, +185,24,118,74,185,104,22,101,138,212,181,130,90,14,118,44,75,74,109,157,72,52,125,126,194,180,103,40,132,167,227,125,60,192,3,200,229,1,219,160,162,30,181,115,37,250,179,131,109,79,219,0,215,234,49,20,77,163,163,104,186,145,242,94,26,222,145,197,6,153,48,200,106,131,76,25,100,19,131,108,101,144,17,131,140,26,100,185,65,150,26,100,239,12,178,204,32,187,50,200,62,221,149,61,61,234,165,111,218,231,225,201,49,131,47,197,230,72,104,72,242,225,110,153,94,189,125,241,122,253,214,250,206,203,112,48,24,152,16,119,85,202,101,179,214,216,161,204,45,105,205,68,9,129,204,40,225,5,138,5,226,64,84,145,138,25,176,57,189,101,210,190,44,208,96,197,107,52,147,153,56,64,95,22,50,89,104,238,131,248,119,89,48,170,31,82,24,29,73,83,214,215,240,90,212,66,191,206,202,132,55,128,3,44,29,136,43,129,202,90,31,252,245,195,228,252,83,207,110,117,87,83,10,5,209,181,185,140,110,180,83,214,237,215,225,96,89,85,67,221,136,38,57,180,153,76, +69,27,7,216,120,240,229,0,189,200,26,81,23,188,145,43,145,93,91,72,54,218,77,222,123,128,148,104,80,57,219,242,167,89,240,6,213,2,146,162,96,44,238,244,45,40,232,41,165,67,140,175,81,244,204,138,158,237,182,235,110,206,251,158,108,93,149,170,157,15,57,135,28,172,123,117,159,175,39,197,102,136,28,60,2,185,211,222,29,240,214,36,105,131,208,214,74,93,226,165,2,127,183,38,20,4,7,91,84,22,115,4,85,74,150,13,143,51,97,33,85,137,68,206,36,28,22,48,178,68,13,97,163,130,231,66,167,104,11,126,127,195,7,56,86,64,82,120,157,44,64,109,214,213,251,63,151,244,225,55,119,42,117,208,178,107,187,158,21,135,81,11,145,234,24,7,113,222,178,119,93,160,190,157,204,41,237,218,15,166,23,226,192,228,112,250,185,41,43,153,68,163,104,24,13,193,118,52,228,85,21,13,95,101,124,174,162,39,162,136,142,150,234,51,211,155,160,146,25,215,155,4,205,244,187,142,115,231,179,238,91,139,85,148,205,109,98,173,214,179,153,172,85,211,177,32, +41,139,153,156,47,235,14,3,8,7,221,164,91,15,194,110,157,215,209,233,242,61,198,178,118,22,116,68,128,199,106,217,116,218,144,161,77,151,222,75,3,250,250,149,96,63,24,249,1,33,11,50,62,38,104,189,232,62,116,203,49,28,141,54,162,83,184,3,213,114,35,255,124,76,209,198,143,110,141,128,244,231,205,241,143,162,35,12,207,178,65,123,126,251,116,188,125,250,66,9,244,242,237,249,111,127,152,206,138,237,179,231,61,23,53,121,103,92,102,10,120,11,197,234,182,108,46,148,106,23,96,121,101,130,202,182,161,38,144,34,104,241,188,76,133,233,116,190,125,250,164,22,208,248,192,181,156,87,61,177,238,235,212,187,105,200,4,135,224,180,9,20,29,181,137,133,251,138,73,147,124,95,115,34,255,49,26,164,143,168,85,66,147,231,190,94,186,173,119,10,245,154,119,90,58,145,192,33,148,182,34,117,157,199,101,166,76,16,234,126,17,213,2,40,159,162,76,198,53,215,61,106,82,155,60,174,134,224,122,213,79,28,24,65,63,2,186,218,6,125,41,208,74,212,113,169, +140,57,123,103,44,108,206,47,69,219,52,251,48,64,218,7,216,174,237,249,190,185,14,76,88,87,219,88,103,87,85,89,55,122,162,255,165,231,145,134,186,93,147,187,120,22,76,223,246,120,89,192,106,209,38,215,205,126,223,206,167,255,195,14,116,99,103,198,24,201,59,163,137,173,180,60,108,227,14,226,211,163,13,230,229,14,203,202,118,28,166,64,82,72,120,195,235,57,236,223,7,49,245,181,162,232,93,135,110,55,91,128,11,217,237,117,108,203,216,251,101,30,195,14,131,221,213,44,160,194,105,151,219,118,71,109,6,200,190,130,191,16,91,42,231,178,57,24,160,254,223,75,61,70,139,141,122,86,206,101,194,51,152,213,181,166,230,10,134,142,222,151,224,207,183,111,15,221,187,116,250,120,94,65,170,71,166,201,237,28,6,180,189,202,195,156,87,117,130,96,197,160,215,39,39,208,177,113,141,162,195,215,23,231,214,100,114,70,173,201,155,23,31,207,78,245,34,236,119,224,35,24,195,165,170,135,109,191,12,245,226,4,72,189,5,127,16,117,141,105,178,33,250,104,208,203, +50,143,85,239,43,143,215,168,27,192,88,191,126,200,203,225,26,197,106,239,1,157,219,29,32,168,110,156,173,87,247,97,225,255,227,30,180,255,8,195,127,1,236,20,199,3,