Attachment #211831 for bug #244307

View | Details | Raw Unified | Return to bug 244307
Collapse All | Expand All





PORTNAME=	gn
DISTVERSIONPREFIX=	v
DISTVERSION=	1714
PORTREVISION=	1
CATEGORIES=	devel

MAINTAINER=	o.hushchenkov@gmail.com


CONFLICTS_INSTALL=	chromium-gn

USES=		alias compiler:c++17-lang ninja python:build shebangfix
USE_GITHUB=	yes
GH_ACCOUNT=	cglogic # mirror
SHEBANG_FILES=	${CONFIGURE_SCRIPT}


post-patch:
	@${REINPLACE_CMD} 's/"python"/"${PYTHON_CMD:T}"/' \
		${WRKSRC}/src/gn/exec_process_unittest.cc

do-install:
	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1560866156	1	TIMESTAMP = 1582365298
2	SHA256 (cglogic-gn-v1600_GH0.tar.gz) = c821d57848a7b7b6ee33333db827abb34545fd939ab7bc3b27f1a64e0a8e1da2	2	SHA256 (cglogic-gn-v1714_GH0.tar.gz) = 6b98b752ef16ab50c45123deb5893ddef6598a5ebac6191efba162c9689ef20c
3	SIZE (cglogic-gn-v1600_GH0.tar.gz) = 942568	3	SIZE (cglogic-gn-v1714_GH0.tar.gz) = 941711




- .git/ is missing in archive, so use version from environment

--- build/gen.py.orig	2020-02-22 10:07:32 UTC
+++ build/gen.py
@@ -124,25 +124,16 @@ def main(argv):
 
 
 def GenerateLastCommitPosition(host, header):

 #ifndef OUT_LAST_COMMIT_POSITION_H_
 #define OUT_LAST_COMMIT_POSITION_H_
 
 #define LAST_COMMIT_POSITION_NUM %s
-#define LAST_COMMIT_POSITION "%s (%s)"
+#define LAST_COMMIT_POSITION "%s"
 
 #endif  // OUT_LAST_COMMIT_POSITION_H_
-''' % (mo.group(1), mo.group(1), mo.group(2))
+''' % (os.environ['GN_VERSION'], os.environ['GN_VERSION'])
 
   # Only write/touch this file if the commit position has changed.
   old_contents = ''

Return to bug 244307

Lines 2-9 Link Here

(-)Makefile (-4 / +3 lines)
2		2
3	PORTNAME= gn	3	PORTNAME= gn
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1600	5	DISTVERSION= 1714
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8		7
9	MAINTAINER= o.hushchenkov@gmail.com	8	MAINTAINER= o.hushchenkov@gmail.com
Lines 14-20 Link Here
14		13
15	CONFLICTS_INSTALL= chromium-gn	14	CONFLICTS_INSTALL= chromium-gn
16		15
17	USES= alias compiler:c++14-lang ninja python:build shebangfix	16	USES= alias compiler:c++17-lang ninja python:build shebangfix
18	USE_GITHUB= yes	17	USE_GITHUB= yes
19	GH_ACCOUNT= cglogic # mirror	18	GH_ACCOUNT= cglogic # mirror
20	SHEBANG_FILES= ${CONFIGURE_SCRIPT}	19	SHEBANG_FILES= ${CONFIGURE_SCRIPT}
Lines 29-35 Link Here
29		28
30	post-patch:	29	post-patch:
31	@${REINPLACE_CMD} 's/"python"/"${PYTHON_CMD:T}"/' \	30	@${REINPLACE_CMD} 's/"python"/"${PYTHON_CMD:T}"/' \
32	${WRKSRC}/tools/gn/exec_process_unittest.cc	31	${WRKSRC}/src/gn/exec_process_unittest.cc
33		32
34	do-install:	33	do-install:
35	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	34	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin

Lines 1-8 Link Here

(-)files/patch-build_gen.py (-4 / +5 lines)
1	- .git/ is missing in archive, so use version from environment	1	- .git/ is missing in archive, so use version from environment
2		2
3	--- build/gen.py.orig 2019-05-30 09:42:43 UTC	3	--- build/gen.py.orig 2020-02-22 10:07:32 UTC
4	+++ build/gen.py	4	+++ build/gen.py
5	@@ -117,24 +117,15 @@ def main(argv):	5	@@ -124,25 +124,16 @@ def main(argv):
6		6
7		7
8	def GenerateLastCommitPosition(host, header):	8	def GenerateLastCommitPosition(host, header):
Lines 20-31 Link Here
20	#ifndef OUT_LAST_COMMIT_POSITION_H_	20	#ifndef OUT_LAST_COMMIT_POSITION_H_
21	#define OUT_LAST_COMMIT_POSITION_H_	21	#define OUT_LAST_COMMIT_POSITION_H_
22		22
		23	#define LAST_COMMIT_POSITION_NUM %s
23	-#define LAST_COMMIT_POSITION "%s (%s)"	24	-#define LAST_COMMIT_POSITION "%s (%s)"
24	+#define LAST_COMMIT_POSITION "%s"	25	+#define LAST_COMMIT_POSITION "%s"
25		26
26	#endif // OUT_LAST_COMMIT_POSITION_H_	27	#endif // OUT_LAST_COMMIT_POSITION_H_
27	-''' % (mo.group(1), mo.group(2))	28	-''' % (mo.group(1), mo.group(1), mo.group(2))
28	+''' % (os.environ['GN_VERSION'])	29	+''' % (os.environ['GN_VERSION'], os.environ['GN_VERSION'])
29		30
30	# Only write/touch this file if the commit position has changed.	31	# Only write/touch this file if the commit position has changed.
31	old_contents = ''	32	old_contents = ''