[ooo-build-commit] Branch 'ooo/OOO320' - 3 commits - instsetoo_native/util solenv/bin solenv/inc

[Jan Holesovsky]

 instsetoo_native/util/pack.lst            |    2 +-
 solenv/bin/modules/CreatePDBRelocators.pm |    2 +-
 solenv/inc/minor.mk                       |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e06583ae0a3f10ea64a5b05b0fd61a9f8a731376
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Thu Oct 29 15:07:21 2009 +0000

    #i10000# Enable SDK

diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 9f5fbfd..d61b134 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -14,7 +14,7 @@ OpenOffice      unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12
 #BrOffice_wJRE                                                                                     pt-BR   brofficewithjre
 OpenOffice_Dev  unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro    en-US   openofficedev
 #BrOffice_Dev                                                                                      pt-BR   brofficedev
-#OpenOffice_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoo
+OpenOffice_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoo
 OpenOffice_Dev_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoodev
 #URE             unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12  en-US   ure
 OpenOfficeLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro    de      ooolanguagepack
commit 2814fe0b0e55a7ab6a03c3c51531afccdfe59795
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Thu Oct 29 12:57:12 2009 +0000

    OOO320

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index e95c7ee..a36c20c 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=320
-RSCREVISION=320m2(Build:9432)
-BUILD=9432
-LAST_MINOR=m2
+RSCREVISION=320m3(Build:9436)
+BUILD=9436
+LAST_MINOR=m3
 SOURCEVERSION=OOO320
commit c9fb2a1ead326cd0513ac6a885208581dd20fc6a
Author: Kurt Zenker <kz at openoffice.org>
Date:   Wed Oct 28 14:00:01 2009 +0000

    #i106387# relocate pdb is broken on cygwin

diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index 46e5f8b..84c380b 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -121,7 +121,7 @@ sub collect_files
 {
     my ($srcdir, $platform, $filesref) = @_; 
     my $template = "$srcdir/*/$platform";
-    if ( $^O eq 'MSWin32' ) {
+    if ( $ENV{GUI} eq "WNT" ) {
         # collect all pdb files on o:
         # regular glob does not work with two wildcard on WNT
         my @bin    = glob("$template/bin/*.pdb");