From owner-p4-projects@FreeBSD.ORG Mon May 29 10:49:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDE1316A41F; Mon, 29 May 2006 10:49:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0950B16A42A for ; Mon, 29 May 2006 10:48:58 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26C9B43D58 for ; Mon, 29 May 2006 10:48:57 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TAlirf008855 for ; Mon, 29 May 2006 10:47:44 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TAli9K008852 for perforce@freebsd.org; Mon, 29 May 2006 10:47:44 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 29 May 2006 10:47:44 GMT Message-Id: <200605291047.k4TAli9K008852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 98058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 10:49:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=98058 Change 98058 by soc-andrew@soc-andrew_serv on 2006/05/29 10:47:35 Build gettext strings during release Use the new gettext to change "partition" -> "slice" and "subpartition" -> "partition" Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/main.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile#5 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/Makefile#1 add .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/en.po#1 add .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#49 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/main.lua#3 (text+ko) ==== @@ -38,6 +38,8 @@ -- local arg = arg +local POSIX = require("posix") + -- -- Load the application framework. -- @@ -51,7 +53,7 @@ GetText = require("gettext") GetText.set_package("dfuibe_lua") -- XXX use App.conf.dir.root here: - GetText.set_locale_dir("/usr/local/share/locale") + GetText.set_locale_dir("/usr/libexec/bsdinstaller/locale") GetText.init() else GetText = nil @@ -150,6 +152,11 @@ App.state.resolv_conf = ConfigVars.new() -- +-- Change the strings to be correct for the FreeBSD system installer +-- +POSIX.putenv("LANG=en") + +-- -- First let the user configure the important user-interface aspects -- of their system (language, keyboard/screenmap if on console, -- internet connection for logging to remote machine over net, etc.) ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile#5 (text+ko) ==== @@ -1,3 +1,3 @@ -SUBDIR= base conf configure configure.menu inst lib pit +SUBDIR= base conf configure configure.menu inst lib pit po .include ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#49 (text+ko) ==== @@ -857,6 +857,13 @@ @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-gettext \ ROOT=${RD}/bsdinstaller/root + cd /usr/ports/devel/gettext && \ + env -i FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} && \ + make all install clean BATCH=yes FORCE_PKG_REGISTER=yes + + # Install the BSDInstaller translations + @cd ${.CURDIR}/../libexec/bsdinstaller/po && make all-nls install-nls DESTDIR=${RD}/bsdinstaller/root + @touch ${RD}/bsdinstaller/root/etc/fstab @echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf @echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf