Attachment #29489 for issue #54479

View | Details | Raw Unified | Return to issue 54479
Collapse All | Expand All




AC_ARG_WITH(system-python,
[  --with-system-python    Use python already on system
],,)
AC_ARG_WITH(system-icu,
[  --with-system-icu       Use icu already on system
],,)
AC_ARG_WITH(system-db,
[  --with-system-db        Use berkeley db already on system
],,)

fi
AC_SUBST(SYSTEM_SANE_HEADER)

# DISABLED; INCOMPLETE
dnl ===================================================================
dnl Check for system icu
dnl ===================================================================
AC_MSG_CHECKING([which icu to use])
if test -n "$with_system_icu" -o -n "$with_system_libs" && \
	test "$with_system_icu" != "no"; then
   AC_MSG_RESULT([external])
   SYSTEM_ICU=YES
   AC_MSG_CHECKING([for unicode/rbbi.h])
   AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
   AC_PATH_PROG(SYSTEM_GENBRK, genbrk)
   if test -z "$SYSTEM_GENBRK"; then
      AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
   fi
   AC_PATH_PROG(SYSTEM_GENCCODE, genccode)
   if test -z "$SYSTEM_GENCCODE"; then
      AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
   fi
else
    AC_MSG_RESULT([internal])
    SYSTEM_ICU=NO
    BUILD_TYPE="$BUILD_TYPE ICU"
fi
AC_SUBST(SYSTEM_ICU)
AC_SUBST(SYSTEM_GENBRK)
AC_SUBST(SYSTEM_GENCCODE)

dnl ===================================================================
dnl Checks for libraries.

Lines 1731-1739 Link Here

(-)openoffice.org.orig/config_office/set_soenv.in (-3 / +3 lines)
1731	ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" );	1731	ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" );
1732	ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" );	1732	ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" );
1733	ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" );	1733	ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" );
1734	#ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" );	1734	ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" );
1735	#ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" );	1735	ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" );
1736	#ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" );	1736	ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" );
1737	ToFile( "SYSTEM_JPEG", "@SYSTEM_JPEG@", "e" );	1737	ToFile( "SYSTEM_JPEG", "@SYSTEM_JPEG@", "e" );
1738	ToFile( "SYSTEM_FREETYPE", "@SYSTEM_FREETYPE@", "e" );	1738	ToFile( "SYSTEM_FREETYPE", "@SYSTEM_FREETYPE@", "e" );
1739	ToFile( "FREETYPE_CFLAGS", "@FREETYPE_CFLAGS@", "e" );	1739	ToFile( "FREETYPE_CFLAGS", "@FREETYPE_CFLAGS@", "e" );

Lines 1-4 Link Here

(-)openoffice.org.orig/i18npool/prj/build.lst (-1 / +1 lines)
1	inp i18npool : bridges sax stoc comphelper tools icu i18nutil regexp NULL	1	inp i18npool : bridges sax stoc comphelper tools ICU:icu i18nutil regexp NULL
2	inp i18npool usr1 - all inp_mkout NULL	2	inp i18npool usr1 - all inp_mkout NULL
3	inp i18npool\source\unotypes nmake - all inp_utypes NULL	3	inp i18npool\source\unotypes nmake - all inp_utypes NULL
4	inp i18npool\source\registerservices nmake - all inp_rserv inp_utypes NULL	4	inp i18npool\source\registerservices nmake - all inp_rserv inp_utypes NULL

Lines 68-74 U_CDECL_BEGIN Link Here

(-)openoffice.org.orig/i18npool/source/breakiterator/breakiterator_unicode.cxx (-2 / +4 lines)
68	extern const char OpenOffice_icu_dat[];	68	extern const char OpenOffice_icu_dat[];
69	U_CDECL_END	69	U_CDECL_END
70		70
71	using namespace ::com::sun::star::uno;	71	using ::com::sun::star::uno::RuntimeException;
		72	using ::com::sun::star::uno::Reference;
		73	using ::com::sun::star::uno::Sequence;
72	using namespace ::com::sun::star::lang;	74	using namespace ::com::sun::star::lang;
73	using namespace ::rtl;	75	using namespace ::rtl;
74		76
Lines 104-110 static icu::BreakIterator* loadICURuleBa Link Here
104	if ( !U_SUCCESS(status) ) throw ERROR;	106	if ( !U_SUCCESS(status) ) throw ERROR;
105		107
106	status = U_ZERO_ERROR;	108	status = U_ZERO_ERROR;
107	icu::BreakIterator* breakiterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", name, &status), status);	109	icu::BreakIterator* breakiterator = new RuleBasedBreakIterator(udata_open("OpenOffice_icu/OpenOffice", "brk", name, &status), status);
108	if ( !U_SUCCESS(status) ) throw ERROR;	110	if ( !U_SUCCESS(status) ) throw ERROR;
109		111
110	return breakiterator;	112	return breakiterator;

