[SVN-Commit] r1519 - trunk/www/firefox-nightly

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Feb 28 02:02:36 2014
New Revision: 1519

Log:
add an experimental option to use mach

After build you can try some other commands:

  $ cd $(make -V WRKSRC)
  $ ./mach warnings-summary
  $ ./mach run
  $ ./mach xpcshell-test (needs TESTS build)

cf. https://developer.mozilla.org/en-US/docs/Developer_Guide/mach

Modified:
   trunk/www/firefox-nightly/Makefile

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Fri Feb 28 02:02:29 2014	(r1518)
+++ trunk/www/firefox-nightly/Makefile	Fri Feb 28 02:02:36 2014	(r1519)
@@ -45,7 +45,6 @@
 USE_QT4=	# empty
 QT_NONSTANDARD=	yes
 ALL_TARGET=	default
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GL=		gl
 USES=		dos2unix
@@ -57,11 +56,14 @@
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--enable-application=browser
 
+OPTIONS_DEFINE=		MACH
 OPTIONS_DEFAULT=	GTK2
 
 OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 
+MACH_DESC=		Use mach command to build
+
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 
@@ -71,6 +73,14 @@
 BUILD_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .endif
 
+.if ! ${PORT_OPTIONS:MMACH}
+GNU_CONFIGURE=	yes
+.endif
+
+.if ${PORT_OPTIONS:MMACH} && ${PORT_OPTIONS:MPGO}
+IGNORE=		MACH currently does not support PGO build
+.endif
+
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
@@ -82,9 +92,15 @@
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
+.if ! ${PORT_OPTIONS:MMACH}
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})
 	(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
+.else
+do-build:
+	cd ${WRKSRC} && MOZBUILD_STATE_PATH=${WRKDIR} \
+		${MAKE_ENV} ${PYTHON_CMD} ${MOZSRC}/mach build
+.endif
 
 port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}