Attachment #275873 for bug #360893

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




endif

include $(topsrcdir)/config/rules.mk

INSTALL_SDK = 1

include $(topsrcdir)/toolkit/mozapps/installer/packager.mk

# the apilibdir always ends with 1.9 as every patch update will provide a link
apilibdir = $(dir $(installdir))xulrunner-2.0

$(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile
	printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
	  $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@

ifndef SKIP_GRE_REGISTRATION
# to register xulrunner per-user, override this with $HOME/.gre.d
regdir = /etc/gre.d


endif

%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
	cat $< | sed \
	-e "s|%prefix%|$(prefix)|" \
	-e "s|%includedir%|$(includedir)|" \
	-e "s|%idldir%|$(idldir)|" \
	-e "s|%sdkdir%|$(sdkdir)|" \
	-e "s|%libdir%|$(apilibdir)|" \
	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \
	-e "s|%MOZ_XUL_LINK%|$(MOZ_XUL_LINK)|" \

Lines 1-10 Link Here

(-)a/xulrunner/installer/libxul-embedding.pc.in (-1 / +2 lines)
1	prefix=%prefix%	1	prefix=%prefix%
2	sdkdir=%sdkdir%	2	sdkdir=%sdkdir%
3	includedir=%includedir%	3	includedir=%includedir%
4	idldir=%idldir%	4	idldir=%idldir%
5		5
6	Name: libxul-embedding	6	Name: libxul-embedding
7	Description: Static library for version-independent embedding of the Mozilla runtime	7	Description: Static library for version-independent embedding of the Mozilla runtime
8	Version: %MOZILLA_VERSION%	8	Version: %MOZILLA_VERSION%
9	Libs: -L${sdkdir}/lib -lxpcomglue -ldl	9	Requires: %NSPR_NAME% >= %NSPR_VERSION%
		10	Libs: -L${sdkdir}/sdk/lib -lxpcomglue -ldl
10	Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%	11	Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%

Lines 1-10 Link Here

(-)a/xulrunner/installer/libxul.pc.in (+1 lines)
1	prefix=%prefix%	1	prefix=%prefix%
2	sdkdir=%sdkdir%	2	sdkdir=%sdkdir%
		3	libdir=%libdir%
3	includedir=%includedir%	4	includedir=%includedir%
4	idldir=%idldir%	5	idldir=%idldir%
5		6
6	Name: libxul	7	Name: libxul
7	Description: The Mozilla Runtime and Embedding Engine	8	Description: The Mozilla Runtime and Embedding Engine
8	Version: %MOZILLA_VERSION%	9	Version: %MOZILLA_VERSION%
9	Requires: %NSPR_NAME% >= %NSPR_VERSION%	10	Requires: %NSPR_NAME% >= %NSPR_VERSION%
10	Libs: -L${sdkdir}/lib %MOZ_XUL_LINK%	11	Libs: -L${sdkdir}/lib %MOZ_XUL_LINK%

Lines 1-8 Link Here

(-)a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in (+1 lines)
1	prefix=%prefix%	1	prefix=%prefix%
2	sdkdir=%sdkdir%	2	sdkdir=%sdkdir%
		3	libdir=%libdir%
3	includedir=%includedir%	4	includedir=%includedir%
4		5
5	Name: mozilla-gtkembedmoz	6	Name: mozilla-gtkembedmoz
6	Description: Static version-independent Mozilla Embedding Widget for Gtk+	7	Description: Static version-independent Mozilla Embedding Widget for Gtk+
7	Version: %MOZILLA_VERSION%	8	Version: %MOZILLA_VERSION%
8	Requires: libxul-embedding = %MOZILLA_VERSION%	9	Requires: libxul-embedding = %MOZILLA_VERSION%

Lines 1-8 Link Here

(-)a/xulrunner/installer/mozilla-gtkmozembed.pc.in (+1 lines)
1	prefix=%prefix%	1	prefix=%prefix%
2	sdkdir=%sdkdir%	2	sdkdir=%sdkdir%
		3	libdir=%libdir%
3	includedir=%includedir%	4	includedir=%includedir%
4		5
5	Name: mozilla-gtkembedmoz	6	Name: mozilla-gtkembedmoz
6	Description: Mozilla Embedding Widget for Gtk+	7	Description: Mozilla Embedding Widget for Gtk+
7	Version: %MOZILLA_VERSION%	8	Version: %MOZILLA_VERSION%
8	Requires: libxul = %MOZILLA_VERSION%	9	Requires: libxul = %MOZILLA_VERSION%

Lines 1-10 Link Here

(-)a/xulrunner/installer/mozilla-js.pc.in (-1 / +2 lines)
1	prefix=%prefix%	1	prefix=%prefix%
2	sdkdir=%sdkdir%	2	sdkdir=%sdkdir%
		3	libdir=%libdir%
3	includedir=%includedir%	4	includedir=%includedir%
4		5
5	Name: JavaScript	6	Name: JavaScript
6	Description: The Mozilla JavaScript Library	7	Description: The Mozilla JavaScript Library
7	Version: %MOZILLA_VERSION%	8	Version: %MOZILLA_VERSION%
8	Requires: %NSPR_NAME% >= %NSPR_VERSION%	9	Requires: %NSPR_NAME% >= %NSPR_VERSION%
9	Libs: -L${sdkdir}/lib %MOZ_JS_LINK%	10	Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib %MOZ_JS_LINK%
10	Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE	11	Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE

Return to bug 360893

Lines 62-77 PKG_DMG_SOURCE = $(STAGEPATH)xulrunner-p Link Here

(-)a/xulrunner/installer/Makefile.in (+4 lines)
62	endif	62	endif
63		63
64	include $(topsrcdir)/config/rules.mk	64	include $(topsrcdir)/config/rules.mk
65		65
66	INSTALL_SDK = 1	66	INSTALL_SDK = 1
67		67
68	include $(topsrcdir)/toolkit/mozapps/installer/packager.mk	68	include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
69		69
		70	# the apilibdir always ends with 1.9 as every patch update will provide a link
		71	apilibdir = $(dir $(installdir))xulrunner-2.0
		72
70	$(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile	73	$(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile
71	printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \	74	printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
72	$(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@	75	$(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
73		76
74	ifndef SKIP_GRE_REGISTRATION	77	ifndef SKIP_GRE_REGISTRATION
75	# to register xulrunner per-user, override this with $HOME/.gre.d	78	# to register xulrunner per-user, override this with $HOME/.gre.d
76	regdir = /etc/gre.d	79	regdir = /etc/gre.d
77		80
Lines 116-131 pkg_config_files += mozilla-nss.pc Link Here
116	endif	119	endif
117		120
118	%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)	121	%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
119	cat $< \| sed \	122	cat $< \| sed \
120	-e "s\|%prefix%\|$(prefix)\|" \	123	-e "s\|%prefix%\|$(prefix)\|" \
121	-e "s\|%includedir%\|$(includedir)\|" \	124	-e "s\|%includedir%\|$(includedir)\|" \
122	-e "s\|%idldir%\|$(idldir)\|" \	125	-e "s\|%idldir%\|$(idldir)\|" \
123	-e "s\|%sdkdir%\|$(sdkdir)\|" \	126	-e "s\|%sdkdir%\|$(sdkdir)\|" \
		127	-e "s\|%libdir%\|$(apilibdir)\|" \
124	-e "s\|%MOZ_APP_NAME%\|$(MOZ_APP_NAME)\|" \	128	-e "s\|%MOZ_APP_NAME%\|$(MOZ_APP_NAME)\|" \
125	-e "s\|%MOZILLA_VERSION%\|$(MOZ_APP_VERSION)\|" \	129	-e "s\|%MOZILLA_VERSION%\|$(MOZ_APP_VERSION)\|" \
126	-e "s\|%WCHAR_CFLAGS%\|$(WCHAR_CFLAGS)\|" \	130	-e "s\|%WCHAR_CFLAGS%\|$(WCHAR_CFLAGS)\|" \
127	-e "s\|%FULL_NSPR_LIBS%\|$(FULL_NSPR_LIBS)\|" \	131	-e "s\|%FULL_NSPR_LIBS%\|$(FULL_NSPR_LIBS)\|" \
128	-e "s\|%FULL_NSPR_CFLAGS%\|$(FULL_NSPR_CFLAGS)\|" \	132	-e "s\|%FULL_NSPR_CFLAGS%\|$(FULL_NSPR_CFLAGS)\|" \
129	-e "s\|%NSPR_NAME%\|$(NSPR_NAME)\|" \	133	-e "s\|%NSPR_NAME%\|$(NSPR_NAME)\|" \
130	-e "s\|%NSPR_VERSION%\|$(NSPR_VERSION)\|" \	134	-e "s\|%NSPR_VERSION%\|$(NSPR_VERSION)\|" \
131	-e "s\|%MOZ_XUL_LINK%\|$(MOZ_XUL_LINK)\|" \	135	-e "s\|%MOZ_XUL_LINK%\|$(MOZ_XUL_LINK)\|" \