Attachment #82678 for bug #124660





.INCLUDE: target.mk

LOCALPYFILES=
	$(BIN)$/uno.py \
	$(BIN)$/unohelper.py \
	$(BIN)$/pythonloader.py \
	$(BIN)$/pythonscript.py \
	$(BIN)$/mailmerge.py

# PKGFORMAT taken from environment. See possible
# values below.

Lines 1-4 Link Here

(-)postprocess/prj/build.lst.orig (-1 / +1 lines)
1	po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools NULL	1	po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:readlicense_oo SO:top unodevtools NULL
2	po postprocess usr1 - all po_mkout NULL	2	po postprocess usr1 - all po_mkout NULL
3	po postprocess\checkxml nmake - all po_checkxml NULL	3	po postprocess\checkxml nmake - all po_checkxml NULL
4	po postprocess\checkdeliver nmake - all po_checkdlv NULL	4	po postprocess\checkdeliver nmake - all po_checkdlv NULL

Lines 13-19 Link Here

(-)scp2/prj/build.lst.orig (-2 / +1 lines)
13	cp scp2\source\lingu nmake - all cp_lingu cp_langmacros NULL	13	cp scp2\source\lingu nmake - all cp_lingu cp_langmacros NULL
14	cp scp2\source\math nmake - all cp_math cp_langmacros NULL	14	cp scp2\source\math nmake - all cp_math cp_langmacros NULL
15	cp scp2\source\ooo nmake - all cp_ooo cp_langmacros NULL	15	cp scp2\source\ooo nmake - all cp_ooo cp_langmacros NULL
16	cp scp2\source\python nmake - all cp_python cp_langmacros NULL
17	cp scp2\source\quickstart nmake - all cp_quickstart cp_langmacros NULL	16	cp scp2\source\quickstart nmake - all cp_quickstart cp_langmacros NULL
18	cp scp2\source\sdkoo nmake - all cp_sdkoo cp_langmacros NULL	17	cp scp2\source\sdkoo nmake - all cp_sdkoo cp_langmacros NULL
19	cp scp2\source\testtool nmake - all cp_testtool cp_langmacros NULL	18	cp scp2\source\testtool nmake - all cp_testtool cp_langmacros NULL
Lines 22-25 Link Here
22	cp scp2\source\xsltfilter nmake - all cp_xsltfilter cp_langmacros NULL	21	cp scp2\source\xsltfilter nmake - all cp_xsltfilter cp_langmacros NULL
23	cp scp2\source\winexplorerext nmake - all cp_winexplorerext cp_langmacros NULL	22	cp scp2\source\winexplorerext nmake - all cp_winexplorerext cp_langmacros NULL
24	cp scp2\source\ure nmake - all cp_ure cp_langmacros NULL	23	cp scp2\source\ure nmake - all cp_ure cp_langmacros NULL
25	cp scp2\util nmake - all cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo NULL	24	cp scp2\util nmake - all cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_lingu cp_math cp_ooo cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo NULL

Lines 104-110 Link Here

(-)scp2/source/javafilter/file_javafilter.scp.orig (-2 lines)
104	STD_JAR_FILE_PATCH( gid_File_Jar_Aportisdoc, aportisdoc )	104	STD_JAR_FILE_PATCH( gid_File_Jar_Aportisdoc, aportisdoc )
105	STD_JAR_FILE( gid_File_Jar_Pexcel, pexcel )	105	STD_JAR_FILE( gid_File_Jar_Pexcel, pexcel )
106	STD_JAR_FILE( gid_File_Jar_Pocketword, pocketword )	106	STD_JAR_FILE( gid_File_Jar_Pocketword, pocketword )
107	STD_JAR_FILE_PATCH( gid_File_Jar_Xmerge, xmerge )
108	UNO_JAR_FILE_PATCH( gid_File_Jar_Xmergebridge, XMergeBridge )
109		107
110	#endif	108	#endif




             module_lingu.par              \
             file_lingu.par                \
             module_xsltfilter.par         \
             file_xsltfilter.par
             module_python.par             \
             module_python_mailmerge.par   \
             file_python.par               \
             profileitem_python.par        \
             shortcut_python.par

.IF "$(SOLAR_JAVA)"!=""
SCP1FILES +=                               \

             module_lingu.par              \
             file_lingu.par                \
             module_xsltfilter.par         \
             file_xsltfilter.par
             module_python.par             \
             module_python_mailmerge.par   \
             file_python.par               \
             profileitem_python.par

.IF "$(SOLAR_JAVA)"!=""
SCP2FILES +=                               \

Lines 1-6 Link Here

(-)testtools/prj/build.lst.orig (-2 / +1 lines)
1	tt testtools : cpputools io remotebridges stoc javaunohelper pyuno NULL	1	tt testtools : cpputools io remotebridges stoc javaunohelper NULL
2	tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_javaTestObjs NULL	2	tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_javaTestObjs NULL
3	tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl NULL	3	tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl NULL
4	tt testtools\source\bridgetest\idl nmake - all tt_bridgetest_idl NULL	4	tt testtools\source\bridgetest\idl nmake - all tt_bridgetest_idl NULL
5	tt testtools\com\sun\star\comp\bridge nmake - all tt_javaTestObjs tt_bridgetest_idl NULL	5	tt testtools\com\sun\star\comp\bridge nmake - all tt_javaTestObjs tt_bridgetest_idl NULL
6	tt testtools\source\bridgetest\pyuno nmake - all tt_pyuno tt_bridgetest NULL

Return to bug 124660

Lines 75-86 Link Here

(-)instsetoo_native/util/makefile.mk.orig (-6 / +1 lines)
75		75
76	.INCLUDE: target.mk	76	.INCLUDE: target.mk
77		77
78	LOCALPYFILES= \	78	LOCALPYFILES=
79	$(BIN)$/uno.py \
80	$(BIN)$/unohelper.py \
81	$(BIN)$/pythonloader.py \
82	$(BIN)$/pythonscript.py \
83	$(BIN)$/mailmerge.py
84		79
85	# PKGFORMAT taken from environment. See possible	80	# PKGFORMAT taken from environment. See possible
86	# values below.	81	# values below.

Lines 84-95 Link Here

(-)scp2/util/makefile.mk.orig (-11 / +2 lines)
84	module_lingu.par \	84	module_lingu.par \
85	file_lingu.par \	85	file_lingu.par \
86	module_xsltfilter.par \	86	module_xsltfilter.par \
87	file_xsltfilter.par \	87	file_xsltfilter.par
88	module_python.par \
89	module_python_mailmerge.par \
90	file_python.par \
91	profileitem_python.par \
92	shortcut_python.par
93		88
94	.IF "$(SOLAR_JAVA)"!=""	89	.IF "$(SOLAR_JAVA)"!=""
95	SCP1FILES += \	90	SCP1FILES += \
Lines 197-207 Link Here
197	module_lingu.par \	192	module_lingu.par \
198	file_lingu.par \	193	file_lingu.par \
199	module_xsltfilter.par \	194	module_xsltfilter.par \
200	file_xsltfilter.par \	195	file_xsltfilter.par
201	module_python.par \
202	module_python_mailmerge.par \
203	file_python.par \
204	profileitem_python.par
205		196
206	.IF "$(SOLAR_JAVA)"!=""	197	.IF "$(SOLAR_JAVA)"!=""
207	SCP2FILES += \	198	SCP2FILES += \