[ooo-build-commit] Branch 'ooo/master' - 7 commits - instsetoo_native/util scp2/source solenv/bin solenv/config solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Jul 7 17:06:04 PDT 2009
instsetoo_native/util/openoffice.lst | 8 +++---
scp2/source/ooo/file_library_ooo.scp | 18 ++++++++------
solenv/bin/make_installer.pl | 5 ++--
solenv/bin/modules/installer/epmfile.pm | 4 +--
solenv/config/sdev300.ini | 40 ++++++++++++++++++--------------
solenv/inc/minor.mk | 6 ++--
6 files changed, 46 insertions(+), 35 deletions(-)
New commits:
commit e9b01e9cb3b6a8dadc0652c8fb27219211572634
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jul 7 11:01:44 2009 +0000
#i10000# MAXPROC: Undefined variable.
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 4049394..b7a9f15 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -48,6 +48,7 @@ common
wrapper_override_cc_wrapper TRUE
ZIPSOURCE 1
BUILD_QADEVOOO YES
+ MAXPROC maxproc=15
}
common:0 IF %UPDATER% == YES
{
commit 56f1c9ed74383a91e64f98f154611337325e4579
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Tue Jul 7 10:27:54 2009 +0000
DEV300
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index d88e1fd..a153f30 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m51(Build:9408)
-BUILD=9408
-LAST_MINOR=m51
+RSCREVISION=300m52(Build:9411)
+BUILD=9411
+LAST_MINOR=m52
SOURCEVERSION=DEV300
commit a51d948eb2a0e1897bc3afa55d9b73c47e66266c
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jul 7 10:20:40 2009 +0000
#i10000# MAXPROC added for lucopy
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index e2c3784..4049394 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -72,6 +72,10 @@ common
{
ENABLE_CRASHDUMP STATIC
}
+ maxproc
+ {
+ MAXPROC maxproc=%MAXPROCESS%
+ }
nojava
{
DISABLE_JAVA TRUE
@@ -117,7 +121,7 @@ common
STL_ROOT
UPDATER
}
- order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump
+ order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc
reset
{
ENVCFLAGS
@@ -153,6 +157,7 @@ common
envroot
nojava
pro
+ maxproc MAXPROCESS
shell STAR_USE_SHELL
tmp SOL_TMP_DIR
verbose VERBOSE
@@ -536,7 +541,7 @@ unxfbsdi
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -547,7 +552,7 @@ unxfbsdi
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -859,7 +864,7 @@ unxlngi6
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -870,7 +875,7 @@ unxlngi6
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -1171,7 +1176,7 @@ unxlngx6
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1182,7 +1187,7 @@ unxlngx6
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -1492,7 +1497,7 @@ unxmacxi
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1503,7 +1508,7 @@ unxmacxi
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -1797,7 +1802,7 @@ unxsoli4
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1808,7 +1813,7 @@ unxsoli4
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -2111,7 +2116,7 @@ unxsols4
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2122,7 +2127,7 @@ unxsols4
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -2971,7 +2976,7 @@ wntgcci1
{
150: set MYENV_PATH=%PATH
160: set PATH=%SSX_PATH
- 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET%
+ 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC%
260: set PATH=%MYENV_PATH
270: unset MYENV_PATH
400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
@@ -2981,7 +2986,7 @@ wntgcci1
{
150: setenv MYENV_PATH $PATH
160: setenv PATH $SSX_PATH
- 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
260: setenv PATH $MYENV_PATH
270: unsetenv MYENV_PATH
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2996,7 +3001,7 @@ wntgcci1
260: export PATH=$MYENV_PATH
270: unset MYENV_PATH
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
851: export SO_GEN_ERROR
@@ -3714,7 +3719,7 @@ wntmsci12
{
150: set MYENV_PATH=%PATH
160: set PATH=%SSX_PATH
- 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET%
+ 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC%
260: set PATH=%MYENV_PATH
270: unset MYENV_PATH
300: call pcleaner.btm
commit a1261bd99530d520355f2023acd32566a14a6c42
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Tue Jul 7 07:40:36 2009 +0000
CWS-TOOLING: integrate CWS ooo311gsl04_DEV300
2009-06-25 18:59:25 +0200 pl r273391 : add forgotten patch flags for cws: ooo311gsl01,ooo311gsl02,ooo311gsl03,ooo311gsl04,svp02,c28v001
2009-06-25 18:05:10 +0200 pl r273388 : CWS-TOOLING: rebase CWS ooo311gsl04 to branches/OOO310 at 272865 (milestone: OOO310:m13)
2009-06-15 16:57:19 +0200 pl r273001 : #i98804# check for nil
2009-06-11 07:14:52 +0200 hdu r272842 : #i102603# make rotated+shuffled text export work again
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 27f1538..f07438c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -428,7 +428,7 @@ End
#endif
-STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
+STD_LIB_FILE_PATCH(gid_File_Lib_Drawinglayer,drawinglayer)
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj)
@@ -596,7 +596,7 @@ End
#ifdef QUARTZ
File gid_File_Lib_Fps_Aqua
TXT_FILE_BODY;
- Styles = (PACKED);
+ Styles = (PACKED,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = gid_Dir_Program;
Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
@@ -1163,7 +1163,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
File gid_File_Lib_Vclplug_Gen
Name = LIBNAME(vclplug_gen);
TXT_FILE_BODY;
- Styles = (PACKED);
+ Styles = (PACKED,PATCH);
Dir = gid_Dir_Program;
End
#endif
@@ -1173,7 +1173,7 @@ End
File gid_File_Lib_Vclplug_Gtk
Name = LIBNAME(vclplug_gtk);
TXT_FILE_BODY;
- Styles = (PACKED);
+ Styles = (PACKED,PATCH);
Dir = gid_Dir_Program;
End
#endif
@@ -1182,7 +1182,7 @@ End
File gid_File_Lib_Vclplug_Kde
Name = LIBNAME(vclplug_kde);
TXT_FILE_BODY;
- Styles = (PACKED);
+ Styles = (PACKED,PATCH);
Dir = gid_Dir_Program;
End
#endif
@@ -1208,7 +1208,7 @@ End
#endif
#if defined UNX && ! defined QUARTZ
-STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
#endif
@@ -1547,7 +1547,11 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
File gid_File_Lib_Vcl
Name = LIBNAME(vcl);
TXT_FILE_BODY;
+<<<<<<< .working
Styles = (PACKED,UNO_COMPONENT,PATCH);
+=======
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
+>>>>>>> .merge-right.r273775
Dir = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
commit 84f0b050fdce4c6c5908631d714f763578294682
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Tue Jul 7 07:03:34 2009 +0000
CWS-TOOLING: integrate CWS native250_DEV300
2009-06-25 11:55:49 +0200 is r273374 : #159953# Patch IDs for Solaris Sparc and x86
2009-06-15 16:48:23 +0200 is r273000 : #159953# update of service tags
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index d7b74e4..223cf70 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1686,8 +1686,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
installer::epmfile::create_new_directory_structure($newepmdir);
$installer::globals::postprocess_specialepm = 1;
-
- if (( $installer::globals::patch ) && ( $installer::globals::issolarisx86build )) { installer::worker::fix2_solaris_x86_patch($packagename, $installer::globals::epmoutpath); }
+
+ # solaris patch not needed anymore
+ # if (( $installer::globals::patch ) && ( $installer::globals::issolarisx86build )) { installer::worker::fix2_solaris_x86_patch($packagename, $installer::globals::epmoutpath); }
}
}
else # this is the standard epm (not relocatable) or ( nonlinux and nonsolaris )
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 65e52c2..9191623 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1092,10 +1092,10 @@ sub set_revision_in_pkginfo
my $micro = $3;
my $finalmajor = $major;
- my $finalminor = 0;
+ my $finalminor = $minor;
my $finalmicro = 0;
- if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; }
+ # if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; }
$version = "$finalmajor.$finalminor.$finalmicro";
}
commit 34ffeae1747127cf06f2834d16ae5499ea656f31
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Tue Jul 7 07:00:55 2009 +0000
CWS-TOOLING: integrate CWS tkr22_DEV300
2009-06-10 16:22:32 +0200 tkr r272826 : #100878# ucpdav1 lib has now the patch flag
2009-06-08 14:38:33 +0200 tkr r272731 : CWS-TOOLING: rebase CWS tkr22 to branches/OOO310 at 272261 (milestone: OOO310:m12)
2009-06-08 13:10:16 +0200 tkr r272728 : #100878# add Wspiapi.h to ne_sockets to prevent win2000 crashes
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index fb04a05..27f1538 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1507,7 +1507,7 @@ File gid_File_Lib_Ucpchelp1
End
#ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
#endif
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
commit a0258a572fe28741a04ec1b8c660355aced9649c
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Tue Jul 7 06:34:02 2009 +0000
CWS-TOOLING: integrate CWS jl128_DEV300
2009-06-09 17:02:57 +0200 is r272784 : #i102493# update to jre6u14
2009-06-09 16:44:21 +0200 is r272782 : #i102493# update to jre6u14
2009-06-09 16:18:47 +0200 is r272780 : #i102493# update to jre6u14
2009-06-09 16:17:33 +0200 is r272779 : #i102493# update to jre6u14
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index a9b9080..7e65e07 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -123,7 +123,7 @@ OpenOffice_wJRE
BASEPRODUCTVERSION 3.2
UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
@@ -194,7 +194,7 @@ OpenOffice_Dev
SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93
UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
EVAL
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
@@ -412,7 +412,7 @@ BrOffice_wJRE
PROGRESSFRAMECOLOR
UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
@@ -487,7 +487,7 @@ BrOffice_Dev
SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93
UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
EVAL
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
More information about the ooo-build-commit
mailing list