diff --git a/uppsrc/ide/app.tpp/umk_en-us.tpp b/uppsrc/ide/app.tpp/umk_en-us.tpp index a1209c824..4d35f33d2 100644 --- a/uppsrc/ide/app.tpp/umk_en-us.tpp +++ b/uppsrc/ide/app.tpp/umk_en-us.tpp @@ -64,6 +64,11 @@ only the logic related to UppHub. However, please note that even when this option is active, you must still specify either the ][*@N `-][*C@4;3 U][@N or ][*@N `-][*C@4;3 h][@N option to indicate how UMK should handle UppHub.]&] +[s11;l256;i150;O0; [*@(0.0.255) `-`-out`-dir] [@N specifies the directory +where UMK stores build artifacts, using the second parameter, +][*@(0.0.255) dir][@N , to define the path.] While UMK and TheIDE +share a global output directory by default, using this flag allows +you to isolate build files for specific projects or environments.&] [s11;l128;i160;O0; Additional UMK build options are listed below. If using multiple options, they must be combined into a single argument, such as `-[*@4 brU]). If no parameters are provided, diff --git a/uppsrc/ide/app.tpp/umk_en-us.tppi b/uppsrc/ide/app.tpp/umk_en-us.tppi index 57e032a35..622503e2f 100644 --- a/uppsrc/ide/app.tpp/umk_en-us.tppi +++ b/uppsrc/ide/app.tpp/umk_en-us.tppi @@ -1,15 +1,15 @@ TITLE("UMK - Command line builder") COMPRESSED -120,156,173,89,11,115,211,72,18,254,43,115,21,246,72,192,145,53,122,248,121,91,5,4,150,112,11,225,138,144,186,173,75,57,72,150,199,182,136,30,94,141,148,71,109,45,191,253,190,158,25,201,150,35,22,184,58,138,36,242,104,186,167,159,95,119,143,47,99,207,27,77,67,199,159,94,255,250,126,60,117,216,163,71,188,103,31,184,67,238,142,124,151,123,206,0,191,184,203,29,223,113,61,62,114,198,222,200,117,71,246,36,74,66,41,103,151,137,51,26,41,34,167,231,28,56,67,223,225,67,111,228,141,184,59,28,57,160,117,108,219,177,135,142,207,61,119,228,248,147,133,144,209,236,210,198,118,23,103,140,7,238,216,230,182,61,228,220,118,157,161,237,250,30,231,174,3,22,206,208,225,182,63,17,217,98,118,121,58,152,18,129,7,2,219,31,216,182,61,0,55,207,179,193,157,200,60,151,187,182,227,250,124,236,15,38,115,177,138,179,217,229,67,149,252,111,170,52,180,39,113,41,82,163,81,232,77,159,60,243,167,28,164,131,222,224,96,136,99,61,31,135,141,73,35,23, -100,142,51,240,199,220,247,32,146,103,59,147,66,252,94,197,133,72,69,86,26,14,49,231,14,159,206,249,112,10,17,190,124,249,98,113,207,214,150,26,66,22,110,67,110,135,99,13,122,12,185,63,182,199,254,136,143,108,119,232,57,254,16,170,111,194,34,76,141,38,115,207,153,26,61,70,189,209,193,128,15,96,81,123,4,249,253,49,24,216,80,2,127,97,72,31,255,221,209,164,52,196,68,71,68,227,222,248,0,70,114,125,123,56,182,135,222,208,247,160,137,195,7,28,134,180,73,127,184,97,146,229,69,26,38,179,203,112,228,78,159,124,24,80,24,216,100,52,216,201,230,3,199,131,96,54,12,237,225,84,62,26,121,124,232,143,220,241,96,48,137,194,77,25,231,153,62,45,196,207,102,173,98,136,247,56,63,240,224,81,151,108,55,244,97,50,174,206,182,199,220,241,96,118,219,247,135,147,82,220,193,96,167,222,116,78,199,122,68,232,16,161,61,28,13,60,142,67,61,248,8,68,56,28,52,28,207,220,31,14,134,32,140,203,68,204,46,233,40,18,211,254,198,191,201,75, -177,12,171,4,103,253,241,233,207,159,94,157,29,95,156,179,75,201,237,41,187,120,247,43,11,142,217,73,158,166,97,182,96,73,156,9,54,175,226,100,33,138,191,207,176,197,153,178,143,225,60,17,44,95,178,40,207,74,120,88,210,11,144,154,63,151,87,101,190,137,163,96,18,244,131,126,188,16,65,63,220,108,130,126,149,94,7,159,68,22,28,87,50,56,224,87,140,91,12,66,196,89,172,204,245,3,180,206,21,115,172,182,128,49,228,40,150,97,36,126,132,143,123,197,92,139,189,186,11,211,77,34,228,143,80,122,87,204,179,216,7,145,132,165,88,48,181,191,161,55,70,154,240,73,91,67,181,206,193,255,9,153,120,198,14,47,130,167,193,83,246,46,252,85,28,177,88,178,16,214,220,209,168,42,227,36,46,239,193,92,91,159,149,107,193,52,201,166,200,87,136,231,30,187,141,203,181,89,3,246,136,116,158,220,247,55,97,116,29,174,68,95,19,165,162,92,231,11,38,239,37,82,217,170,69,115,38,95,55,96,45,230,11,145,228,183,29,114,53,27,201,255,80,100,210,242, -125,194,29,100,186,227,120,148,159,80,245,196,101,48,28,155,225,233,217,161,109,217,22,82,244,200,109,164,101,70,90,181,193,101,193,229,254,70,165,69,240,73,171,97,54,205,58,246,5,199,193,241,186,154,7,199,139,184,96,248,249,158,173,121,150,220,215,251,212,38,111,234,178,70,18,108,187,108,86,195,122,223,206,218,188,99,173,234,88,43,58,214,100,199,218,121,199,218,77,199,90,218,177,182,232,88,123,215,181,22,252,140,231,254,201,51,151,24,133,215,8,78,2,141,7,251,146,142,181,235,142,181,207,29,107,235,142,181,139,142,181,187,142,181,223,118,215,126,58,54,171,167,234,217,72,157,53,91,102,150,213,225,182,167,251,254,254,229,237,243,215,245,219,222,95,188,4,187,174,56,216,167,200,171,242,47,130,235,111,250,93,199,155,162,202,194,98,213,58,75,167,140,203,234,148,123,43,202,224,177,100,37,252,66,89,151,228,82,20,44,201,243,107,22,150,44,76,18,22,222,132,113,162,177,87,213,24,57,49,164,58,237,184,111,79,223,19,130,61,217,30,220,164,218,76,231, -50,114,67,68,37,147,162,164,252,173,211,47,19,178,52,175,242,34,22,146,21,4,109,241,141,32,248,185,205,139,235,56,91,53,239,129,73,107,8,84,136,77,33,36,208,127,15,129,192,155,202,45,1,227,252,158,5,143,123,193,99,139,61,79,128,26,153,98,137,29,113,201,162,48,99,115,82,19,76,22,132,145,216,222,112,56,140,51,102,221,132,5,163,240,60,98,183,235,56,90,147,248,88,254,119,156,185,14,61,108,165,185,93,139,66,208,235,36,143,212,177,64,28,75,220,193,72,5,109,252,215,251,243,55,191,25,4,148,187,148,164,231,229,51,151,89,168,98,203,120,213,175,72,141,190,130,43,80,62,124,3,0,70,57,152,17,91,99,197,77,8,252,133,133,26,89,173,111,251,163,65,60,8,76,144,158,134,16,169,94,60,12,107,112,111,112,255,232,59,120,182,81,146,76,209,66,127,229,46,58,46,39,147,87,82,149,172,157,170,2,55,162,19,32,23,195,106,81,85,82,132,245,152,220,136,40,94,198,216,44,80,102,16,137,161,100,89,152,42,220,111,177,63,108,252,131, -109,25,220,31,22,209,26,100,75,109,255,255,197,196,59,46,58,82,110,44,91,209,91,219,157,132,183,230,169,54,61,123,179,100,89,94,110,229,238,81,169,61,121,251,252,236,245,172,45,48,177,146,178,74,197,194,98,103,121,41,140,129,76,168,244,84,197,10,171,50,79,17,175,17,242,238,158,69,133,64,100,201,29,134,84,15,241,233,245,201,73,155,57,34,108,73,114,221,179,69,174,196,17,119,177,44,187,125,248,124,177,80,157,65,152,152,124,198,131,234,84,5,146,101,155,219,142,63,248,138,223,119,171,222,12,230,60,107,148,215,177,181,159,35,23,155,205,105,53,175,163,77,50,185,206,43,72,142,160,88,228,183,89,146,135,11,178,90,37,41,20,136,94,10,120,103,177,149,169,71,168,184,115,190,42,180,56,181,71,206,32,72,33,34,114,142,197,62,174,97,101,145,201,10,193,181,61,48,132,16,215,98,163,140,77,125,69,38,97,28,130,16,149,186,176,64,19,171,113,182,16,27,140,59,244,50,87,22,101,81,85,20,244,17,25,242,153,162,128,92,240,113,45,222,188,124, -197,116,16,85,133,226,97,205,126,192,114,170,9,80,166,139,51,89,22,85,84,74,213,1,67,161,53,14,32,168,197,14,117,126,146,175,226,72,35,163,206,32,109,78,139,157,230,183,226,134,172,131,54,50,148,130,220,110,98,10,203,25,217,158,244,130,82,218,203,42,254,34,130,194,30,187,207,43,150,86,0,95,137,118,47,49,238,187,175,51,142,78,37,139,159,65,222,221,90,138,5,202,138,7,175,214,230,149,62,6,18,194,138,49,97,34,91,163,151,35,181,140,199,141,106,70,129,89,59,58,7,15,162,147,40,117,144,155,186,163,28,153,144,239,40,122,208,40,170,236,211,129,147,18,150,108,182,53,170,167,211,65,105,137,72,67,51,57,87,104,143,70,50,71,16,16,13,54,163,54,86,52,44,2,119,42,128,9,176,38,56,134,122,30,155,23,23,179,35,147,220,59,217,161,36,64,36,220,196,42,102,73,194,91,178,224,22,213,234,48,33,196,23,243,10,130,229,11,161,91,102,121,159,206,243,68,82,125,90,232,49,136,18,148,253,241,7,31,115,111,50,178,71,131,127,56, -24,191,214,124,250,140,51,61,20,184,236,189,30,235,102,147,73,179,244,18,211,123,17,55,235,87,207,28,243,170,105,27,177,250,115,179,253,131,208,210,1,82,44,181,191,189,123,222,222,125,129,72,122,241,246,205,199,255,116,237,77,218,123,207,1,128,200,12,210,176,107,119,245,144,115,9,131,139,109,205,191,239,34,75,219,100,39,10,4,225,178,52,220,104,200,237,160,41,246,85,214,41,161,108,127,104,140,77,9,176,239,146,101,5,231,169,197,163,46,182,139,54,219,151,109,106,244,100,134,161,241,108,23,11,249,208,8,114,141,40,162,185,102,94,132,84,107,186,200,206,191,77,166,144,200,184,86,126,23,211,155,54,211,23,130,1,63,230,232,247,186,54,191,235,116,67,221,189,179,67,164,145,122,0,12,96,115,211,212,187,172,109,201,166,157,238,30,2,186,207,80,140,149,131,86,49,97,25,53,0,59,92,127,58,110,164,60,221,242,204,218,204,206,170,116,14,48,83,40,14,190,40,145,170,5,161,246,64,25,13,0,160,230,228,58,52,178,102,191,66,92,224,79,148,83,21, -105,186,223,110,1,214,237,83,1,24,166,63,213,5,125,129,72,164,18,30,19,192,235,58,184,204,233,82,131,106,149,200,122,53,76,83,157,36,108,9,51,96,86,44,21,164,53,245,75,129,186,105,93,151,121,149,17,138,25,110,6,230,136,148,42,9,114,188,198,56,186,57,120,188,119,40,59,4,246,172,168,15,78,242,76,16,190,101,44,87,152,143,110,123,33,91,229,130,92,132,176,66,37,213,231,83,253,1,150,34,98,164,194,98,154,195,247,10,187,185,125,219,233,243,72,174,109,145,239,182,224,197,158,5,181,26,15,173,176,44,242,180,62,146,66,191,218,44,20,48,96,175,89,165,121,66,214,29,218,158,188,22,187,200,146,248,90,152,234,214,132,229,154,66,214,232,220,211,6,168,47,30,20,178,83,51,165,157,168,124,99,186,1,154,38,26,115,239,153,161,91,203,207,109,45,95,139,76,208,180,2,81,174,214,101,185,145,250,226,39,74,194,108,21,88,73,114,147,6,86,94,172,130,254,34,143,100,208,255,231,249,251,179,147,60,221,196,137,234,53,94,134,232,150,1,112, -129,181,46,211,228,202,37,145,241,78,4,159,140,236,210,250,44,77,117,216,23,228,174,45,200,171,187,77,94,52,221,13,28,158,87,69,100,192,5,103,171,234,24,54,165,102,159,217,111,157,204,64,18,23,77,41,236,36,188,222,71,86,101,225,253,242,128,128,71,190,110,139,170,80,252,103,179,63,255,252,246,116,98,102,108,0,176,138,194,175,220,175,253,146,132,43,25,60,210,55,108,87,198,142,186,39,92,210,171,153,234,1,212,163,98,179,215,234,83,48,45,227,2,113,166,6,170,86,67,72,102,40,40,78,152,85,109,116,233,34,156,81,40,180,211,2,40,108,87,110,83,161,27,173,137,81,211,205,168,147,183,221,137,234,77,130,167,175,47,222,244,206,79,159,127,120,245,114,246,29,115,26,221,29,176,28,137,80,64,111,73,31,55,168,92,132,169,61,45,85,51,90,82,69,254,10,191,189,251,6,204,29,97,166,219,253,246,44,135,46,43,132,214,219,30,63,76,100,110,38,60,26,182,151,104,163,72,29,196,152,68,245,213,56,81,119,255,205,60,82,247,101,210,16,60,60, -63,212,152,218,108,180,246,238,65,221,201,238,45,107,125,215,113,174,62,226,52,26,123,245,77,226,238,8,175,154,74,115,181,136,19,253,167,99,103,247,134,81,137,161,22,9,218,225,84,89,68,12,54,165,121,12,141,227,188,168,93,115,254,202,49,254,97,193,151,122,188,252,30,70,253,74,22,125,85,202,251,88,237,131,47,13,154,63,194,250,155,98,11,99,18,246,2,45,177,52,162,135,243,86,84,17,235,57,189,254,75,161,251,53,171,30,125,48,90,104,174,160,111,100,47,110,30,242,142,179,31,146,217,234,247,220,230,4,192,237,71,81,164,140,86,210,235,190,154,140,245,73,59,151,177,120,137,103,101,185,139,246,241,42,224,250,134,73,235,246,28,241,129,154,172,131,160,54,19,210,52,205,105,68,83,131,56,205,51,200,209,186,162,233,33,205,192,127,61,56,70,117,107,38,175,227,141,74,14,93,10,129,97,20,243,102,70,213,64,64,9,160,26,0,129,222,99,65,45,137,25,41,208,249,220,160,141,203,171,109,53,210,195,83,177,3,6,117,19,213,142,125,254,127,54,224, -206,196,138,79,23,251,223,55,120,147,135,223,73,116,92,230,211,212,70,9,87,180,54,82,219,1,85,169,61,83,195,63,90,202,170,80,253,8,144,158,148,198,160,90,176,235,44,191,69,157,93,181,238,254,59,32,170,27,225,95,144,245,223,233,91,146,250,171,148,43,166,86,153,89,158,209,55,79,31,27,79,213,87,42,53,82,147,75,84,35,19,203,168,146,82,53,88,112,119,137,190,144,158,52,254,45,209,193,101,17,33,92,81,198,17,117,182,255,5,34,93,79,191, +120,156,173,89,11,115,211,72,18,254,43,115,197,238,145,128,35,107,244,240,243,182,10,8,44,225,22,194,21,33,181,91,151,114,144,44,143,109,17,61,188,26,41,143,218,90,126,251,125,61,51,146,45,71,44,97,235,40,146,200,163,233,158,126,126,221,61,190,136,61,111,52,13,29,127,122,245,203,251,241,212,97,63,252,192,123,246,35,119,200,221,145,239,114,207,25,224,23,119,185,227,59,174,199,71,206,216,27,185,238,200,158,68,73,40,229,236,34,113,70,35,69,228,244,156,71,206,208,119,248,208,27,121,35,238,14,71,14,104,29,219,118,236,161,227,115,207,29,57,254,100,33,100,52,187,176,177,221,197,25,227,129,59,182,185,109,15,57,183,93,103,104,187,190,199,185,235,128,133,51,116,184,237,79,68,182,152,93,156,12,166,68,224,129,192,246,7,182,109,15,192,205,243,108,112,39,50,207,229,174,237,184,62,31,251,131,201,92,172,226,108,118,113,95,37,255,155,42,13,237,73,92,138,212,104,20,122,211,39,207,252,41,7,233,160,55,120,52,196,177,158,143,195,198,164,145, +11,50,199,25,248,99,238,123,16,201,179,157,73,33,126,175,226,66,164,34,43,13,135,152,115,135,79,231,124,56,133,8,95,190,124,177,184,103,107,75,13,33,11,183,33,183,195,177,6,61,134,220,31,219,99,127,196,71,182,59,244,28,127,8,213,55,97,17,166,70,147,185,231,76,141,30,163,222,232,209,128,15,96,81,123,4,249,253,49,24,216,80,2,127,97,72,31,255,221,209,164,52,196,68,71,68,227,222,248,17,140,228,250,246,112,108,15,189,161,239,65,19,135,15,56,12,105,147,254,112,195,36,203,139,52,76,102,23,225,200,157,62,249,48,160,48,176,201,104,176,147,205,7,142,7,193,108,24,218,195,169,124,52,242,248,208,31,185,227,193,96,18,133,155,50,206,51,125,90,136,159,205,90,197,16,239,113,254,200,131,71,93,178,221,208,135,201,184,58,219,30,115,199,131,217,109,223,31,78,74,113,11,131,157,120,211,57,29,235,17,161,67,132,246,112,52,240,56,14,245,224,35,16,225,112,208,112,60,115,127,56,24,130,48,46,19,49,187,160,163,72,76,251,27,255,38, +47,197,50,172,18,156,245,199,167,63,127,124,117,122,116,126,198,46,36,183,167,236,252,221,47,44,56,98,199,121,154,134,217,130,37,113,38,216,188,138,147,133,40,254,57,195,22,103,202,62,134,243,68,176,124,201,162,60,43,225,97,73,47,64,106,254,92,92,150,249,38,142,130,73,208,15,250,241,66,4,253,112,179,9,250,85,122,21,124,18,89,112,84,201,224,17,191,100,220,98,16,34,206,98,101,174,239,160,117,46,153,99,181,5,140,33,71,177,12,35,241,61,124,220,75,230,90,236,213,109,152,110,18,33,191,135,210,187,100,158,197,62,136,36,44,197,130,169,253,13,189,49,210,132,79,218,26,170,117,14,254,79,200,196,51,118,112,30,60,13,158,178,119,225,47,226,144,197,146,133,176,230,142,70,85,25,39,113,121,7,230,218,250,172,92,11,166,73,54,69,190,66,60,247,216,77,92,174,205,26,176,71,164,243,228,174,191,9,163,171,112,37,250,154,40,21,229,58,95,48,121,39,145,202,86,45,154,51,249,186,1,107,49,95,136,36,191,233,144,171,217,72,254,135,34,147, +150,239,19,238,32,211,29,199,163,252,132,170,199,46,131,225,216,12,79,207,14,108,203,182,144,162,135,110,35,45,51,210,170,13,46,11,46,246,55,42,45,130,79,90,13,179,105,214,177,47,56,10,142,214,213,60,56,90,196,5,195,207,67,182,230,89,114,87,239,83,155,188,169,203,26,73,176,237,162,89,13,235,125,59,107,243,142,181,170,99,173,232,88,147,29,107,103,29,107,215,29,107,105,199,218,162,99,237,93,215,90,240,19,158,251,199,207,92,98,20,94,33,56,9,52,238,237,75,58,214,174,58,214,62,119,172,173,59,214,206,59,214,110,59,214,126,219,93,251,241,200,172,158,168,103,35,117,214,108,153,89,86,135,219,158,238,251,251,231,183,207,95,215,111,123,127,241,18,236,186,226,96,159,34,175,202,191,8,174,127,232,119,29,111,138,42,11,139,85,235,44,157,50,46,171,83,238,173,40,131,199,146,149,240,11,101,93,146,75,81,176,36,207,175,88,88,178,48,73,88,120,29,198,137,198,94,85,99,228,196,144,234,180,227,190,61,125,79,8,246,100,123,112,147,106,51, +157,203,200,13,17,149,76,138,146,242,183,78,191,76,200,210,188,202,139,88,72,86,16,180,197,215,130,224,231,38,47,174,226,108,213,188,7,38,173,33,80,33,54,133,144,64,255,61,4,2,111,42,183,4,140,243,59,22,60,238,5,143,45,246,60,1,106,100,138,37,118,196,37,139,194,140,205,73,77,48,89,16,70,98,123,195,225,32,206,152,117,29,22,140,194,243,144,221,172,227,104,77,226,99,249,215,56,115,29,122,216,74,115,179,22,133,160,215,73,30,169,99,129,56,150,184,133,145,10,218,248,159,247,103,111,126,51,8,40,119,41,73,207,139,103,46,179,80,197,150,241,170,95,145,26,125,5,87,160,188,255,6,0,140,114,48,35,182,198,138,155,16,248,11,11,53,178,90,223,246,71,131,120,16,152,32,61,13,33,82,189,120,16,214,224,222,224,254,225,3,120,182,81,146,76,209,66,127,229,46,58,46,39,147,87,82,149,172,157,170,2,55,162,19,32,23,195,106,81,85,82,132,245,152,220,136,40,94,198,216,44,80,102,16,137,161,100,89,152,42,220,111,177,63,104,252, +131,109,25,220,31,22,209,26,100,75,109,255,191,99,226,29,23,29,42,55,150,173,232,173,237,78,194,91,243,84,155,158,189,89,178,44,47,183,114,247,168,212,30,191,125,126,250,122,214,22,152,88,73,89,165,98,97,177,211,188,20,198,64,38,84,122,170,98,133,85,153,167,136,215,8,121,119,199,162,66,32,178,228,14,67,170,135,248,244,250,248,184,205,28,17,182,36,185,238,216,34,87,226,136,219,88,150,221,62,124,190,88,168,206,32,76,76,62,227,65,117,170,2,201,178,205,109,199,31,124,197,239,187,85,111,6,115,158,54,202,235,216,218,207,145,243,205,230,164,154,215,209,38,153,92,231,21,36,71,80,44,242,155,44,201,195,5,89,173,146,20,10,68,47,5,188,179,216,202,212,35,84,220,57,95,21,90,156,218,35,103,16,164,16,17,57,199,98,31,215,176,178,200,100,133,224,218,30,24,66,136,43,177,81,198,166,190,34,147,48,14,65,136,74,93,88,160,137,213,56,91,136,13,198,29,122,153,43,139,178,168,42,10,250,136,12,249,76,81,64,46,248,184,22,111,94, +190,98,58,136,170,66,241,176,102,223,97,57,213,4,40,211,197,153,44,139,42,42,165,234,128,161,208,26,7,16,212,98,135,58,63,201,87,113,164,145,81,103,144,54,167,197,78,242,27,113,77,214,65,27,25,74,65,110,55,49,133,229,140,108,79,122,65,41,237,101,21,127,17,65,97,143,221,229,21,75,43,128,175,68,187,151,24,247,221,213,25,71,167,146,197,79,33,239,110,45,197,2,101,197,189,87,107,243,74,31,3,9,97,197,152,48,145,173,209,203,145,90,198,227,70,53,163,192,3,237,133,202,247,240,72,163,179,240,89,212,80,20,22,101,140,174,177,148,127,59,190,116,149,216,134,216,140,253,186,142,19,125,212,78,40,200,53,5,89,200,86,73,62,167,196,170,202,77,85,238,200,135,154,180,208,163,207,86,18,56,100,153,132,43,170,177,249,141,84,78,33,227,201,156,92,109,20,32,140,145,10,211,140,230,81,29,136,146,124,33,178,235,184,200,51,154,119,229,94,182,15,238,101,59,137,172,185,154,58,174,18,35,161,92,160,108,132,16,10,205,180,120,41,97,243,102, +91,243,123,26,94,84,212,32,115,209,156,207,85,245,68,99,158,67,111,162,193,102,244,26,21,9,3,28,175,0,206,192,238,224,8,182,245,216,188,56,159,29,26,176,220,65,27,37,1,20,186,142,21,6,144,132,55,20,145,219,42,81,167,29,85,80,49,175,32,88,190,16,122,4,145,119,233,60,79,228,142,109,201,4,236,143,63,248,152,123,147,145,61,26,252,203,193,56,187,230,211,103,156,233,33,203,101,239,245,152,60,155,76,154,165,151,66,70,69,220,172,95,62,115,204,171,166,13,199,234,79,205,246,15,194,196,86,146,88,106,127,123,247,188,189,251,28,153,249,226,237,155,143,255,237,218,155,180,247,158,193,217,64,26,210,176,107,119,117,159,115,9,131,139,157,56,235,34,75,219,100,199,170,168,192,101,105,184,209,37,172,131,166,216,87,89,67,140,178,253,129,49,54,1,202,190,75,150,21,156,167,22,15,187,216,46,218,108,95,182,169,115,202,24,181,100,60,219,197,66,222,55,130,202,61,154,19,231,69,72,181,187,139,236,236,219,100,42,157,141,107,229,131,152,94,183, +153,190,16,12,120,60,71,255,220,181,249,93,167,27,234,105,136,29,32,141,212,3,176,8,155,155,33,201,101,109,75,54,227,73,247,80,213,125,134,98,172,28,180,138,169,54,80,67,181,195,245,199,163,70,202,147,45,207,172,205,236,180,74,231,40,14,170,42,130,47,90,14,213,210,17,52,41,163,1,0,212,189,67,29,26,89,179,95,85,48,224,79,164,128,185,153,38,186,5,88,183,79,5,96,152,126,95,55,72,11,68,34,181,68,49,21,76,221,87,44,115,186,36,162,218,47,178,94,93,246,168,26,40,68,206,128,89,177,84,144,214,244,3,170,72,154,81,96,153,87,25,161,152,225,102,96,142,72,169,50,35,199,107,140,163,155,152,199,123,135,178,3,96,207,138,230,138,36,207,4,225,91,198,114,85,67,49,189,44,100,171,252,146,139,16,86,232,76,244,249,4,242,192,82,68,140,84,88,76,247,26,123,141,146,185,205,220,233,155,73,174,109,211,212,109,193,243,61,11,106,53,238,91,97,89,228,105,125,36,133,126,181,89,40,96,192,94,179,74,243,153,172,59,222,61,121, +45,118,158,37,241,149,48,221,66,19,150,107,10,89,163,115,79,27,160,190,200,81,200,78,205,169,118,162,242,141,233,174,104,58,107,204,189,103,134,110,45,63,183,181,124,45,50,65,211,31,68,185,92,151,229,70,234,139,180,40,9,179,85,96,37,201,117,26,88,121,177,10,250,139,60,146,65,255,223,103,239,79,143,243,116,19,39,170,119,123,25,98,250,0,192,5,214,186,76,147,75,151,68,198,59,17,124,50,178,75,235,179,52,213,97,95,144,219,182,32,175,110,55,121,81,110,139,180,204,171,34,50,224,130,179,85,117,12,155,82,179,207,236,183,78,102,32,137,139,166,20,118,18,94,237,35,171,178,240,126,121,64,192,35,95,183,69,85,40,254,179,217,159,127,126,123,218,51,119,22,0,96,21,133,95,185,175,252,25,13,141,12,126,208,55,150,151,198,142,186,199,166,94,71,206,84,15,160,30,21,155,189,209,137,130,105,25,23,136,51,53,160,182,26,108,50,67,65,113,194,172,106,163,75,23,225,140,66,161,157,22,64,97,187,114,155,10,221,104,77,140,154,110,70,157,188, +237,78,84,111,18,60,125,125,254,166,119,118,242,252,195,171,151,179,7,204,189,116,23,195,114,36,66,1,189,101,221,235,17,166,246,180,84,205,168,78,21,249,43,252,246,238,111,48,199,133,153,110,106,219,179,49,186,172,16,90,111,103,166,48,145,185,153,152,233,242,98,137,54,138,212,65,140,73,84,95,141,19,117,143,217,204,119,117,95,38,13,193,253,243,67,141,169,205,70,107,239,94,217,157,236,222,90,215,119,71,103,234,35,78,163,107,4,125,51,187,123,37,162,154,74,115,85,139,19,253,167,99,103,247,198,86,137,161,22,9,218,225,84,89,68,12,54,165,249,22,141,227,188,168,93,115,246,202,49,254,97,193,151,122,92,127,8,163,126,37,139,190,42,229,125,172,246,193,151,6,247,239,97,253,77,177,133,49,9,123,129,150,88,26,209,195,121,43,170,136,245,156,94,255,165,208,253,154,85,143,62,24,45,52,87,208,55,178,23,215,247,121,199,217,119,201,108,245,123,110,115,2,224,246,163,40,82,70,43,233,85,95,221,52,232,147,118,46,183,241,18,207,202,114,231,237, +227,85,192,245,13,147,214,183,17,136,15,212,100,29,4,181,153,144,166,105,78,35,175,186,216,160,249,144,102,44,83,209,244,208,107,224,191,30,196,163,186,53,147,87,241,70,37,135,46,133,192,48,138,121,51,243,107,32,160,4,80,13,128,64,239,177,160,150,196,140,20,232,124,174,209,198,229,213,182,26,233,97,180,216,1,131,186,137,106,199,62,255,63,27,112,231,6,0,159,206,247,191,191,241,38,247,191,227,233,248,114,132,166,54,74,184,162,181,145,218,14,168,74,237,153,26,49,209,82,86,133,234,71,128,244,164,52,102,204,130,93,101,249,13,234,236,170,245,93,74,7,68,117,35,252,11,178,254,59,125,235,84,127,53,117,201,212,42,51,203,51,250,38,239,99,227,169,250,138,170,70,106,53,58,83,35,19,203,168,146,82,53,88,112,119,137,190,144,158,52,254,45,209,193,101,145,208,35,124,68,157,237,255,0,67,93,194,47, diff --git a/uppsrc/umk/umake.cpp b/uppsrc/umk/umake.cpp index 56a55d625..0e5e4b1b5 100644 --- a/uppsrc/umk/umake.cpp +++ b/uppsrc/umk/umake.cpp @@ -123,6 +123,7 @@ CONSOLE_APP_MAIN bool update_hub = false; bool only_hub = false; String hub_dir; + String out_dir; bool flatpak_build = !GetEnv("FLATPAK_ID").IsEmpty(); String mkf; @@ -146,6 +147,16 @@ CONSOLE_APP_MAIN if(ar == "hub-only") { only_hub = true; } + else + if(ar == "out-dir") { + if(i + 1 >= args.GetCount()) { + Puts("Output directory not specified"); + SetExitCode(7); + return; + } + + out_dir = args[++i]; + } else { Puts(String("Unrecognized parameter \"") + a + "\"."); SetExitCode(7); @@ -237,12 +248,30 @@ CONSOLE_APP_MAIN String x = Join(h, ";"); SetVar("UPP", x, false); PutVerbose("Inline assembly: " + x); - String outdir = GetDefaultUppOut(); - if (flatpak_build) { - outdir = GetExeFolder() + DIR_SEPS + ".cache" + DIR_SEPS + "upp.out"; + if(out_dir.IsEmpty()) { + if(flatpak_build) + out_dir = GetExeFolder() + DIR_SEPS + ".cache" + DIR_SEPS + "upp.out"; + else + out_dir = GetDefaultUppOut(); } - RealizeDirectory(outdir); - SetVar("OUTPUT", outdir, false); + + if(!RealizeDirectory(out_dir)) { + Puts("Failed to realize output directory \"" + out_dir + "\"."); + SetExitCode(8); + return; + } + if(!IsFullPath(out_dir)) { + out_dir = GetCurrentDirectory() + DIR_SEPS + out_dir; + if(!DirectoryExists(out_dir)) { + Puts( + "Failed to find output directory after relative path noramlization \"" + + out_dir + "\"."); + SetExitCode(8); + return; + } + } + + SetVar("OUTPUT", out_dir, false); } else { if(!LoadVars(v)) { @@ -384,6 +413,8 @@ CONSOLE_APP_MAIN " --hub-dir - specifies the directory where UppHub packages should be downloaded, using\n" " the second parameter, dir, to set the path.\n" " --hub-only - instructs UMK to handle only the logic related to UppHub.\n" + " --out-dir - specifies the directory where UMK stores build artifacts,\n" + " using the second parameter, dir, to define the path.\n" " Additional options [-options for example -brU]:\n" " a - rebuild all.\n" " b - use BLITZ.\n"