Lines 103-109 Collator_Unicode::loadCollatorAlgorithm( Link Here

(-)openoffice.org.orig/i18npool/source/collator/collator_unicode.cxx (-1 / +1 lines)
103	// load ICU collator	103	// load ICU collator
104	UErrorCode status = U_ZERO_ERROR;	104	UErrorCode status = U_ZERO_ERROR;
105	if (rulesImage) {	105	if (rulesImage) {
106	collator = new RuleBasedCollator(rulesImage, status);	106	collator = new RuleBasedCollator(rulesImage, -1, NULL, status);
107	} else {	107	} else {
108	// load ICU collator	108	// load ICU collator
109	/** ICU collators are loaded using a locale only.	109	/** ICU collators are loaded using a locale only.

Lines 60-66 Link Here

(-)openoffice.org.orig/linguistic/source/hhconvdic.cxx (-1 / +1 lines)
60	************************************************************************/	60	************************************************************************/
61		61
62	#ifndef USCRIPT_H	62	#ifndef USCRIPT_H
63	#include <external/unicode/uscript.h>	63	#include <unicode/uscript.h>
64	#endif	64	#endif
65		65
66	#ifndef _LANG_HXX //autogen wg. LANGUAGE_ENGLISH_US	66	#ifndef _LANG_HXX //autogen wg. LANGUAGE_ENGLISH_US

Lines 1-4 Link Here

(-)openoffice.org.orig/scp2/prj/build.lst (-1 / +1 lines)
1	cp scp2 : setup_native transex3 PYTHON:python icu NULL	1	cp scp2 : setup_native transex3 PYTHON:python ICU:icu NULL
2	cp scp2 usr1 - all cp_mkout NULL	2	cp scp2 usr1 - all cp_mkout NULL
3	cp scp2\macros nmake - all cp_langmacros NULL	3	cp scp2\macros nmake - all cp_langmacros NULL
4	cp scp2\source\activex nmake - all cp_activex cp_langmacros NULL	4	cp scp2\source\activex nmake - all cp_activex cp_langmacros NULL

Lines 801-806 Link Here

(-)openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp (+4 lines)
801	Styles = (PACKED,PATCH);	801	Styles = (PACKED,PATCH);
802	End	802	End
803		803
		804	#ifndef SYSTEM_ICU
		805
804	File gid_File_Lib_Icudata	806	File gid_File_Lib_Icudata
805	TXT_FILE_BODY;	807	TXT_FILE_BODY;
806	#ifdef UNX	808	#ifdef UNX
Lines 845-850 Link Here
845	Styles = (PACKED);	847	Styles = (PACKED);
846	End	848	End
847		849
		850	#endif
		851
848	File gid_File_Lib_Iiopbrdg	852	File gid_File_Lib_Iiopbrdg
849	TXT_FILE_BODY;	853	TXT_FILE_BODY;
850	Styles = (PACKED,UNO_COMPONENT);	854	Styles = (PACKED,UNO_COMPONENT);




# --- Settings -----------------------------------------------------

.INCLUDE :  settings.mk
.INCLUDE :  icuversion.mk

.IF "$(ENABLE_CRASHDUMP)"!=""
SCPDEFS+=-DENABLE_CRASHDUMP

SCPDEFS+=-DSYSTEM_BSH
.ENDIF

.IF "$(SYSTEM_ICU)" == "YES"
SCPDEFS+=-DSYSTEM_ICU
.ELSE
.INCLUDE :  icuversion.mk
SCPDEFS+=\
    -DICU_MAJOR=$(ICU_MAJOR) \
    -DICU_MINOR=$(ICU_MINOR) \
    -DICU_MICRO=$(ICU_MICRO)
.ENDIF

SCP_PRODUCT_TYPE=osl





#endif

#ifdef UNX
#ifndef SYSTEM_ICU

Shortcut gid_Shortcut_Lib_Icudata_0
    FileID = gid_File_Lib_Icudata;

    Styles = (NETWORK,RELATIVE);
End

#endif

#ifdef UNX

Shortcut gid_Shortcut_Lib_Icudata_1
    FileID = gid_File_Lib_Icudata;
    Dir = gid_Dir_Program;

    Styles = (NETWORK,RELATIVE);
End

#endif

#ifdef UNX

Shortcut gid_Shortcut_Lib_Icui18n_0
    FileID = gid_File_Lib_Icui18n;
    Dir = gid_Dir_Program;

    Styles = (NETWORK,RELATIVE);
End

#endif

#ifdef UNX

Shortcut gid_Shortcut_Lib_Icui18n_1
    FileID = gid_File_Lib_Icui18n;
    Dir = gid_Dir_Program;

    Styles = (NETWORK,RELATIVE);
End

#endif

#ifdef UNX

Shortcut gid_Shortcut_Lib_Icule_0
    FileID = gid_File_Lib_Icule;
    Dir = gid_Dir_Program;

    Styles = (NETWORK,RELATIVE);
End

#endif

#ifdef UNX

Shortcut gid_Shortcut_Lib_Icule_1
    FileID = gid_File_Lib_Icule;
    Dir = gid_Dir_Program;

    Styles = (NETWORK,RELATIVE);
End

#endif

#ifdef UNX

Shortcut gid_Shortcut_Lib_Icuuc_0
    FileID = gid_File_Lib_Icuuc;
    Dir = gid_Dir_Program;

    Styles = (NETWORK,RELATIVE);
End

#endif

#ifdef UNX

Shortcut gid_Shortcut_Lib_Icuuc_1
    FileID = gid_File_Lib_Icuuc;
    Dir = gid_Dir_Program;

End

#endif
#endif

#ifdef UNX


Return to issue 54479

Lines 226-234 Link Here

(-)openoffice.org.orig/config_office/configure.in (-26 / +26 lines)
226	AC_ARG_WITH(system-python,	226	AC_ARG_WITH(system-python,
227	[ --with-system-python Use python already on system	227	[ --with-system-python Use python already on system
228	],,)	228	],,)
229	#AC_ARG_WITH(system-icu,	229	AC_ARG_WITH(system-icu,
230	#[ --with-system-icu Use icu already on system	230	[ --with-system-icu Use icu already on system
231	#],,)	231	],,)
232	AC_ARG_WITH(system-db,	232	AC_ARG_WITH(system-db,
233	[ --with-system-db Use berkeley db already on system	233	[ --with-system-db Use berkeley db already on system
234	],,)	234	],,)
Lines 2965-2996 Link Here
2965	fi	2965	fi
2966	AC_SUBST(SYSTEM_SANE_HEADER)	2966	AC_SUBST(SYSTEM_SANE_HEADER)
2967		2967
2968	# DISABLED; INCOMPLETE
2969	dnl ===================================================================	2968	dnl ===================================================================
2970	dnl Check for system icu	2969	dnl Check for system icu
2971	dnl ===================================================================	2970	dnl ===================================================================
2972	#AC_MSG_CHECKING([which icu to use])	2971	AC_MSG_CHECKING([which icu to use])
2973	#if test -n "$with_system_icu" -o -n "$with_system_libs" && \	2972	if test -n "$with_system_icu" -o -n "$with_system_libs" && \
2974	# test "$with_system_icu" != "no"; then	2973	test "$with_system_icu" != "no"; then
2975	# AC_MSG_RESULT([external])	2974	AC_MSG_RESULT([external])
2976	# SYSTEM_ICU=YES	2975	SYSTEM_ICU=YES
2977	# AC_MSG_CHECKING([for unicode/rbbi.h])	2976	AC_MSG_CHECKING([for unicode/rbbi.h])
2978	# AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))	2977	AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
2979	# AC_PATH_PROG(SYSTEM_GENBRK, genbrk)	2978	AC_PATH_PROG(SYSTEM_GENBRK, genbrk)
2980	# if test -z "$SYSTEM_GENBRK"; then	2979	if test -z "$SYSTEM_GENBRK"; then
2981	# AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])	2980	AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
2982	# fi	2981	fi
2983	# AC_PATH_PROG(SYSTEM_GENCCODE, genccode)	2982	AC_PATH_PROG(SYSTEM_GENCCODE, genccode)
2984	# if test -z "$SYSTEM_GENCCODE"; then	2983	if test -z "$SYSTEM_GENCCODE"; then
2985	# AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])	2984	AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
2986	# fi	2985	fi
2987	#else	2986	else
2988	# AC_MSG_RESULT([internal])	2987	AC_MSG_RESULT([internal])
2989	# SYSTEM_ICU=NO	2988	SYSTEM_ICU=NO
2990	#fi	2989	BUILD_TYPE="$BUILD_TYPE ICU"
2991	#AC_SUBST(SYSTEM_ICU)	2990	fi
2992	#AC_SUBST(SYSTEM_GENBRK)	2991	AC_SUBST(SYSTEM_ICU)
2993	#AC_SUBST(SYSTEM_GENCCODE)	2992	AC_SUBST(SYSTEM_GENBRK)
		2993	AC_SUBST(SYSTEM_GENCCODE)
2994		2994
2995	dnl ===================================================================	2995	dnl ===================================================================
2996	dnl Checks for libraries.	2996	dnl Checks for libraries.

Lines 193-198 Link Here

(-)openoffice.org.orig/scp2/source/ooo/shortcut_ooo.scp (-28 / +2 lines)
193	#endif	193	#endif
194		194
195	#ifdef UNX	195	#ifdef UNX
		196	#ifndef SYSTEM_ICU
196		197
197	Shortcut gid_Shortcut_Lib_Icudata_0	198	Shortcut gid_Shortcut_Lib_Icudata_0
198	FileID = gid_File_Lib_Icudata;	199	FileID = gid_File_Lib_Icudata;
Lines 201-210 Link Here
201	Styles = (NETWORK,RELATIVE);	202	Styles = (NETWORK,RELATIVE);
202	End	203	End
203		204
204	#endif
205
206	#ifdef UNX
207
208	Shortcut gid_Shortcut_Lib_Icudata_1	205	Shortcut gid_Shortcut_Lib_Icudata_1
209	FileID = gid_File_Lib_Icudata;	206	FileID = gid_File_Lib_Icudata;
210	Dir = gid_Dir_Program;	207	Dir = gid_Dir_Program;
Lines 212-221 Link Here
212	Styles = (NETWORK,RELATIVE);	209	Styles = (NETWORK,RELATIVE);
213	End	210	End
214		211
215	#endif
216
217	#ifdef UNX
218
219	Shortcut gid_Shortcut_Lib_Icui18n_0	212	Shortcut gid_Shortcut_Lib_Icui18n_0
220	FileID = gid_File_Lib_Icui18n;	213	FileID = gid_File_Lib_Icui18n;
221	Dir = gid_Dir_Program;	214	Dir = gid_Dir_Program;
Lines 223-232 Link Here
223	Styles = (NETWORK,RELATIVE);	216	Styles = (NETWORK,RELATIVE);
224	End	217	End
225		218
226	#endif
227
228	#ifdef UNX
229
230	Shortcut gid_Shortcut_Lib_Icui18n_1	219	Shortcut gid_Shortcut_Lib_Icui18n_1
231	FileID = gid_File_Lib_Icui18n;	220	FileID = gid_File_Lib_Icui18n;
232	Dir = gid_Dir_Program;	221	Dir = gid_Dir_Program;
Lines 234-243 Link Here
234	Styles = (NETWORK,RELATIVE);	223	Styles = (NETWORK,RELATIVE);
235	End	224	End
236		225
237	#endif
238
239	#ifdef UNX
240
241	Shortcut gid_Shortcut_Lib_Icule_0	226	Shortcut gid_Shortcut_Lib_Icule_0
242	FileID = gid_File_Lib_Icule;	227	FileID = gid_File_Lib_Icule;
243	Dir = gid_Dir_Program;	228	Dir = gid_Dir_Program;
Lines 245-254 Link Here
245	Styles = (NETWORK,RELATIVE);	230	Styles = (NETWORK,RELATIVE);
246	End	231	End
247		232
248	#endif
249
250	#ifdef UNX
251
252	Shortcut gid_Shortcut_Lib_Icule_1	233	Shortcut gid_Shortcut_Lib_Icule_1
253	FileID = gid_File_Lib_Icule;	234	FileID = gid_File_Lib_Icule;
254	Dir = gid_Dir_Program;	235	Dir = gid_Dir_Program;
Lines 256-265 Link Here
256	Styles = (NETWORK,RELATIVE);	237	Styles = (NETWORK,RELATIVE);
257	End	238	End
258		239
259	#endif
260
261	#ifdef UNX
262
263	Shortcut gid_Shortcut_Lib_Icuuc_0	240	Shortcut gid_Shortcut_Lib_Icuuc_0
264	FileID = gid_File_Lib_Icuuc;	241	FileID = gid_File_Lib_Icuuc;
265	Dir = gid_Dir_Program;	242	Dir = gid_Dir_Program;
Lines 267-276 Link Here
267	Styles = (NETWORK,RELATIVE);	244	Styles = (NETWORK,RELATIVE);
268	End	245	End
269		246
270	#endif
271
272	#ifdef UNX
273
274	Shortcut gid_Shortcut_Lib_Icuuc_1	247	Shortcut gid_Shortcut_Lib_Icuuc_1
275	FileID = gid_File_Lib_Icuuc;	248	FileID = gid_File_Lib_Icuuc;
276	Dir = gid_Dir_Program;	249	Dir = gid_Dir_Program;
Lines 279-284 Link Here
279	End	252	End
280		253
281	#endif	254	#endif
		255	#endif
282		256
283	#ifdef UNX	257	#ifdef UNX
284		258

Lines 79-84 MY_BRK_TXTFILES:=$(shell ls data/*.txt) Link Here

(-)openoffice.org.orig/i18npool/source/breakiterator/makefile.mk (-3 / +5 lines)
79	# insert "OpenOffice" as icu package name in front of the name of each rule file for searching on application provided data	79	# insert "OpenOffice" as icu package name in front of the name of each rule file for searching on application provided data
80	MY_BRK_BRKFILES:=$(subst,data/,$(MISC)$/OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))	80	MY_BRK_BRKFILES:=$(subst,data/,$(MISC)$/OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))
81		81
		82	MY_BRK_NAMEDBRKFILES:=$(subst,data/,OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))
		83
82	# OpenOffice_icu_dat.c is a generated file from the rule file list by gencmn	84	# OpenOffice_icu_dat.c is a generated file from the rule file list by gencmn
83	MY_MISC_CXXFILES := \	85	MY_MISC_CXXFILES := \
84	$(MISC)$/OpenOffice_icu_dat.c \	86	$(MISC)$/OpenOffice_icu_dat.c \
Lines 107-114 APP1STDLIBS = $(SALLIB) \ Link Here
107		109
108	# 'gencmn', 'genbrk' and 'genccode' are tools generated and delivered by icu project to process icu breakiterator rules.	110	# 'gencmn', 'genbrk' and 'genccode' are tools generated and delivered by icu project to process icu breakiterator rules.
109	$(MISC)$/OpenOffice_icu_dat.c : $(MY_BRK_BRKFILES)	111	$(MISC)$/OpenOffice_icu_dat.c : $(MY_BRK_BRKFILES)
110	+$(WRAPCMD) $(SOLARBINDIR)$/gencmn -e OpenOffice_icu -n OpenOffice_icu -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n"))	112	+$(WRAPCMD) gencmn -e OpenOffice_icu -n OpenOffice_icu -S -d $(MISC) O $(mktmp $(MY_BRK_NAMEDBRKFILES:t"\n"))
111	$(MISC)$/OpenOffice_%.brk : data/%.txt	113	$(MISC)$/OpenOffice_%.brk : data/%.txt
112	+$(WRAPCMD) $(SOLARBINDIR)$/genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk	114	+$(WRAPCMD) genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk
113	$(MISC)$/%_brk.c : $(MISC)$/%.brk	115	$(MISC)$/%_brk.c : $(MISC)$/%.brk
114	+$(WRAPCMD) $(SOLARBINDIR)$/genccode -d $(MISC)$ $(MISC)$/$*.brk	116	+$(WRAPCMD) genccode -e OpenOffice_icu -n OpenOffice_icu -d $(MISC)$ $(MISC)$/$*.brk

Lines 68-74 Link Here

(-)openoffice.org.orig/scp2/source/ooo/makefile.mk (-1 / +5 lines)
68	# --- Settings -----------------------------------------------------	68	# --- Settings -----------------------------------------------------
69		69
70	.INCLUDE : settings.mk	70	.INCLUDE : settings.mk
71	.INCLUDE : icuversion.mk
72		71
73	.IF "$(ENABLE_CRASHDUMP)"!=""	72	.IF "$(ENABLE_CRASHDUMP)"!=""
74	SCPDEFS+=-DENABLE_CRASHDUMP	73	SCPDEFS+=-DENABLE_CRASHDUMP
Lines 170-179 Link Here
170	SCPDEFS+=-DSYSTEM_BSH	169	SCPDEFS+=-DSYSTEM_BSH
171	.ENDIF	170	.ENDIF
172		171
		172	.IF "$(SYSTEM_ICU)" == "YES"
		173	SCPDEFS+=-DSYSTEM_ICU
		174	.ELSE
		175	.INCLUDE : icuversion.mk
173	SCPDEFS+=\	176	SCPDEFS+=\
174	-DICU_MAJOR=$(ICU_MAJOR) \	177	-DICU_MAJOR=$(ICU_MAJOR) \
175	-DICU_MINOR=$(ICU_MINOR) \	178	-DICU_MINOR=$(ICU_MINOR) \
176	-DICU_MICRO=$(ICU_MICRO)	179	-DICU_MICRO=$(ICU_MICRO)
		180	.ENDIF
177		181
178	SCP_PRODUCT_TYPE=osl	182	SCP_PRODUCT_TYPE=osl
179		183