[ooo-build-commit] Branch 'ooo/master' - 5 commits - configure.in dmake/unix scp2/source set_soenv.in solenv/bin solenv/config solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Jul 16 17:05:57 PDT 2009
configure.in | 16 ++++++++++++++
dmake/unix/runargv.c | 15 +++++++++++--
scp2/source/ooo/file_library_ooo.scp | 4 ---
set_soenv.in | 3 --
solenv/bin/make_installer.pl | 2 -
solenv/bin/modules/installer/windows/admin.pm | 12 ++++++++---
solenv/bin/modules/installer/windows/msp.pm | 28 +++++++++++++++++++++-----
solenv/config/sdev300.ini | 1
solenv/inc/minor.mk | 6 ++---
solenv/inc/tg_ext.mk | 6 ++++-
10 files changed, 70 insertions(+), 23 deletions(-)
New commits:
commit bc01e9a0d65b50d817675004410f57c0240df608
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jul 16 18:54:19 2009 +0000
DEV300
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a153f30..333b903 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m52(Build:9411)
-BUILD=9411
-LAST_MINOR=m52
+RSCREVISION=300m53(Build:9412)
+BUILD=9412
+LAST_MINOR=m53
SOURCEVERSION=DEV300
commit 5dca77d64e35e44b18a9dce311b28cca35934b6d
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jul 16 14:59:24 2009 +0000
CWS-TOOLING: integrate CWS native255_DEV300
2009-07-10 11:34:13 +0200 is r273881 : #158814# naming schema of windows patches
2009-07-08 17:50:35 +0200 is r273842 : #158814# msp naming schema
2009-07-08 15:46:43 +0200 is r273836 : #158814# msp naming schema
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index fc164e0..1de4821 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2311,7 +2311,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# Temp path for administrative installations: $installer::globals::temppath
# Path of new installation set: $finalinstalldir
# Path of old installation set: $installer::globals::updatedatabasepath
- my $mspdir = installer::windows::msp::create_msp_patch($finalinstalldir, $includepatharrayref, $allvariableshashref, $languagestringref, $filesinproductlanguageresolvedarrayref);
+ my $mspdir = installer::windows::msp::create_msp_patch($finalinstalldir, $includepatharrayref, $allvariableshashref, $languagestringref, $languagesarrayref, $filesinproductlanguageresolvedarrayref);
($is_success, $finalinstalldir) = installer::worker::analyze_and_save_logfile($loggingdir, $mspdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
installer::worker::clean_output_tree(); # removing directories created in the output tree
}
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index f5026bd..73b252c 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -58,11 +58,17 @@ sub unpack_cabinet_file
# But this wrong expand.exe is typically in the PATH before this expand.exe, to unpack
# cabinet files.
+# if ( $^O =~ /cygwin/i )
+# {
+# $expandfile = $ENV{'SYSTEMROOT'} . "/system32/expand.exe"; # Has to be located in the systemdirectory
+# $expandfile =~ s/\\/\//;
+# if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); }
+# }
+
if ( $^O =~ /cygwin/i )
{
- $expandfile = $ENV{'SYSTEMROOT'} . "/system32/expand.exe"; # Has to be located in the systemdirectory
- $expandfile =~ s/\\/\//;
- if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); }
+ $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
+ chomp $expandfile;
}
my $expandlogfile = $unpackdir . $installer::globals::separator . "expand.log";
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index ba0904e..75846f9 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -287,19 +287,35 @@ sub check_and_save_tables
}
####################################################################
+# Setting the languages for the service packs
+####################################################################
+
+sub create_langstring
+{
+ my ( $languagesarrayref ) = @_;
+
+ my $langstring = "";
+ for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ ) { $langstring = $langstring . "_" . ${$languagesarrayref}[$i]; }
+
+ return $langstring;
+}
+
+####################################################################
# Setting the name of the msp database
####################################################################
sub set_mspfilename
{
- my ($allvariables, $mspdir) = @_;
+ my ($allvariables, $mspdir, $languagesarrayref) = @_;
- my $databasename = $allvariables->{'PRODUCTNAME'} . $allvariables->{'PRODUCTVERSION'};
+ my $databasename = $allvariables->{'PRODUCTNAME'};
$databasename = lc($databasename);
$databasename =~ s/\.//g;
$databasename =~ s/\-//g;
$databasename =~ s/\s//g;
+ if ( $allvariables->{'MSPPRODUCTVERSION'} ) { $databasename = $databasename . $allvariables->{'MSPPRODUCTVERSION'}; }
+
# possibility to overwrite the name with variable DATABASENAME
# if ( $allvariables->{'DATABASENAME'} ) { $databasename = $allvariables->{'DATABASENAME'}; }
@@ -312,8 +328,10 @@ sub set_mspfilename
if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 ))
{
my $windowspatchlevel = 0;
- if ( $allvariables->{'WINDOWSPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'WINDOWSPATCHLEVEL'}; }
+ if ( $allvariables->{'MSPPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'MSPPATCHLEVEL'}; }
$databasename = $databasename . "_servicepack_" . $windowspatchlevel;
+ my $languagestring = create_langstring($languagesarrayref);
+ $databasename = $databasename . $languagestring;
}
else
{
@@ -1139,7 +1157,7 @@ sub analyze_msimsp_logfile
sub create_msp_patch
{
- my ($installationdir, $includepatharrayref, $allvariables, $languagestringref, $filesarray) = @_;
+ my ($installationdir, $includepatharrayref, $allvariables, $languagestringref, $languagesarrayref, $filesarray) = @_;
my $force = 1; # print this message even in 'quiet' mode
installer::logger::print_message( "\n******************************************\n" );
@@ -1221,7 +1239,7 @@ sub create_msp_patch
check_and_save_tables($tablelist, $localmspdir);
# Setting the name of the new msp file
- my $mspfilename = set_mspfilename($allvariables, $mspdir);
+ my $mspfilename = set_mspfilename($allvariables, $mspdir, $languagesarrayref);
# Editing tables
edit_tables($tablelist, $localmspdir, $olddatabase, $newdatabase, $mspfilename, $allvariables, $languagestringref);
commit 9dd7614d5a47b79dca2ebde0f0ce26a236e9511d
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jul 16 13:36:50 2009 +0000
CWS-TOOLING: integrate CWS tbo07
2009-07-15 12:50:18 +0200 tbo r274002 : #ii97838# fine tuning of text
2009-07-09 11:58:53 +0200 tbo r273855 : #i102592# add configur switch --enable-hids
2009-07-07 18:37:46 +0200 tbo r273812 : last fixes
2009-06-30 17:44:03 +0200 tbo r273527 : #i97838# dynamik hid.lst found
2009-06-30 12:53:57 +0200 tbo r273503 : #i100285# use other name of dialog
2009-06-25 18:56:33 +0200 tbo r273390 : CWS-TOOLING: rebase CWS tbo07 to trunk at 272827 (milestone: DEV300:m50)
2009-06-25 15:31:23 +0200 tbo r273383 : #i100285# use other name of dialog
2009-06-25 14:15:33 +0200 tbo r273381 : #i100285# use other name of dialog + context problem with macos
2009-05-20 16:36:54 +0200 tbo r272140 : readme.txt fot the lost hid.lst file
2009-05-20 16:30:31 +0200 tbo r272139 : removal of hid.lst file
2009-05-20 16:28:26 +0200 tbo r272138 : corrections
2009-05-16 19:27:00 +0200 tbo r271982 : #i# copy hid.lst from OOo installation to global/hid
2009-04-21 13:36:36 +0200 tbo r271034 : #i101044#
2009-04-20 18:49:50 +0200 tbo r271009 : #i101044#
2009-04-20 18:47:35 +0200 tbo r271008 : #i100909#
diff --git a/configure.in b/configure.in
index e46776b..cc9a533 100644
--- a/configure.in
+++ b/configure.in
@@ -61,6 +61,9 @@ AC_ARG_WITH(vba-package-format,
AC_ARG_ENABLE(pch,
[ --enable-pch EXPERIMENTAL: Enables precompiled header support for C++.
],,)
+AC_ARG_ENABLE(hids,
+[ --enable-hids Enables generation of HelpId lists.
+],,)
AC_ARG_ENABLE(mozilla,
[ --disable-mozilla OO.o usually includes a strangely hacked up mozilla
binary for your platform, to build without this
@@ -1492,6 +1495,19 @@ fi
AC_SUBST(ENABLE_PCH)
dnl ===================================================================
+dnl Set the NO_HIDS variable. (enable with --enable-hids)
+dnl ===================================================================
+AC_MSG_CHECKING([whether to enable hid list feature])
+if test -n "$enable_hids" && test "$enable_hids" != "no"; then
+ NO_HIDS=""
+ AC_MSG_RESULT([yes])
+else
+ NO_HIDS="TRUE"
+ AC_MSG_RESULT([no])
+fi
+AC_SUBST(NO_HIDS)
+
+dnl ===================================================================
dnl Search all the common names for GNU make
dnl ===================================================================
AC_MSG_CHECKING([for GNU make])
diff --git a/set_soenv.in b/set_soenv.in
index 1ee948f..2c496ef 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -186,7 +186,6 @@ $CALL_CDECL = "TRUE";
$COMMON_OUTDIR = "";
$common_build = "";
$NO_REC_RES = "TRUE";
-$NO_HIDS = "TRUE";
$SO3 = "TRUE";
$SOLAR_JAVA = "@SOLAR_JAVA@";
$SOLAR_PLUGIN = "TRUE";
@@ -1622,7 +1621,6 @@ ToFile( "common_build", $common_build, "e" );
ToFile( "BMP_WRITES_FLAG", $BMP_WRITES_FLAG, "e" );
ToFile( "BUILD_SOSL_RELEASE", $BUILD_SOSL_RELEASE, "e" );
ToFile( "NO_REC_RES", $NO_REC_RES, "e" );
-ToFile( "NO_HIDS", $NO_HIDS, "e" );
ToFile( "SO3", $SO3, "e" );
ToFile( "SOLAR_PLUGIN", $SOLAR_PLUGIN, "e" );
ToFile( "UPDATER", $UPDATER, "e" );
@@ -1816,6 +1814,7 @@ ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" );
ToFile( "ENABLE_LAYOUT", "@ENABLE_LAYOUT@", "e" );
ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" );
+ToFile( "NO_HIDS", "@NO_HIDS@", "e" );
ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" );
ToFile( "WITH_GPC", "@WITH_GPC@", "e" );
ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index a16d69e..b3ed564 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -1295,7 +1295,6 @@ unxmacxi
HAVE_GCC_VISIBILITY_FEATURE TRUE
LIBRARY_PATH %SYSBASE%/usr/lib
MKOUT %PERL% %SOLARENV%/bin/mkout.pl
- NO_HIDS TRUE
PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc
SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include/c++/4.0.0 -I%SYSBASE%/usr/include/c++/4.0.0/i686-apple-darwin8 -I%SYSBASE%/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/usr/include/python2.3 -I%SYSBASE%/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon
SOLAREXTRALIB -L%SOLAR_STLLIBPATH%
commit 1dca9073e6ee46b66bc6f30f7a56dd1a6a961b64
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jul 16 10:52:40 2009 +0000
CWS-TOOLING: integrate CWS mingwport21
2009-07-01 15:17:50 +0200 tono r273595 : i#102971: mingw port without solarbindir in PATH
2009-07-01 15:15:44 +0200 tono r273591 : i#90212: dmake not releasing file descriptor
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index 484b856..d74c0d6 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -553,8 +553,11 @@ char **cmd; /* Simulate a reference to *cmd. */
/* Restore stdout/stderr if needed. */
if( old_stdout != -1 ) {
dup2(old_stdout, 1);
- if( old_stderr != -1 )
+ close(old_stdout);
+ if( old_stderr != -1 ) {
dup2(old_stderr, 2);
+ close(old_stderr);
+ }
}
internal = 1;
@@ -593,8 +596,11 @@ char **cmd; /* Simulate a reference to *cmd. */
if( old_stdout != -1 ) {
dup2(old_stdout, 1);
- if( old_stderr != -1 )
+ close(old_stdout);
+ if( old_stderr != -1 ) {
dup2(old_stderr, 2);
+ close(old_stderr);
+ }
}
if(pid.pid == (DMHANDLE)-1) {
/* spawn failed */
@@ -649,8 +655,11 @@ char **cmd; /* Simulate a reference to *cmd. */
* failed. */
if( old_stdout != -1 ) {
dup2(old_stdout, 1);
- if( old_stderr != -1 )
+ close(old_stdout);
+ if( old_stderr != -1 ) {
dup2(old_stderr, 2);
+ close(old_stderr);
+ }
}
fprintf(stderr, "%s: Error executing '%s': %s",
Pname, argv[0], strerror(errno) );
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 6a06591..f000775 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -47,7 +47,11 @@ LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS)
.EXPORT : LDFLAGS
.ENDIF
-PATH!:=.:$(SOLARBINDIR):$(PATH)
+.IF "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt"
+PATH!:=.:$(SOLARBINDIR:^"/cygdrive/":s/://):$(PATH)
+.ELSE # "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt"
+PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH)
+.ENDIF # "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt"
.EXPORT : PATH
#override
commit 1c1966d522094b5a61e79b0a978210745cf37f62
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jul 16 09:56:45 2009 +0000
CWS-TOOLING: integrate CWS ooo311gsl05_DEV300
2009-06-30 17:18:18 +0200 pl r273524 : add patch flags for CWS ooo311gsl05
2009-06-30 16:22:06 +0200 pl r273519 : #i102485# correct landscape printing
2009-06-30 08:45:25 +0200 hdu r273486 : #i102378# fix PDF-export on PPC (thanks cloph!)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1be88f7..2434342 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1547,11 +1547,7 @@ 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
More information about the ooo-build-commit
mailing list