From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 30 22:56:12 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B39161065670 for ; Sat, 30 Jun 2012 22:56:12 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4C77D8FC16 for ; Sat, 30 Jun 2012 22:56:12 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q5UMuBmj070607 for ; Sat, 30 Jun 2012 22:56:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5UMu6mp069323 for freebsd-gecko@freebsd.org; Sat, 30 Jun 2012 22:56:06 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 30 Jun 2012 22:56:06 GMT Message-Id: <201206302256.q5UMu6mp069323@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r824 - in branches/experimental/www: firefox firefox-esr firefox-esr/files firefox-nightly firefox-nightly/files firefox/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2012 22:56:12 -0000 Author: jbeich Date: Sat Jun 30 22:56:05 2012 New Revision: 824 Log: replace mozconfig for PGO with mk_add_options Deleted: branches/experimental/www/firefox-esr/files/mozconfig-profile_guided_optimization.in branches/experimental/www/firefox-nightly/files/mozconfig-profile_guided_optimization.in branches/experimental/www/firefox/files/mozconfig-profile_guided_optimization.in Modified: branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox/Makefile Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Sat Jun 30 22:55:57 2012 (r823) +++ branches/experimental/www/firefox-esr/Makefile Sat Jun 30 22:56:05 2012 (r824) @@ -89,6 +89,8 @@ CONFIGURE_TARGET= # .mozconfig MAKEFILE= ${WRKSRC}/client.mk ALL_TARGET= profiledbuild +MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \ + @MOZ_OBJDIR@/_profile/pgo/profileserver.py"' .endif .if ${ARCH} == amd64 || ${ARCH} == i386 @@ -135,9 +137,6 @@ post-configure: .if defined(WITH_PGO) - @${SED} -e 's|@PYTHON@|${PYTHON_CMD}|' \ - <${FILESDIR}/mozconfig-profile_guided_optimization.in \ - >> ${BUILD_WRKSRC}/.mozconfig (cd ${BUILD_WRKSRC} && ${GMAKE} distclean) .endif Deleted: branches/experimental/www/firefox-esr/files/mozconfig-profile_guided_optimization.in ============================================================================== --- branches/experimental/www/firefox-esr/files/mozconfig-profile_guided_optimization.in Sat Jun 30 22:56:05 2012 (r823) +++ /dev/null 00:00:00 1970 (deleted) @@ -1 +0,0 @@ -mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@ $(OBJDIR)/_profile/pgo/profileserver.py' Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sat Jun 30 22:55:57 2012 (r823) +++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 30 22:56:05 2012 (r824) @@ -112,6 +112,8 @@ CONFIGURE_TARGET= # .mozconfig MAKEFILE= ${WRKSRC}/client.mk ALL_TARGET= profiledbuild +MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \ + @MOZ_OBJDIR@/_profile/pgo/profileserver.py"' .endif .if ${ARCH} == amd64 || ${ARCH} == i386 @@ -154,9 +156,6 @@ post-configure: .if ${PORT_OPTIONS:MPGO} - @${SED} -e 's|@PYTHON@|${PYTHON_CMD}|' \ - <${FILESDIR}/mozconfig-profile_guided_optimization.in \ - >> ${BUILD_WRKSRC}/.mozconfig (cd ${BUILD_WRKSRC} && ${GMAKE} distclean) .endif Deleted: branches/experimental/www/firefox-nightly/files/mozconfig-profile_guided_optimization.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/mozconfig-profile_guided_optimization.in Sat Jun 30 22:56:05 2012 (r823) +++ /dev/null 00:00:00 1970 (deleted) @@ -1 +0,0 @@ -mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@ $(OBJDIR)/_profile/pgo/profileserver.py' Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sat Jun 30 22:55:57 2012 (r823) +++ branches/experimental/www/firefox/Makefile Sat Jun 30 22:56:05 2012 (r824) @@ -89,6 +89,8 @@ CONFIGURE_TARGET= # .mozconfig MAKEFILE= ${WRKSRC}/client.mk ALL_TARGET= profiledbuild +MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \ + @MOZ_OBJDIR@/_profile/pgo/profileserver.py"' .endif .if ${ARCH} == amd64 || ${ARCH} == i386 @@ -131,9 +133,6 @@ post-configure: .if defined(WITH_PGO) - @${SED} -e 's|@PYTHON@|${PYTHON_CMD}|' \ - <${FILESDIR}/mozconfig-profile_guided_optimization.in \ - >> ${BUILD_WRKSRC}/.mozconfig (cd ${BUILD_WRKSRC} && ${GMAKE} distclean) .endif Deleted: branches/experimental/www/firefox/files/mozconfig-profile_guided_optimization.in ============================================================================== --- branches/experimental/www/firefox/files/mozconfig-profile_guided_optimization.in Sat Jun 30 22:56:05 2012 (r823) +++ /dev/null 00:00:00 1970 (deleted) @@ -1 +0,0 @@ -mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@ $(OBJDIR)/_profile/pgo/profileserver.py'