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'
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"

Reply via email to