diff options
author | blackend <blackend@FreeBSD.org> | 2009-06-28 08:59:46 +0000 |
---|---|---|
committer | blackend <blackend@FreeBSD.org> | 2009-06-28 08:59:46 +0000 |
commit | e32c401685c4415341818d7f785b56cecc712b70 (patch) | |
tree | c82be5301366ca35613d0ddffd5c2b14570f9af1 /usr.sbin/sysinstall/menus.c | |
parent | 25ffa6178c929df93fd0e0ca37ad532423b11a6d (diff) | |
download | FreeBSD-src-e32c401685c4415341818d7f785b56cecc712b70.zip FreeBSD-src-e32c401685c4415341818d7f785b56cecc712b70.tar.gz |
- release/* update to use freebsd-doc-* packages instead of building
FreeBSD docset during 'make release' this will speed up release
builds;
- sysinstall(8) has also been updated to use these packages with a new
menu allowing people to choose what localized doc to install;
- mention in UPDATING that docs from the FreeBSD Documentation project
are now installed in /usr/local/share/doc/freebsd instead of
/usr/share/doc.
Approved by: re (kensmith)
Diffstat (limited to 'usr.sbin/sysinstall/menus.c')
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 81 |
1 files changed, 79 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 152ad32..df54e17 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -72,6 +72,15 @@ clearKernel(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_REDRAW; } +static int +setDocAll(dialogMenuItem *self) +{ + Dists |= DIST_DOC; + DocDists = DIST_DOC_ALL; + return DITEM_SUCCESS | DITEM_REDRAW; +} + + #define _IS_SET(dist, set) (((dist) & (set)) == (set)) #define IS_DEVELOPER(dist, extra) (_IS_SET(dist, _DIST_DEVELOPER | extra) || \ @@ -108,6 +117,7 @@ static int checkDistEverything(dialogMenuItem *self) { return Dists == DIST_ALL && + _IS_SET(DocDists, DIST_DOC_ALL) && _IS_SET(SrcDists, DIST_SRC_ALL) && _IS_SET(KernelDists, DIST_KERNEL_ALL); } @@ -125,6 +135,12 @@ kernelFlagCheck(dialogMenuItem *item) } static int +docFlagCheck(dialogMenuItem *item) +{ + return DocDists; +} + +static int checkTrue(dialogMenuItem *item) { return TRUE; @@ -167,6 +183,7 @@ DMenu MenuIndex = { { " Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, { " Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, { " Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, + { " Documentation Installation", "Installation of FreeBSD documentation set", NULL, distSetDocMenu }, { " Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" }, { " Doc, Errata", "The distribution errata.", NULL, dmenuDisplayFile, NULL, "ERRATA" }, { " Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" }, @@ -286,6 +303,62 @@ DMenu MenuDocumentation = { { NULL } }, }; +/* The FreeBSD documentation installation menu */ +DMenu MenuDocInstall = { + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, + "FreeBSD Documentation Installation Menu", + "This menu will allow you to install the whole documentation set\n" + "from the FreeBSD Documentation Project: Handbook, FAQ and articles.\n\n" + "Please select the language versions you wish to install. At minimum,\n" + "you should install the English version, this is the original version\n" + "of the documentation.", + NULL, + NULL, + { { "X Exit", "Exit this menu (returning to previous)", + checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { "All", "Select all below", + NULL, setDocAll, NULL, NULL, ' ', ' ', ' ' }, + { " bn", "Bengali Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_BN }, + { " da", "Danish Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_DA }, + { " de", "German Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_DE }, + { " el", "Greek Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_EL }, + { " en", "English Documentation (recommended)", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_EN }, + { " es", "Spanish Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_ES }, + { " fr", "French Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_FR }, + { " hu", "Hungarian Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_HU }, + { " it", "Italian Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_IT }, + { " ja", "Japanese Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_JA }, + { " mn", "Mongolian Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_MN }, + { " nl", "Dutch Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_NL }, + { " pl", "Polish Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_PL }, + { " pt", "Portuguese Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_PT }, + { " ru", "Russian Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_RU }, + { " sr", "Serbian Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_SR }, + { " tr", "Turkish Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_TR }, + { " zh_cn", "Simplified Chinese Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_ZH_CN }, + { " zh_tw", "Traditional Chinese Documentation", + dmenuFlagCheck, dmenuSetFlag, NULL, &DocDists, '[', 'X', ']', DIST_DOC_ZH_TW }, + { NULL } }, +}; + #ifdef WITH_MICE DMenu MenuMouseType = { DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, @@ -917,8 +990,10 @@ DMenu MenuSubDistributions = { kernelFlagCheck,distSetKernel }, { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, - { " doc", "Miscellaneous FreeBSD online docs", - dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC }, + { " doc", "FreeBSD Documentation set", + docFlagCheck, distSetDoc }, + { " docuser", "Miscellaneous userland docs", + dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOCUSERLAND }, { " games", "Games (non-commercial)", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES }, { " info", "GNU info files", @@ -1138,6 +1213,8 @@ DMenu MenuConfigure = { NULL, dmenuExit }, { " Distributions", "Install additional distribution sets", NULL, distExtractAll }, + { " Documentation installation", "Install FreeBSD Documentation set", + NULL, distSetDocMenu }, { " Packages", "Install pre-packaged software for FreeBSD", NULL, configPackages }, { " Root Password", "Set the system manager's password", |