diff --git a/uppsrc/ide/app.tpp/umk_en-us.tpp b/uppsrc/ide/app.tpp/umk_en-us.tpp index 9b24a243b..c0cfd2080 100644 --- a/uppsrc/ide/app.tpp/umk_en-us.tpp +++ b/uppsrc/ide/app.tpp/umk_en-us.tpp @@ -28,14 +28,14 @@ program, with U`+`+ assembly/package/build method system.&] [s11; Below is a command line interface of UMK:&] [s0; &] [s0;l128;i224;O9; [*C3 umk ][*C@(0.0.255)3 assembly package ][*C3 `[][*C@(0.0.255)3 build`_me -thod][*C3 `] `[][*C@(0.0.255)3 `-`-hub`-dir dir][*C3 `]][*C@4;3 ][*C3 `[`-`[][*C@4;3 a][*C3 `] -`[][*C@4;3 b][*C3 `]`[][*C@4;3 u][*C3 `]`[][*C@4;3 r][*C3 `]`[][*C@4;3 s][*C3 `]`[][*C@4;3 S][*C3 `]`[ -][*C@4;3 v][*C3 `]`[][*C@4;3 m][*C3 `]`[][*C@4;3 d][*C3 `]`[][*C@4;3 M][*C3 `]`[][*C@4;3 M`=][*/C@3;3 m -akefile][*C3 `]`[][*C@4;3 l][*C3 `]`[][*C@4;3 k][*C3 `]`[][*C@4;3 j][*C3 `]`[][*C@4;3 h][*C3 `]`[][*C@4;3 U -][*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 `] `[][*C@(0.0.255)3 !][*C3 `[][*C@(0.0.255)3 runarg][*C3 `]. -.`]]&] +thod][*C3 `] `[][*C@(0.0.255)3 `-`-hub`-dir dir][*C3 `] `[][*C@(0.0.255)3 `-`-hub`-only][*C3 `] +][*C@4;3 ][*C3 `[`-`[][*C@4;3 a][*C3 `]`[][*C@4;3 b][*C3 `]`[][*C@4;3 u][*C3 `]`[][*C@4;3 r][*C3 `]`[ +][*C@4;3 s][*C3 `]`[][*C@4;3 S][*C3 `]`[][*C@4;3 v][*C3 `]`[][*C@4;3 m][*C3 `]`[][*C@4;3 d][*C3 `]`[][*C@4;3 M +][*C3 `]`[][*C@4;3 M`=][*/C@3;3 makefile][*C3 `]`[][*C@4;3 l][*C3 `]`[][*C@4;3 k][*C3 `]`[][*C@4;3 j +][*C3 `]`[][*C@4;3 h][*C3 `]`[][*C@4;3 U][*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 `] `[][*C@(0.0.255)3 !][*C3 +`[][*C@(0.0.255)3 runarg][*C3 `]..`]]&] [s0;3 &] [s11; Let`'s take a closer look at all available options:&] [s11;l128;i150;O0; [*@(0.0.255) assembly] is a direct set of package @@ -58,6 +58,11 @@ where UppHub packages should be downloaded, using the second parameter, ][*@(0.0.255) dir][@N , to set the path. This ensures packages are kept in a consistent location that is independent of the current project and TheIDE configuration.]&] +[s11;l128;i150;O0; [*@(0.0.255) `-`-hub`-only] [@N instructs UMK to handle +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;l128;i150;O0; [*@(0.0.255) FLAG][* s] are [^topic`:`/`/ide`/app`/Flags`$en`-us^ compila tion flags]. If flags are not specified, the first main configuration entry in .upp file is used.&] @@ -129,6 +134,13 @@ mpile`_commands.json]] [s0;l128; [*C@5+92 umk ./,3p/uppsrc UppTerm 3p/umk/CLANG.bm `-`-hub`-dir 3p/hub `-brU `+GUI,SHARED build/UppTerm]&] [s0; &] +[s11; The below example demonstrates how to download only UppHub dependencies +and skip the build process. This is useful when embedding UMK +with various command handlers, such as makefiles.&] +[s0; &] +[s11;l128; [*C@5+92 umk ./,3p/uppsrc UppTerm 3p/umk/CLANG.bm `-`-hub`-dir +3p/hub `-`-hub`-only `-U]&] +[s0; &] [s12;:4: 4. Related topics&] [s11; Below is a list of related topics worth reading to further expand your knowledge of UMK:&] diff --git a/uppsrc/ide/app.tpp/umk_en-us.tppi b/uppsrc/ide/app.tpp/umk_en-us.tppi index 3eab36523..339dd46f3 100644 --- a/uppsrc/ide/app.tpp/umk_en-us.tppi +++ b/uppsrc/ide/app.tpp/umk_en-us.tppi @@ -1,13 +1,14 @@ TITLE("UMK - Command line builder") COMPRESSED -120,156,157,88,11,115,211,72,18,254,43,115,21,56,18,112,100,141,30,182,108,223,86,5,146,44,225,128,112,69,72,221,214,165,28,52,150,198,182,136,30,62,141,148,71,81,240,219,239,235,145,172,88,142,32,112,91,11,200,173,126,77,63,190,238,209,69,228,56,222,68,88,238,228,234,237,135,209,196,98,79,158,240,158,185,99,15,185,237,185,54,119,172,1,254,226,54,183,92,203,118,184,103,141,28,207,182,61,115,28,196,66,169,233,69,108,121,158,22,178,122,214,142,53,116,45,62,116,60,199,227,246,208,179,32,107,153,166,101,14,45,151,59,182,103,185,227,80,170,96,122,97,130,221,134,141,209,192,30,153,220,52,135,156,155,182,53,52,109,215,225,220,182,160,194,26,90,220,116,199,50,13,167,23,39,131,9,9,56,16,48,221,129,105,154,3,104,115,28,19,218,73,204,177,185,109,90,182,203,71,238,96,60,147,139,40,157,94,60,60,146,251,232,145,134,230,56,42,100,82,159,72,56,147,231,7,238,132,67,116,208,27,236,12,97,214,113,97,108,68,39,178,33,102,89,3, -119,196,93,7,46,57,166,53,206,229,127,203,40,151,137,76,139,90,67,196,185,197,39,51,62,156,192,133,239,223,191,27,220,49,171,72,13,225,11,55,225,183,197,65,195,57,134,220,29,153,35,215,227,158,105,15,29,203,29,226,232,43,145,139,164,62,201,204,177,38,245,57,188,158,183,51,224,3,68,212,244,224,191,59,130,2,19,135,192,191,8,164,139,255,109,111,92,212,194,36,71,66,163,222,104,7,65,178,93,115,56,50,135,206,208,117,112,18,139,15,56,2,105,210,249,145,134,113,154,229,137,136,167,23,194,179,39,207,63,14,168,12,76,10,26,226,100,242,129,229,192,49,19,129,118,96,149,123,158,195,135,174,103,143,6,131,113,32,86,69,148,165,149,53,129,63,171,165,174,33,222,227,124,199,65,70,109,138,221,208,69,200,184,182,109,142,184,229,32,236,166,235,14,199,133,188,69,192,78,156,201,140,204,58,36,104,145,160,57,244,6,14,135,81,7,57,130,16,140,67,134,227,153,187,195,193,16,130,81,17,203,233,5,153,34,55,205,71,254,27,31,201,185,40,99,216, -250,250,249,219,211,227,211,253,243,51,118,161,184,57,97,231,239,223,50,127,159,29,102,73,34,210,144,197,81,42,217,172,140,226,80,230,127,159,130,197,154,176,79,98,22,75,150,205,89,144,165,5,50,172,232,5,68,235,127,46,46,139,108,21,5,254,216,239,251,253,40,148,126,95,172,86,126,191,76,174,252,207,50,245,247,75,229,239,240,75,198,13,6,39,162,52,210,225,250,13,89,235,146,89,70,219,193,8,126,228,115,17,200,223,209,99,95,50,219,96,199,183,34,89,197,82,253,142,164,115,201,28,131,125,148,177,40,100,200,52,127,35,95,7,105,204,199,237,19,106,58,135,254,231,20,226,41,219,61,247,95,248,47,216,123,241,86,238,177,72,49,129,104,110,156,168,44,162,56,42,238,160,188,138,62,43,150,146,85,34,171,60,91,160,158,123,236,38,42,150,53,13,216,35,147,89,124,215,95,137,224,74,44,100,191,18,74,100,177,204,66,166,238,20,90,217,88,187,102,141,127,28,192,181,155,175,100,156,221,116,248,213,48,82,254,113,144,113,43,247,49,183,208,233,150,229, -80,127,226,168,135,54,67,224,216,20,79,7,187,166,97,26,104,209,61,187,241,150,213,222,106,6,155,249,23,219,140,250,20,254,231,234,24,53,211,180,131,207,223,247,247,151,229,204,223,15,163,156,225,207,154,85,243,57,19,155,53,22,192,121,209,80,197,154,111,131,54,235,160,149,29,180,188,131,166,58,104,103,29,180,235,14,90,210,65,11,59,104,239,187,104,254,31,120,238,31,30,216,164,72,92,161,232,8,12,30,240,197,29,180,171,14,218,151,14,218,178,131,118,222,65,187,237,160,253,181,73,123,186,95,83,79,244,115,237,117,218,176,76,13,163,35,109,47,182,83,254,231,187,151,175,215,111,123,63,121,9,117,93,117,176,45,145,149,197,79,234,235,111,213,187,142,55,121,153,138,124,209,178,85,181,130,205,214,173,244,78,22,254,51,197,10,228,133,186,41,206,148,204,89,156,101,87,76,20,76,196,49,19,215,34,138,43,76,213,179,67,141,107,209,170,157,184,107,78,62,16,50,61,191,55,220,180,208,180,234,81,212,188,12,10,166,100,65,125,185,110,171,84,170,162,126, -149,229,145,84,44,39,200,138,174,37,193,202,77,150,95,69,233,162,121,15,172,89,194,161,92,174,114,169,128,234,91,200,2,221,52,70,9,240,102,119,204,127,214,243,159,25,236,101,12,52,72,181,74,112,68,5,11,68,202,102,116,76,40,9,9,251,192,222,104,216,141,82,102,92,139,156,81,121,238,177,155,101,20,44,201,125,144,255,29,165,182,69,15,247,222,220,44,101,46,233,117,156,5,218,44,144,196,144,183,8,82,78,140,255,250,112,246,230,175,26,217,212,166,36,157,243,226,192,102,6,166,211,60,90,244,75,58,70,95,195,16,36,31,190,1,176,2,230,167,164,182,142,226,74,0,87,17,161,198,87,227,241,124,52,72,6,135,9,170,19,1,151,214,196,93,177,6,237,6,207,247,126,65,103,27,253,40,20,45,84,215,233,34,115,25,133,188,84,122,20,109,76,11,164,17,19,158,82,140,168,5,101,65,21,214,99,106,37,131,104,30,129,89,98,124,160,18,133,98,169,72,52,158,183,212,239,54,249,1,91,138,244,139,60,88,66,108,94,197,255,255,9,241,70,138,246, -116,26,139,86,245,174,227,78,206,27,179,164,10,61,123,51,103,105,86,220,251,221,163,17,122,248,238,229,233,235,105,219,97,82,165,84,153,200,208,96,167,89,33,235,0,213,165,210,211,147,72,148,69,150,160,94,3,244,221,29,11,114,137,202,82,27,10,105,206,225,215,235,195,195,182,114,84,216,156,252,186,99,97,166,221,145,183,145,42,126,33,135,155,147,105,138,208,156,54,7,169,234,100,187,222,207,87,171,147,114,182,174,28,197,212,50,43,225,5,18,28,102,55,105,156,137,144,34,80,42,74,43,201,43,137,72,135,76,111,184,18,205,216,35,132,219,176,175,135,33,172,246,40,176,4,15,36,68,129,54,216,167,37,34,38,83,85,162,80,238,13,10,56,113,37,87,58,112,52,251,83,133,131,18,28,232,54,4,58,53,117,23,165,161,92,225,74,66,47,51,29,29,22,148,121,78,63,81,237,95,40,163,20,206,79,75,249,230,232,152,85,5,81,230,90,135,49,125,60,114,53,134,99,168,106,159,126,176,151,253,25,139,133,242,159,84,155,217,37,237,42,171,40,174,252,156, -211,171,169,46,32,253,168,213,108,149,18,57,61,143,114,192,164,110,216,150,147,136,77,129,188,16,104,149,171,149,174,70,58,54,53,218,47,36,158,6,10,203,174,101,158,195,89,69,63,87,101,161,59,173,87,169,106,240,6,201,255,145,190,173,33,132,98,20,105,85,55,237,6,159,69,152,66,119,27,197,34,98,149,213,109,79,8,60,71,101,48,85,6,129,84,106,94,198,85,105,175,203,168,26,58,2,115,40,95,148,116,99,83,181,192,67,251,192,138,136,94,175,25,183,252,30,84,126,191,196,76,203,52,182,212,243,76,71,126,13,227,51,218,44,105,194,177,175,95,249,136,59,99,207,244,6,255,176,112,223,89,242,201,1,103,213,22,110,179,15,213,61,106,58,30,55,164,35,92,151,243,168,161,95,30,88,245,171,102,159,3,245,143,134,253,163,172,90,24,189,110,104,254,54,247,172,205,125,174,36,123,245,238,205,167,255,116,241,198,109,222,51,36,16,101,158,100,161,236,226,46,31,106,46,16,51,89,108,100,188,67,44,105,139,29,106,116,66,19,38,162,170,190,46,153,124, -251,200,177,20,48,71,158,177,221,176,186,228,81,213,134,136,197,162,34,235,107,3,170,32,174,136,123,93,106,195,182,218,163,182,52,138,185,86,168,238,146,89,22,171,46,21,234,97,16,212,18,133,64,23,137,89,46,104,8,116,137,157,61,46,166,97,165,78,173,250,37,165,215,109,165,175,36,67,99,206,176,136,117,49,191,239,76,195,122,173,102,187,0,82,253,0,112,2,115,179,109,219,172,29,201,102,207,237,222,206,187,109,104,197,58,65,11,236,84,169,198,139,13,173,79,247,27,47,79,238,117,166,109,101,167,101,50,163,222,35,72,134,222,176,130,44,61,183,117,208,208,243,250,98,186,46,141,180,225,143,179,5,77,70,192,32,141,132,102,45,237,118,96,217,182,10,148,173,23,199,106,210,134,168,68,154,173,132,23,245,80,155,103,244,21,129,6,143,76,123,52,239,104,150,208,208,35,120,16,233,29,75,34,165,17,169,25,70,122,212,212,59,229,60,43,145,118,160,113,165,173,87,141,99,18,141,82,85,160,199,37,189,69,114,232,170,254,108,203,40,219,197,210,186,160,5, -53,206,82,185,135,161,144,214,16,133,53,56,36,67,8,68,133,86,58,69,40,43,140,197,202,62,221,242,49,32,80,49,74,131,25,93,124,183,166,116,253,185,107,99,1,35,191,238,39,118,119,4,207,183,34,88,29,227,97,20,230,121,150,172,77,82,233,151,171,80,3,3,120,107,42,45,250,106,189,58,109,249,219,109,251,75,219,246,107,153,74,90,238,81,212,151,203,162,88,169,106,206,6,177,72,23,190,17,199,215,137,111,100,249,194,239,135,89,160,252,254,63,207,62,156,30,222,143,218,35,129,229,18,176,227,27,203,34,137,47,237,122,12,75,255,115,253,237,64,25,95,84,141,217,219,142,220,182,29,57,190,93,101,121,179,64,32,13,89,153,7,117,203,195,182,30,59,162,25,0,219,202,254,234,84,6,17,36,103,173,179,83,240,106,27,239,168,120,31,128,54,202,16,93,212,104,194,128,37,253,211,233,183,111,91,31,127,236,241,230,167,165,245,69,240,76,255,68,55,210,157,160,250,124,178,121,191,105,6,35,52,193,45,247,197,200,218,252,172,162,125,213,68,106,47,108, -36,42,15,24,118,11,90,86,177,102,206,114,230,191,120,125,254,166,119,118,118,108,245,206,78,94,126,60,62,98,254,247,245,238,253,43,138,250,165,202,251,26,78,251,160,246,161,151,182,240,223,81,253,168,219,178,14,9,123,149,37,51,85,187,46,102,107,253,141,234,25,189,254,169,211,253,181,170,30,253,168,79,81,105,133,124,227,123,126,253,80,119,148,254,150,207,70,191,103,55,22,208,112,159,100,158,48,162,36,87,125,125,109,168,44,109,124,129,194,75,60,235,200,157,183,205,107,112,232,215,74,182,63,25,58,227,135,159,21,59,190,199,197,88,200,169,124,242,22,35,1,25,198,6,1,190,190,27,96,72,149,185,70,56,84,41,117,207,29,58,137,93,165,217,13,128,114,209,250,124,215,177,120,118,47,219,175,200,251,247,213,133,104,253,53,244,146,105,42,171,201,83,250,120,12,128,223,186,61,233,9,4,8,166,146,215,208,24,169,160,84,74,67,54,70,69,129,73,67,79,213,86,59,199,76,72,3,218,91,115,220,212,104,86,254,15,240,38,226,28, +120,156,173,89,11,115,211,72,18,254,43,115,21,56,18,112,100,141,30,126,222,86,1,129,37,28,16,174,72,82,71,93,202,65,178,52,182,69,244,240,106,164,60,138,130,223,126,95,207,72,138,229,8,72,174,110,107,89,228,158,233,158,158,126,124,221,61,123,22,57,206,104,234,91,238,244,226,221,199,241,212,98,143,30,241,158,185,99,15,185,61,114,109,238,88,3,252,135,219,220,114,45,219,225,35,107,236,140,108,123,100,78,130,216,151,114,118,22,91,163,145,98,178,122,214,142,53,116,45,62,116,70,206,136,219,195,145,5,94,203,52,45,115,104,185,220,177,71,150,59,9,133,12,102,103,38,182,219,56,99,60,176,199,38,55,205,33,231,166,109,13,77,219,117,56,183,45,136,176,134,22,55,221,137,72,195,217,217,225,96,74,12,14,24,76,119,96,154,230,0,210,28,199,132,116,98,115,108,110,155,150,237,242,177,59,152,204,197,50,74,103,103,119,175,228,254,246,74,67,115,18,21,34,169,110,228,59,211,167,207,221,41,7,235,160,55,216,25,226,88,199,197,97,99,186,145, +13,54,203,26,184,99,238,58,80,201,49,173,73,46,254,42,163,92,36,34,45,42,9,17,231,22,159,206,249,112,10,21,126,252,248,97,112,199,212,150,26,66,23,110,66,111,139,131,134,123,12,185,59,54,199,238,136,143,76,123,232,88,238,16,87,95,251,185,159,84,55,153,59,214,180,186,199,168,55,218,25,240,1,44,106,142,160,191,59,134,0,19,151,192,223,48,164,139,127,237,209,164,168,152,137,143,152,198,189,241,14,140,100,187,230,112,108,14,157,161,235,224,38,22,31,112,24,210,164,251,195,13,147,52,203,19,63,158,157,249,35,123,250,244,211,128,194,192,36,163,193,78,38,31,88,14,20,51,97,104,7,167,242,209,200,225,67,119,100,143,7,131,73,224,175,139,40,75,245,105,62,254,172,87,42,134,120,143,243,29,7,30,181,201,118,67,23,38,227,234,108,115,204,45,7,102,55,93,119,56,41,196,53,12,118,232,76,231,116,172,67,140,22,49,154,195,209,192,225,56,212,129,143,192,132,195,193,195,241,205,221,225,96,8,198,168,136,197,236,140,142,34,53,205,223,252, +51,121,37,22,126,25,227,172,111,95,190,63,126,125,180,127,122,204,206,36,55,167,236,244,195,59,230,237,179,131,44,73,252,52,100,113,148,10,54,47,163,56,20,249,223,103,216,98,77,217,137,63,143,5,203,22,44,200,210,2,30,150,180,0,214,234,175,179,243,34,91,71,129,55,241,250,94,63,10,133,215,247,215,107,175,95,38,23,222,23,145,122,251,165,244,118,248,57,227,6,131,18,81,26,41,115,61,128,215,58,103,150,209,86,48,130,30,249,194,15,196,67,228,216,231,204,54,216,235,107,63,89,199,66,62,132,211,57,103,142,193,62,137,216,47,68,200,212,254,134,191,50,210,132,79,218,55,84,116,14,249,79,201,196,51,182,123,234,61,243,158,177,15,254,59,177,199,34,201,124,88,115,227,70,101,17,197,81,113,3,225,218,250,172,88,9,166,89,214,121,182,68,60,247,216,85,84,172,42,26,176,71,36,243,248,166,191,246,131,11,127,41,250,154,41,17,197,42,11,153,188,145,72,101,163,86,205,154,252,220,128,181,154,47,69,156,93,117,232,213,108,36,255,227,34,147, +150,239,99,110,33,211,45,203,161,252,196,85,15,108,6,195,177,25,190,158,239,154,134,105,32,69,247,236,70,91,86,105,171,54,216,204,59,219,222,168,110,225,125,209,215,168,54,205,58,246,121,251,222,254,170,156,123,251,97,148,51,252,185,207,214,44,141,111,234,125,106,147,51,181,89,163,9,182,157,53,84,191,222,183,65,155,119,208,202,14,90,222,65,147,29,180,227,14,218,101,7,45,233,160,133,29,180,15,93,52,239,15,124,247,15,158,219,36,200,191,64,112,18,104,220,217,23,119,208,46,58,104,95,59,104,171,14,218,105,7,237,186,131,246,121,147,246,120,191,162,30,170,239,74,235,180,217,50,51,140,14,183,61,219,246,247,159,239,95,188,169,87,123,191,88,132,184,174,56,216,230,200,202,226,23,193,245,55,189,214,177,146,151,169,159,47,91,103,233,148,177,89,157,114,239,69,225,61,145,172,128,95,40,235,226,76,138,156,197,89,118,193,252,130,249,113,204,252,75,63,138,53,246,170,26,35,39,21,171,78,59,238,154,211,143,132,96,79,111,15,110,82,109,166,115,25, +185,33,130,130,73,81,80,254,214,233,151,10,89,84,75,89,30,9,201,114,130,182,232,82,16,252,92,101,249,69,148,46,155,117,96,210,10,10,229,98,157,11,9,244,223,66,32,200,166,114,75,192,56,191,97,222,147,158,247,196,96,47,98,160,70,170,68,98,71,84,176,192,79,217,156,174,9,33,33,97,36,182,55,18,118,163,148,25,151,126,206,40,60,247,216,213,42,10,86,164,62,200,255,142,82,219,162,143,91,109,174,86,34,23,180,28,103,129,58,22,136,99,136,107,24,41,167,141,255,250,120,252,246,115,133,128,114,147,147,238,121,246,220,102,6,170,216,34,90,246,75,186,70,95,193,21,56,239,174,0,128,81,14,102,36,182,178,226,218,7,254,194,66,141,174,198,239,253,209,32,30,20,38,72,79,124,168,84,19,119,253,26,220,27,220,223,187,135,204,54,74,146,41,90,232,175,220,69,199,101,100,242,82,170,146,181,81,85,224,70,116,2,228,98,88,45,40,11,138,176,30,147,107,17,68,139,8,155,5,202,12,34,209,151,44,245,19,133,251,45,241,187,141,127,176,45, +133,251,253,60,88,129,109,161,237,255,191,152,120,195,69,123,202,141,69,43,122,107,187,147,242,198,60,209,166,103,111,23,44,205,138,91,189,123,84,106,15,222,191,56,122,51,107,43,76,162,164,44,19,17,26,236,40,43,68,101,160,42,84,122,170,98,249,101,145,37,136,215,0,121,119,195,130,92,32,178,228,134,64,170,135,248,245,230,224,160,45,28,17,182,32,189,110,88,152,41,117,196,117,36,139,123,248,112,179,130,205,96,154,163,230,34,58,78,182,227,253,116,189,62,44,231,117,228,72,38,87,89,9,45,224,224,48,187,74,227,204,15,201,2,165,36,183,18,191,20,176,116,200,84,39,44,144,140,61,66,184,141,243,85,209,196,169,61,50,44,193,3,49,145,161,13,118,178,130,197,68,42,75,4,202,237,129,62,148,184,16,107,101,56,234,17,82,137,139,18,28,168,52,4,58,53,113,23,165,161,88,99,116,161,197,76,89,135,5,101,158,211,79,68,251,87,242,40,153,243,100,37,222,190,122,205,116,64,148,185,146,97,204,30,96,57,85,208,149,233,162,84,22,121,25,20, +82,117,179,184,208,10,7,16,108,98,135,58,63,206,150,81,160,81,78,103,131,54,167,193,14,179,43,113,73,214,65,75,232,75,65,46,172,226,3,228,148,108,79,247,194,165,52,2,171,88,10,8,214,122,236,38,43,89,82,2,72,37,90,183,184,114,223,77,157,61,116,42,89,252,8,250,110,214,69,16,40,194,239,44,173,170,37,125,12,52,132,21,35,194,55,182,66,95,70,215,170,60,94,93,173,186,192,61,236,85,213,60,52,33,202,135,63,233,119,255,140,253,165,244,30,233,142,247,156,122,192,117,20,107,191,46,104,105,166,18,78,125,42,49,91,169,71,215,93,68,57,172,161,0,174,229,84,196,82,129,56,38,144,47,215,107,149,189,100,71,2,166,123,36,10,21,96,150,193,71,57,148,149,244,115,93,22,10,153,122,90,84,131,207,72,150,159,201,219,42,218,72,94,63,213,121,214,6,196,121,132,170,125,179,145,92,126,44,179,10,38,169,98,45,144,73,76,150,65,32,164,92,148,177,134,130,58,237,180,239,124,212,237,124,89,210,36,44,43,134,187,231,3,91,35,90, +174,55,110,233,61,208,122,191,64,88,101,42,154,170,250,175,44,95,151,189,57,117,236,212,17,176,111,223,248,152,59,147,145,57,26,252,195,194,28,185,226,211,231,156,233,233,198,102,31,245,124,58,155,76,26,210,43,33,131,60,106,232,231,207,173,106,169,233,127,65,253,163,217,254,73,104,200,3,54,26,106,127,123,247,188,189,251,20,105,244,242,253,219,147,255,116,237,141,219,123,143,225,64,192,66,146,133,162,107,119,121,87,114,1,155,137,98,195,227,29,108,73,155,237,64,161,57,64,43,241,117,244,117,241,228,219,87,214,120,64,154,177,221,80,15,207,20,181,33,108,177,212,100,53,142,33,10,98,77,220,235,18,27,182,197,190,106,115,35,152,43,129,242,38,153,103,177,236,18,33,239,26,65,174,16,8,52,160,205,115,159,138,102,23,219,241,239,217,20,12,87,174,149,247,18,122,217,22,250,82,48,36,230,28,141,107,215,230,15,157,110,168,199,16,182,11,144,83,31,0,39,108,110,166,19,155,181,45,217,204,5,221,211,76,247,25,74,176,114,208,50,34,32,39,188,216, +144,250,120,191,209,242,240,86,102,218,22,118,84,38,115,202,61,42,97,144,27,106,200,82,125,142,50,26,114,94,13,252,117,104,164,205,126,85,110,0,4,65,70,37,180,105,227,187,21,88,181,79,5,202,86,141,182,238,76,66,68,34,245,34,132,23,85,19,176,200,232,117,134,10,181,72,123,117,141,162,38,129,224,193,79,111,88,18,73,133,72,77,241,86,21,173,234,193,23,89,9,183,3,141,181,180,158,110,95,136,149,202,40,114,92,208,42,156,67,79,32,79,182,14,101,187,104,242,151,212,208,199,89,42,246,80,20,210,10,162,48,54,132,178,85,43,201,69,8,43,180,17,250,124,42,190,40,16,136,24,169,192,140,30,20,182,186,154,234,25,113,163,97,37,189,110,59,156,110,11,158,110,89,80,95,227,174,21,22,121,150,212,71,82,232,151,235,80,1,3,246,86,84,26,140,100,221,106,110,233,219,125,246,215,246,217,111,68,42,104,24,66,80,159,175,138,98,45,117,157,13,98,63,93,122,70,28,95,38,158,145,229,75,175,31,102,129,244,250,255,60,254,120,116,112,91, +106,95,249,104,198,1,59,158,177,42,146,248,220,174,202,176,240,190,84,111,50,210,248,42,43,204,222,86,228,186,173,200,235,235,117,150,55,13,23,220,144,149,121,80,165,60,206,86,101,199,111,10,192,182,176,207,157,194,192,2,231,212,50,59,25,47,182,241,142,130,247,14,104,35,12,145,69,141,36,20,88,146,63,155,125,255,190,245,168,102,79,54,159,236,234,193,249,88,253,68,54,210,12,165,159,165,54,231,193,166,48,66,18,212,114,159,141,173,205,231,42,165,171,34,82,122,161,35,145,121,192,208,91,80,115,143,142,108,158,51,239,217,155,211,183,189,227,227,215,86,239,248,240,197,167,215,175,152,247,163,158,85,238,35,168,95,202,188,175,224,180,15,106,31,114,105,106,121,136,232,223,170,45,42,147,176,151,89,50,151,149,234,254,188,150,223,136,158,211,242,47,149,238,215,162,122,244,163,186,133,150,10,254,70,247,252,242,174,236,40,125,144,206,70,191,103,55,39,32,225,78,68,158,48,162,36,23,125,53,102,233,147,54,94,246,176,136,111,101,185,211,246,241,10,28,250, +149,144,214,83,44,226,3,184,168,131,160,54,19,64,52,201,104,70,80,83,29,53,212,72,241,26,85,244,148,80,1,64,61,185,4,117,121,148,23,209,90,161,129,134,35,68,44,245,126,213,144,164,187,88,106,4,21,8,11,224,127,72,101,65,69,164,170,62,151,40,165,89,41,155,55,85,221,189,231,178,71,93,228,138,202,110,93,200,116,15,120,123,139,255,175,1,55,70,38,252,58,221,126,188,118,38,119,31,184,59,94,134,99,140,124,148,112,121,107,35,65,63,174,74,37,82,77,159,40,235,101,174,106,2,242,154,46,141,73,41,103,23,105,118,133,210,178,108,61,36,119,180,234,221,227,201,75,178,254,7,61,114,215,239,242,231,76,81,89,69,158,209,255,198,56,105,60,85,207,231,170,102,163,104,145,75,84,49,137,100,80,74,169,138,28,220,93,160,54,211,151,158,3,22,168,162,105,64,157,126,94,68,1,117,23,255,5,113,10,185,81, diff --git a/uppsrc/umk/umake.cpp b/uppsrc/umk/umake.cpp index 40b90cf22..3769c063d 100644 --- a/uppsrc/umk/umake.cpp +++ b/uppsrc/umk/umake.cpp @@ -121,6 +121,7 @@ CONSOLE_APP_MAIN bool run = false; bool auto_hub = false; bool update_hub = false; + bool only_hub = false; String hub_dir; bool flatpak_build = !GetEnv("FLATPAK_ID").IsEmpty(); String mkf; @@ -140,7 +141,12 @@ CONSOLE_APP_MAIN } hub_dir = args[++i]; - } else { + } + else + if(ar == "hub-only") { + only_hub = true; + } + else { Puts(String("Unrecognized parameter \"") + a + "\"."); SetExitCode(7); return; @@ -264,6 +270,17 @@ CONSOLE_APP_MAIN if(update_hub) UppHubUpdate(ide.main); } + if(only_hub) { + int exit_code = 0; + if(!auto_hub && !update_hub) { + exit_code = 6; + Puts("The --hub-only option was specified, but UppHub mode instruction are " + "missing. Please ensure you include the -U or -h flag for the required " + "UppHub mode configuration.\n"); + } + SetExitCode(exit_code); + return; + } ide.wspc.Scan(ide.main); const Workspace& wspc = ide.IdeWorkspace(); if(!wspc.GetCount()) { @@ -353,7 +370,7 @@ CONSOLE_APP_MAIN else { String version = GenerateVersionNumber(); Puts("umk (U++MaKe) " + version + "\n\n" - "Usage: umk assembly main_package [build_method] [--hub-dir dir] [-options] [+flags] [output]\n\n" + "Usage: umk assembly main_package [build_method] [--hub-dir dir] [--hub-only] [-options] [+flags] [output]\n\n" "Examples: umk examples Bombs CLANG -ab +GUI,SHARED ~/bombs\n" " umk ~/upp.src/examples,~/upp.src/uppsrc Bombs ~/GCC.bm -rv +GUI,SHARED ~/bin\n" " umk ./,3p/uppsrc UppTerm 3p/umk/CLANG.bm --hub-dir 3p/hub -brU +GUI,SHARED build/UppTerm\n\n"