1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
--- /tmp/Makefile.in 2008-04-07 13:55:44.000000000 +0200
+++ extensions/python/dom/src/Makefile.in 2008-04-07 13:56:27.000000000 +0200
@@ -22,7 +22,7 @@
# We always need the Python and pyxpcom includes and libs.
LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES)
EXTRA_LIBS += $(MOZ_PYTHON_LIBS) \
- $(call EXPAND_LIBNAME_PATH,pyxpcom,$(DIST)/lib) \
+ $(DIST)/lib/$(DLL_PREFIX)pyxpcom$(DLL_SUFFIX) \
$(NULL)
# In the shorter term we need JS too.
Index: config/rules.mk
===================================================================
RCS file: /cvsroot/mozilla/config/rules.mk,v
retrieving revision 3.554
diff -u -r3.554 rules.mk
--- config/rules.mk 14 May 2007 14:21:44 -0000 3.554
+++ config/rules.mk 21 May 2007 00:41:20 -0000
@@ -775,6 +775,12 @@
install:: $(SDK_HEADERS)
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
endif
+
+ifneq (,$(SDK_LIBRARY))
+install:: $(SDK_LIBRARY)
+ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
+endif
+
endif
install:: $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
--- extensions/python/xpcom/src/module/Makefile.in.orig 2007-05-28 20:48:26.000000000 +0200
+++ extensions/python/xpcom/src/module/Makefile.in 2007-05-28 20:49:03.000000000 +0200
@@ -95,8 +95,8 @@
install::
ifneq ($(OS_ARCH),WINNT)
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom
- mv $(DISTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom/_xpcom$(MOZ_PYTHON_DLL_SUFFIX)
+ $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom
+ mv $(DESTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom/_xpcom$(MOZ_PYTHON_DLL_SUFFIX)
endif
clobber::
--- extensions/python/xpcom/Makefile.in.orig 2007-05-29 10:17:10.000000000 +0200
+++ extensions/python/xpcom/Makefile.in 2007-05-29 10:17:22.000000000 +0200
@@ -97,9 +97,9 @@
$(INSTALL) $(PYSRCS_XPCOMTOOLS) $(DIST)/bin/python/xpcom/tools
install::
- $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DISTDIR)$(pyexecdir)/xpcom
- $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DISTDIR)$(pyexecdir)/xpcom/client
- $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DISTDIR)$(pyexecdir)/xpcom/server
+ $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DESTDIR)$(pyexecdir)/xpcom
+ $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DESTDIR)$(pyexecdir)/xpcom/client
+ $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DESTDIR)$(pyexecdir)/xpcom/server
clobber::
rm -rf $(DIST)/bin/python/xpcom
Index: extensions/python/dom/test/pyxultest/application.ini
===================================================================
RCS file: /cvsroot/mozilla/extensions/python/dom/test/pyxultest/application.ini,v
retrieving revision 1.2
diff -u -r1.2 application.ini
--- extensions/python/dom/test/pyxultest/application.ini 29 Apr 2006 01:56:36 -0000 1.2
+++ extensions/python/dom/test/pyxultest/application.ini 21 Aug 2007 22:36:44 -0000
@@ -15,7 +15,7 @@
; This field specifies your application's build ID (timestamp). This field is
; required.
-BuildID=@BUILD_ID@
+BuildID=20070625
; This field specifies a compact copyright notice for your application. This
; field is optional.
|
