[ooo-build-commit] Branch 'ooo/master' - 5 commits - configure.cmd instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure solenv/bin solenv/config solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Sep 11 19:11:46 PDT 2009
configure.cmd | 8 ++--
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt | 4 +-
instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt | 6 +--
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 4 +-
instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt | 6 +--
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt | 4 +-
instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt | 6 +--
instsetoo_native/inc_ure/windows/msi_templates/Control.idt | 4 +-
instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt | 6 +--
solenv/bin/modules/installer/epmfile.pm | 7 ++-
solenv/bin/modules/pre2par/systemactions.pm | 5 ++
solenv/config/sdev300.ini | 2 +
solenv/inc/_tg_app.mk | 20 +++++-----
solenv/inc/libs.mk | 4 ++
solenv/inc/pstrules.mk | 6 ++-
solenv/inc/tg_app.mk | 2 -
solenv/inc/tg_config.mk | 4 ++
solenv/inc/unitools.mk | 1
18 files changed, 60 insertions(+), 39 deletions(-)
New commits:
commit 7d8cf8a954e8e5e34c2e4f6f8d385bf02ff3b067
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Sep 11 17:41:33 2009 +0000
CWS-TOOLING: integrate CWS dv15
2009-09-10 07:47:47 +0200 dv r276020 : #i104942# Better renaming algorithmen
2009-09-03 13:42:16 +0200 dv r275749 : #i104754# New icon for shared extensions
2009-09-03 13:37:58 +0200 dv r275748 : #i104754# New icon for shared extensions
2009-09-03 10:31:06 +0200 dv r275746 : #i104745# Reordered controls for better A11Y support
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index 50e4853..e5be5e4 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -23,13 +23,13 @@ AdminNetworkLocation BannerLine Line 0 44 374 0 1
AdminNetworkLocation Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
AdminNetworkLocation Branding2 Text 3 228 140 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
-AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 SetupPathEdit
+AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
AdminNetworkLocation DlgLine Line 145 234 229 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
-AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23
+AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit
AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse
AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next
AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
index c5cc29d..100074c 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
@@ -1,11 +1,11 @@
Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel
s72 i2 i2 i2 i2 I4 L128 s50 S50 S50
Dialog Dialog
-AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel
+AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
AdminNetworkLocation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel
AdminWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
CancelSetup 50 50 260 85 3 [ProductName] [Setup] No No No
-CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameEdit Next Cancel
+CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameLabel Next Cancel
CustomSetup 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] Tree Next Cancel
CustomSetupTips 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
DatabaseFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
@@ -13,7 +13,7 @@ DestinationFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next
DiskSpaceRequirements 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retry Exit
FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel
-InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel
+InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
LicenseAgreement 50 50 374 266 2 [ProductName] - [STR_INSTALLATION_WIZARD] Agree Next Cancel
MaintenanceType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index df12081..1142348 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -23,13 +23,13 @@ AdminNetworkLocation BannerLine Line 0 44 374 0 1
AdminNetworkLocation Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
AdminNetworkLocation Branding2 Text 3 228 88 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
-AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 SetupPathEdit
+AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
AdminNetworkLocation DlgLine Line 90 234 284 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
-AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23
+AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit
AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse
AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next
AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
index 5636eee..48f5d2a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
@@ -1,12 +1,12 @@
Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel
s72 i2 i2 i2 i2 I4 L128 s50 S50 S50
Dialog Dialog
-AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel
+AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
AdminNetworkLocation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel
AdminWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
ApplicationInfo1 50 50 260 85 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
CancelSetup 50 50 260 85 3 [ProductName] [Setup] No No No
-CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameEdit Next Cancel
+CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameLabel Next Cancel
CustomSetup 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] Tree Next Cancel
CustomSetupTips 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
DatabaseFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
@@ -14,7 +14,7 @@ DestinationFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next
DiskSpaceRequirements 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retry Exit
FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel
-InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel
+InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
LanguageInfo1 50 50 260 85 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
LanguageSelection 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index aff3c06..b9a811e 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
@@ -23,13 +23,13 @@ AdminNetworkLocation BannerLine Line 0 44 374 0 1
AdminNetworkLocation Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
AdminNetworkLocation Branding2 Text 3 228 92 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
-AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 SetupPathEdit
+AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
AdminNetworkLocation DlgLine Line 95 234 279 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
-AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23
+AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit
AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse
AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next
AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
index 11c035f..54a594f 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
@@ -1,11 +1,11 @@
Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel
s72 i2 i2 i2 i2 I4 L128 s50 S50 S50
Dialog Dialog
-AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel
+AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
AdminNetworkLocation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel
AdminWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
CancelSetup 50 50 260 85 3 [ProductName] [Setup] No No No
-CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameEdit Next Cancel
+CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameLabel Next Cancel
CustomSetup 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] Tree Next Cancel
CustomSetupTips 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
DatabaseFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
@@ -13,7 +13,7 @@ DestinationFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next
DiskSpaceRequirements 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retry Exit
FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel
-InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel
+InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
LicenseAgreement 50 50 374 266 2 [ProductName] - [STR_INSTALLATION_WIZARD] Agree Next Cancel
MaintenanceType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
index 512f2d3..61fdd63 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
@@ -23,13 +23,13 @@ AdminNetworkLocation BannerLine Line 0 44 374 0 1
AdminNetworkLocation Branding1 Text 4 229 32 13 3 {&MSSWhiteSerif8}[ProductName]
AdminNetworkLocation Branding2 Text 3 228 32 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
-AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 SetupPathEdit
+AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
AdminNetworkLocation DlgLine Line 35 234 339 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
-AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23
+AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit
AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse
AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next
AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
index 11c035f..54a594f 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
@@ -1,11 +1,11 @@
Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel
s72 i2 i2 i2 i2 I4 L128 s50 S50 S50
Dialog Dialog
-AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel
+AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
AdminNetworkLocation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel
AdminWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
CancelSetup 50 50 260 85 3 [ProductName] [Setup] No No No
-CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameEdit Next Cancel
+CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameLabel Next Cancel
CustomSetup 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] Tree Next Cancel
CustomSetupTips 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
DatabaseFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
@@ -13,7 +13,7 @@ DestinationFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next
DiskSpaceRequirements 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retry Exit
FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel
-InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel
+InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
LicenseAgreement 50 50 374 266 2 [ProductName] - [STR_INSTALLATION_WIZARD] Agree Next Cancel
MaintenanceType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel
commit 6815850d58c2461d8288c0eafae499ec19ac5c9a
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Sep 11 11:51:21 2009 +0000
CWS-TOOLING: integrate CWS dv14
2009-09-10 15:16:32 +0200 sg r276035 : #160513# updated wfs scheme to accept ports
2009-09-10 07:41:47 +0200 dv r276019 : #i104942# Better renaming algorithmen
2009-08-31 13:41:11 +0200 dv r275604 : #160505# Setting APP1PRODUCTNAME must not overwrite APP1PRODUCTDEF
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 22e23fc..cdb592d 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -55,7 +55,7 @@ USE_APP1DEF=
.IF "$(APP1TARGETN)"!=""
.IF "$(APP1PRODUCTNAME)"!=""
-APP1PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
+APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
.ENDIF # "$(APP1PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
@@ -329,7 +329,7 @@ USE_APP2DEF=
.IF "$(APP2TARGETN)"!=""
.IF "$(APP2PRODUCTNAME)"!=""
-APP2PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
+APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
.ENDIF # "$(APP2PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
@@ -603,7 +603,7 @@ USE_APP3DEF=
.IF "$(APP3TARGETN)"!=""
.IF "$(APP3PRODUCTNAME)"!=""
-APP3PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
+APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
.ENDIF # "$(APP3PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
@@ -877,7 +877,7 @@ USE_APP4DEF=
.IF "$(APP4TARGETN)"!=""
.IF "$(APP4PRODUCTNAME)"!=""
-APP4PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
+APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
.ENDIF # "$(APP4PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
@@ -1151,7 +1151,7 @@ USE_APP5DEF=
.IF "$(APP5TARGETN)"!=""
.IF "$(APP5PRODUCTNAME)"!=""
-APP5PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
+APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
.ENDIF # "$(APP5PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
@@ -1425,7 +1425,7 @@ USE_APP6DEF=
.IF "$(APP6TARGETN)"!=""
.IF "$(APP6PRODUCTNAME)"!=""
-APP6PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
+APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
.ENDIF # "$(APP6PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
@@ -1699,7 +1699,7 @@ USE_APP7DEF=
.IF "$(APP7TARGETN)"!=""
.IF "$(APP7PRODUCTNAME)"!=""
-APP7PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
+APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
.ENDIF # "$(APP7PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
@@ -1973,7 +1973,7 @@ USE_APP8DEF=
.IF "$(APP8TARGETN)"!=""
.IF "$(APP8PRODUCTNAME)"!=""
-APP8PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
+APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
.ENDIF # "$(APP8PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
@@ -2247,7 +2247,7 @@ USE_APP9DEF=
.IF "$(APP9TARGETN)"!=""
.IF "$(APP9PRODUCTNAME)"!=""
-APP9PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
+APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
.ENDIF # "$(APP9PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
@@ -2521,7 +2521,7 @@ USE_APP10DEF=
.IF "$(APP10TARGETN)"!=""
.IF "$(APP10PRODUCTNAME)"!=""
-APP10PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\"
+APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\"
.ENDIF # "$(APP10PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 423b73b..fc0b3d3 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -88,7 +88,7 @@ USE_APP$(TNR)DEF=
.IF "$(APP$(TNR)TARGETN)"!=""
.IF "$(APP$(TNR)PRODUCTNAME)"!=""
-APP$(TNR)PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\"
+APP$(TNR)PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\"
.ENDIF # "$(APP$(TNR)PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
commit bee41d2e1fb26e50b62414d956ce89ced66ccd3f
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Sep 10 22:44:47 2009 +0000
CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
diff --git a/configure.cmd b/configure.cmd
index 389efd2..1d84752 100755
--- a/configure.cmd
+++ b/configure.cmd
@@ -1,7 +1,7 @@
@echo off
setlocal
-SET ANT_HOME=C:\PROGRAMMI\jsdk142\apache-ant-1.7.0
-SET JAVA_HOME=C:\PROGRAMMI\jsdk142
-SET PATH=%JAVA_HOME%\bin;%PATH%;%ANT_HOME%\bin;
-sh -c "configure --disable-werror --with-use-shell=4nt --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts" | tee configure.log
+SET MY_ANT_HOME=e:/java150/apache-ant-1.7.0
+SET JAVA_HOME=e:\java150
+SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin;
+sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=4nt --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log
endlocal
diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm
index de1084b..80bbd85 100644
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ b/solenv/bin/modules/pre2par/systemactions.pm
@@ -47,6 +47,11 @@ sub create_directory
my $returnvalue = 1;
my $infoline = "";
+ if ($directory eq "" )
+ {
+ return 0;
+ }
+
if (!(-d $directory))
{
$returnvalue = mkdir($directory, 0775);
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index e6164f4..6104637 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -350,7 +350,11 @@ AVMEDIALIB=iavmedia.lib
ICUINLIB=icuin.lib
ICULELIB=icule.lib
ICUUCLIB=icuuc.lib
+.IF "$(GUI)"=="OS2"
+ICUDATALIB=icudt.lib
+.ELSE
ICUDATALIB=icudata.lib
+.ENDIF
I18NUTILLIB=ii18nutil.lib
I18NISOLANGLIB=ii18nisolang.lib
I18NPAPERLIB=ii18npaper.lib
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 3957943..aa9813a 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -143,9 +143,13 @@ $(PAR)/%.par :
@echo ------------------------------
@echo Making: $@
@@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
.ENDIF
+# YD: INCLUDE macro too long, include only few items (scp2 compile)
+.IF "$(GUI)"=="OS2"
+ $(CPPLCC) -+ -P -I..\..\inc -I..\..\os2gcci.pro\inc $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+.ENDIF
.IF "$(GUI)"=="UNX"
$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
.ENDIF
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index 428f9ff..099ec9e 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -36,6 +36,10 @@ XCSROOTURL!:=$(ABSXCSROOT)
XCSROOTURL!:=file:///$(subst,\,/ $(XCSROOTURL))
.ENDIF
SYSXSLDIR*:=$(XSLDIR)/
+.IF $(GUI)==OS2
+XCSROOTURL!:=$(subst,\,/ $(XCSROOTURL))
+SYSXSLDIR!:=$(subst,\,/ $(SYSXSLDIR))/
+.ENDIF
#
# --- XCS ---
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 74bb6f9..ed30eca 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -178,6 +178,7 @@ FIND=find
LS=ls
DUMPBIN=echo
4nt_force_shell:=+
+
.ENDIF # "$(GUI)"=="UNX"
# (Global) Set if not set before
commit 1b5f26886ff0538aa563a6bc7b20e9295251688c
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Sep 10 22:33:17 2009 +0000
CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 7f067ab..b7b0a41 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -703,6 +703,7 @@ unxlngi6
ENABLE_KAB TRUE
ENABLE_KDE TRUE
ENABLE_EVOAB2 TRUE
+ ENABLE_CAIRO TRUE
ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
GLIBC 2SUSE90
GUI UNX
@@ -1318,6 +1319,7 @@ unxmacxi
DISABLE_DEPRECATION_WARNING TRUE
EXTRA_CDEFS -DBUILD_OS_APPLEOSX -DBUILD_OS_MAJOR=10 -DBUILD_OS_MINOR=4 -DBUILD_OS_REV=10
EXTRA_CFLAGS -isysroot %COMPATH%/MacOSX10.4u.sdk
+ ENABLE_CAIRO TRUE
EXTRA_LINKFLAGS -Wl,-syslibroot,%COMPATH%/MacOSX10.4u.sdk
GNUCOPY gnucp
LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
commit d93562efca12e94e0244622d06b26db1fe4313c9
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Sep 10 22:26:10 2009 +0000
CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index da10a60..ec3bbb7 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -453,8 +453,9 @@ sub create_epm_header
if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find license file $licensefilename!", "create_epm_header"); }
- # Special handling to add the content of the file "license_en-US" to the solaris copyrightfile
- if ( $installer::globals::issolarispkgbuild )
+ # Special handling to add the content of the file "license_en-US" to the solaris copyrightfile. But not for all products
+
+ if (( $installer::globals::issolarispkgbuild ) && ( ! $variableshashref->{'NO_LICENSE_INTO_COPYRIGHT'} ))
{
if ( ! $installer::globals::englishlicenseset ) { installer::worker::set_english_license() }
@@ -3113,7 +3114,7 @@ sub put_systemintegration_into_installset
if ( ! $installer::globals::issolarispkgbuild ) { ($newcontent, $subdir) = control_subdirectories($newcontent); }
# Adding license content into Solaris packages
- if (( $installer::globals::issolarispkgbuild ) && ( $installer::globals::englishlicenseset )) { installer::worker::add_license_into_systemintegrationpackages($destdir, $newcontent); }
+ if (( $installer::globals::issolarispkgbuild ) && ( $installer::globals::englishlicenseset ) && ( ! $variableshashref->{'NO_LICENSE_INTO_COPYRIGHT'} )) { installer::worker::add_license_into_systemintegrationpackages($destdir, $newcontent); }
if (( $installer::globals::isxpdplatform ) && ( $allvariables->{'XPDINSTALLER'} ))
{
More information about the ooo-build-commit
mailing list