diff options
Diffstat (limited to 'solenv/config/sdev300.ini')
-rw-r--r-- | solenv/config/sdev300.ini | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index f91d003dc25e..878ae45c99f0 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -8,7 +8,7 @@ common BIG_SVX TRUE BMP_WRITES_FLAG TRUE BUILD_SPECIAL TRUE - BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC + BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT common_build TRUE COMMON_OUTDIR common CONFIG_PROJECT config_office @@ -36,6 +36,7 @@ common NEW_JAR_PACK TRUE NO_REC_RES TRUE OOODMAKEMODE YES + OOO_SHELL /bin/bash PCLEAN_PATH xxx RES_ENUS TRUE RES_GER TRUE @@ -105,11 +106,6 @@ common { LU_RFLAG r_only } - shell - { - SHELL %STAR_USE_SHELL% - USE_SHELL %STAR_USE_SHELL% - } tmp { SOL_TMP %SOL_TMP_DIR% @@ -126,7 +122,7 @@ common SRC_ROOT UPDATER } - order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource + order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource reset { ALT_L10N_MODULE @@ -170,7 +166,6 @@ common pro maxproc MAXPROCESS r_only - shell STAR_USE_SHELL tmp SOL_TMP_DIR verbose VERBOSE } @@ -205,6 +200,7 @@ finish BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple DPKG %BUILD_TOOLS%$/dpkg + OOO_JUNIT_JAR %SOLARROOT%$/btools$/junit-4.8.1.jar PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH% PATH_SEPERATOR $; SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES% @@ -212,6 +208,7 @@ finish SOLARSRC %SRC_ROOT% SOURCE_ROOT_DIR $expand(%SOLARSRC%/..) ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1 + DBGSV_INIT %SOLARENV%/bin/dbgsv.ini } common_2:0 IF X%CWS_WORK_STAMP%X == XX { @@ -2217,7 +2214,6 @@ unxubti8 SOLAR_PLUGIN TRUE SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% - USE_SHELL tcsh VBA_EXTENSION NO WITH_LANG en-US de XAU_LIBS -lXau @@ -2297,10 +2293,6 @@ unxubti8 { PROSWITCH -DPRODUCT } - shell - { - USE_SHELL STAR_USE_SHELL - } sourceroot:0 IF X%SOURCE_ROOT%X != XX { SOLAR_SOURCE_ROOT %SOURCE_ROOT% @@ -2442,7 +2434,6 @@ wntgcci1 { SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: - USE_SHELL bash } common1 { @@ -2548,10 +2539,6 @@ wntgcci1 { PSDK %STAR_PSDK% } - shell - { - USE_SHELL STAR_USE_SHELL - } sourceroot:0 if X%SOURCE_ROOT%X != XX { SOLAR_SOURCE_ROOT %SOURCE_ROOT% @@ -2629,7 +2616,6 @@ wntgcci1 l10n L10N_framework pro psdk STAR_PSDK - shell STAR_USE_SHELL sourceroot } } @@ -2718,7 +2704,6 @@ wntmsci11 BS_ROOT n: SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: - USE_SHELL 4nt } common1 { @@ -2728,6 +2713,7 @@ wntmsci11 DSDK %SOLAR_ENV_ROOT%$/msvc8p$/DirectXSDK FSDK %SOLAR_ENV_ROOT%$/msvc8p$/Sdk$/v2.0 PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl + PKGFORMAT msi PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv @@ -2827,10 +2813,6 @@ wntmsci11 { PSDK %STAR_PSDK% } - shell - { - use_shell STAR_USE_SHELL - } sourceroot:0 if X%SOURCE_ROOT%X != XX { SOLAR_SOURCE_ROOT %SOURCE_ROOT% @@ -2883,7 +2865,6 @@ wntmsci11 l10n L10N_framework pro psdk STAR_PSDK - shell STAR_USE_SHELL sourceroot } } @@ -2992,8 +2973,6 @@ wntmsci12 BS_ROOT n: SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: - USE_SHELL bash - STAR_USE_SHELL bash BTOOLDIR %WORK_STAMP%$/cygtools PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl } @@ -3011,6 +2990,7 @@ wntmsci12 F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0 NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode PERL %SOLAR_ENV_ROOT%$/%PERLDIR% + PKGFORMAT msi PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1 SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv @@ -3226,7 +3206,6 @@ wntmsci12 ojdk16path pro psdk STAR_PSDK - shell STAR_USE_SHELL sourceroot tmp SOL_TMP_DIR } @@ -3336,8 +3315,6 @@ wntmsci13 BS_ROOT n: SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: - USE_SHELL bash - STAR_USE_SHELL bash BTOOLDIR %WORK_STAMP%$/cygtools PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl } @@ -3355,6 +3332,7 @@ wntmsci13 F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0 NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode PERL %SOLAR_ENV_ROOT%$/%PERLDIR% + PKGFORMAT msi PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1 SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv @@ -3569,7 +3547,6 @@ wntmsci13 ojdk16path pro psdk STAR_PSDK - shell STAR_USE_SHELL sourceroot tmp SOL_TMP_DIR } |