[Libreoffice-commits] .: 2 commits - instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure instsetoo_native/util scp2/source setup_native/scripts solenv/bin
Andras Timar
timar at kemper.freedesktop.org
Tue Mar 20 08:08:51 PDT 2012
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt | 12
instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt | 2
instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt | 11
instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt | 1
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt | 12
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt | 2
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt | 11
instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt | 1
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 12
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 12
instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt | 2
instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt | 9
instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt | 1
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt | 12
instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt | 2
instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt | 11
instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt | 1
instsetoo_native/inc_ure/windows/msi_templates/Control.idt | 12
instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt | 2
instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt | 11
instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt | 1
instsetoo_native/util/openoffice.lst | 10
scp2/source/ooo/module_hidden_ooo.scp | 12
scp2/source/ooo/scpaction_ooo.scp | 214 -
setup_native/scripts/userland.txt | 28
solenv/bin/make_installer.pl | 60
solenv/bin/modules/installer/control.pm | 11
solenv/bin/modules/installer/epmfile.pm | 12
solenv/bin/modules/installer/globals.pm | 8
solenv/bin/modules/installer/parameter.pm | 3
solenv/bin/modules/installer/scriptitems.pm | 36
solenv/bin/modules/installer/simplepackage.pm | 5
solenv/bin/modules/installer/windows/idtglobal.pm | 69
solenv/bin/modules/installer/windows/property.pm | 23
solenv/bin/modules/installer/xpdinstaller.pm | 1813 ----------
35 files changed, 17 insertions(+), 2427 deletions(-)
New commits:
commit 6d1f7fadc06bb57b175d5f4b94147373fc07f8a8
Author: Andras Timar <atimar at suse.com>
Date: Tue Mar 20 16:07:39 2012 +0100
remove unused License Agreement dialog from MSI
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 92b5130..e9a7742 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -189,18 +189,6 @@ InstallWelcome Image Bitmap 0 0 122 234 1 ImageBmp
InstallWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_125 Cancel
InstallWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_126
InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127
-LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
-LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
-LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp
-LicenseAgreement BannerLine Line 0 44 374 0 1
-LicenseAgreement Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-LicenseAgreement Branding2 Text 3 228 140 13 65537 [ProductName]
-LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
-LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
-LicenseAgreement DlgLine Line 145 234 229 0 1
-LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
-LicenseAgreement Memo ScrollableText 8 54 358 130 7
-LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp
MaintenanceType BannerLine Line 0 44 374 0 1
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
index f3a286b..9adacf8 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
@@ -12,8 +12,6 @@ CustomSetup Details Hide Installed
CustomSetup InstallLabel Hide Installed
InstallWelcome Copyright Hide SHOWCOPYRIGHT="No"
InstallWelcome Copyright Show SHOWCOPYRIGHT="Yes"
-LicenseAgreement Next Disable AgreeToLicense <> "Yes"
-LicenseAgreement Next Enable AgreeToLicense = "Yes"
ReadyToInstall DlgTitle Show ProgressType0="Modify"
ReadyToInstall DlgTitle2 Show ProgressType0="Repair"
ReadyToInstall DlgTitle3 Show ProgressType0="install"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
index 21f7fe7..b03c291 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
@@ -17,7 +17,7 @@ AdminWelcome Cancel SpawnDialog CancelSetup 1 0
AdminWelcome Next NewDialog AdminNetworkLocation 1 0
CancelSetup No EndDialog Return 1 0
CancelSetup Yes EndDialog Exit 1 2
-CustomerInformation Back NewDialog LicenseAgreement 1 1
+CustomerInformation Back NewDialog InstallWelcome 1 1
CustomerInformation Cancel SpawnDialog CancelSetup 1 0
CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
@@ -38,8 +38,7 @@ DatabaseFolder Cancel SpawnDialog CancelSetup 1 1
DatabaseFolder ChangeFolder [_BrowseProperty] DATABASEDIR 1 2
DatabaseFolder ChangeFolder SpawnDialog InstallChangeFolder 1 1
DatabaseFolder Next NewDialog SetupType 1 1
-DestinationFolder Back NewDialog LicenseAgreement HIDEEULA <> 1 0
-DestinationFolder Back NewDialog InstallWelcome HIDEEULA = 1 0
+DestinationFolder Back NewDialog InstallWelcome 1 0
DestinationFolder Cancel SpawnDialog CancelSetup 1 1
DestinationFolder ChangeFolder [_BrowseProperty] INSTALLLOCATION 1 2
DestinationFolder ChangeFolder NewDialog InstallChangeFolder 1 1
@@ -59,11 +58,7 @@ InstallChangeFolder OK SetTargetPath [_BrowseProperty] 1 2
InstallChangeFolder Up DirectoryListUp 0 1 0
InstallWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 1
InstallWelcome Cancel SpawnDialog CancelSetup 1 0
-InstallWelcome Next NewDialog LicenseAgreement HIDEEULA <> 1 0
-InstallWelcome Next NewDialog DestinationFolder HIDEEULA = 1 0
-LicenseAgreement Back NewDialog InstallWelcome 1 0
-LicenseAgreement Cancel SpawnDialog CancelSetup 1 0
-LicenseAgreement Next NewDialog DestinationFolder AgreeToLicense = "Yes" 0
+InstallWelcome Next NewDialog DestinationFolder 1 0
MaintenanceType Back NewDialog MaintenanceWelcome 1 0
MaintenanceType Cancel SpawnDialog CancelSetup 1 0
MaintenanceType Next [ProgressType0] Modify _IsMaintenance = "Change" 2
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
index 100074c..d950c9a 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
@@ -15,7 +15,6 @@ FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retr
FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next 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
MaintenanceWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
OutOfSpace 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Resume Resume Resume
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index 92b5130..e9a7742 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -189,18 +189,6 @@ InstallWelcome Image Bitmap 0 0 122 234 1 ImageBmp
InstallWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_125 Cancel
InstallWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_126
InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127
-LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
-LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
-LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp
-LicenseAgreement BannerLine Line 0 44 374 0 1
-LicenseAgreement Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-LicenseAgreement Branding2 Text 3 228 140 13 65537 [ProductName]
-LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
-LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
-LicenseAgreement DlgLine Line 145 234 229 0 1
-LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
-LicenseAgreement Memo ScrollableText 8 54 358 130 7
-LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp
MaintenanceType BannerLine Line 0 44 374 0 1
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
index f3a286b..9adacf8 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
@@ -12,8 +12,6 @@ CustomSetup Details Hide Installed
CustomSetup InstallLabel Hide Installed
InstallWelcome Copyright Hide SHOWCOPYRIGHT="No"
InstallWelcome Copyright Show SHOWCOPYRIGHT="Yes"
-LicenseAgreement Next Disable AgreeToLicense <> "Yes"
-LicenseAgreement Next Enable AgreeToLicense = "Yes"
ReadyToInstall DlgTitle Show ProgressType0="Modify"
ReadyToInstall DlgTitle2 Show ProgressType0="Repair"
ReadyToInstall DlgTitle3 Show ProgressType0="install"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index 21f7fe7..b03c291 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -17,7 +17,7 @@ AdminWelcome Cancel SpawnDialog CancelSetup 1 0
AdminWelcome Next NewDialog AdminNetworkLocation 1 0
CancelSetup No EndDialog Return 1 0
CancelSetup Yes EndDialog Exit 1 2
-CustomerInformation Back NewDialog LicenseAgreement 1 1
+CustomerInformation Back NewDialog InstallWelcome 1 1
CustomerInformation Cancel SpawnDialog CancelSetup 1 0
CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
@@ -38,8 +38,7 @@ DatabaseFolder Cancel SpawnDialog CancelSetup 1 1
DatabaseFolder ChangeFolder [_BrowseProperty] DATABASEDIR 1 2
DatabaseFolder ChangeFolder SpawnDialog InstallChangeFolder 1 1
DatabaseFolder Next NewDialog SetupType 1 1
-DestinationFolder Back NewDialog LicenseAgreement HIDEEULA <> 1 0
-DestinationFolder Back NewDialog InstallWelcome HIDEEULA = 1 0
+DestinationFolder Back NewDialog InstallWelcome 1 0
DestinationFolder Cancel SpawnDialog CancelSetup 1 1
DestinationFolder ChangeFolder [_BrowseProperty] INSTALLLOCATION 1 2
DestinationFolder ChangeFolder NewDialog InstallChangeFolder 1 1
@@ -59,11 +58,7 @@ InstallChangeFolder OK SetTargetPath [_BrowseProperty] 1 2
InstallChangeFolder Up DirectoryListUp 0 1 0
InstallWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 1
InstallWelcome Cancel SpawnDialog CancelSetup 1 0
-InstallWelcome Next NewDialog LicenseAgreement HIDEEULA <> 1 0
-InstallWelcome Next NewDialog DestinationFolder HIDEEULA = 1 0
-LicenseAgreement Back NewDialog InstallWelcome 1 0
-LicenseAgreement Cancel SpawnDialog CancelSetup 1 0
-LicenseAgreement Next NewDialog DestinationFolder AgreeToLicense = "Yes" 0
+InstallWelcome Next NewDialog DestinationFolder 1 0
MaintenanceType Back NewDialog MaintenanceWelcome 1 0
MaintenanceType Cancel SpawnDialog CancelSetup 1 0
MaintenanceType Next [ProgressType0] Modify _IsMaintenance = "Change" 2
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
index 100074c..d950c9a 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
@@ -15,7 +15,6 @@ FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retr
FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next 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
MaintenanceWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
OutOfSpace 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Resume Resume Resume
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 194da51..249120b 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -292,18 +292,6 @@ en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
[OOO_CONTROL_127]
en-US = "The Installation Wizard will install [ProductName] on your computer. To continue, click Next."
-[OOO_CONTROL_128]
-en-US = "< &Back"
-
-[OOO_CONTROL_131]
-en-US = "Cancel"
-
-[OOO_CONTROL_132]
-en-US = "Please read the following license agreement carefully."
-
-[OOO_CONTROL_133]
-en-US = "{&MSSansBold8}License Agreement"
-
[OOO_CONTROL_134]
en-US = "&Next >"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index f189c8a..7599ae5 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -190,18 +190,6 @@ InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127
LanguageInfo1 Icon Icon 15 15 24 24 5242881 CautionIco
LanguageInfo1 OK PushButton 100 57 66 17 3 OOO_CONTROL_10
LanguageInfo1 Text Text 48 15 194 30 3 OOO_CONTROL_317
-LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
-LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
-LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp
-LicenseAgreement BannerLine Line 0 44 374 0 1
-LicenseAgreement Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
-LicenseAgreement Branding2 Text 3 228 88 13 65537 [ProductName]
-LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
-LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
-LicenseAgreement DlgLine Line 90 234 284 0 1
-LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
-LicenseAgreement Memo ScrollableText 8 54 358 130 7
-LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp
MaintenanceType BannerLine Line 0 44 374 0 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
index 62a057e..478b317 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
@@ -18,8 +18,6 @@ FileTypeDialog CheckBox3 Enable &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_I
FileTypeDialog CheckBox3 Disable NOT ( &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 ) )
InstallWelcome Copyright Hide SHOWCOPYRIGHT="No"
InstallWelcome Copyright Show SHOWCOPYRIGHT="Yes"
-LicenseAgreement Next Disable AgreeToLicense <> "Yes"
-LicenseAgreement Next Enable AgreeToLicense = "Yes"
ReadyToInstall DlgTitle Show ProgressType0="Modify"
ReadyToInstall DlgTitle2 Show ProgressType0="Repair"
ReadyToInstall DlgTitle3 Show ProgressType0="install"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index fb788fd..3eb1b85 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -18,8 +18,7 @@ AdminWelcome Next NewDialog AdminNetworkLocation 1 0
ApplicationInfo1 OK EndDialog Return 1 0
CancelSetup No EndDialog Return 1 0
CancelSetup Yes EndDialog Exit 1 2
-CustomerInformation Back NewDialog LicenseAgreement HIDEEULA <> 1 1
-CustomerInformation Back NewDialog InstallWelcome HIDEEULA = 1 1
+CustomerInformation Back NewDialog InstallWelcome 1 1
CustomerInformation Cancel SpawnDialog CancelSetup 1 0
CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
@@ -68,12 +67,8 @@ InstallChangeFolder OK SetTargetPath [_BrowseProperty] 1 2
InstallChangeFolder Up DirectoryListUp 0 1 0
InstallWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 1
InstallWelcome Cancel SpawnDialog CancelSetup 1 0
-InstallWelcome Next NewDialog LicenseAgreement HIDEEULA <> 1 0
-InstallWelcome Next NewDialog CustomerInformation HIDEEULA = 1 0
+InstallWelcome Next NewDialog CustomerInformation 1 0
LanguageInfo1 OK EndDialog Return 1 0
-LicenseAgreement Back NewDialog InstallWelcome 1 0
-LicenseAgreement Cancel SpawnDialog CancelSetup 1 0
-LicenseAgreement Next NewDialog CustomerInformation AgreeToLicense = "Yes" 0
MaintenanceType Back NewDialog MaintenanceWelcome 1 0
MaintenanceType Cancel SpawnDialog CancelSetup 1 0
MaintenanceType Next [ProgressType0] Modify _IsMaintenance = "Change" 2
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
index d202b7c..6b7d05b 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
@@ -17,7 +17,6 @@ FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBo
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
-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
MaintenanceWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
OutOfSpace 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Resume Resume Resume
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index 9d892ab..2ec0a37 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
@@ -184,18 +184,6 @@ InstallWelcome Image Bitmap 0 0 125 234 1 ImageBmp
InstallWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_125 Cancel
InstallWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_126
InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127
-LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
-LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
-LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp
-LicenseAgreement BannerLine Line 0 44 374 0 1
-LicenseAgreement Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName]
-LicenseAgreement Branding2 Text 3 228 92 13 65537 [ProductName]
-LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
-LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
-LicenseAgreement DlgLine Line 95 234 279 0 1
-LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
-LicenseAgreement Memo ScrollableText 8 54 358 130 7
-LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp
MaintenanceType BannerLine Line 0 44 374 0 1
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
index f3a286b..9adacf8 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
@@ -12,8 +12,6 @@ CustomSetup Details Hide Installed
CustomSetup InstallLabel Hide Installed
InstallWelcome Copyright Hide SHOWCOPYRIGHT="No"
InstallWelcome Copyright Show SHOWCOPYRIGHT="Yes"
-LicenseAgreement Next Disable AgreeToLicense <> "Yes"
-LicenseAgreement Next Enable AgreeToLicense = "Yes"
ReadyToInstall DlgTitle Show ProgressType0="Modify"
ReadyToInstall DlgTitle2 Show ProgressType0="Repair"
ReadyToInstall DlgTitle3 Show ProgressType0="install"
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index 49407d4..05254de 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -17,7 +17,7 @@ AdminWelcome Cancel SpawnDialog CancelSetup 1 0
AdminWelcome Next NewDialog AdminNetworkLocation 1 0
CancelSetup No EndDialog Return 1 0
CancelSetup Yes EndDialog Exit 1 2
-CustomerInformation Back NewDialog LicenseAgreement 1 1
+CustomerInformation Back NewDialog InstallWelcome 1 1
CustomerInformation Cancel SpawnDialog CancelSetup 1 0
CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
@@ -38,8 +38,7 @@ DatabaseFolder Cancel SpawnDialog CancelSetup 1 1
DatabaseFolder ChangeFolder [_BrowseProperty] DATABASEDIR 1 2
DatabaseFolder ChangeFolder SpawnDialog InstallChangeFolder 1 1
DatabaseFolder Next NewDialog SetupType 1 1
-DestinationFolder Back NewDialog LicenseAgreement HIDEEULA <> 1 0
-DestinationFolder Back NewDialog InstallWelcome HIDEEULA = 1 0
+DestinationFolder Back NewDialog InstallWelcome 1 0
DestinationFolder Cancel SpawnDialog CancelSetup 1 1
DestinationFolder ChangeFolder [_BrowseProperty] INSTALLLOCATION 1 2
DestinationFolder ChangeFolder SpawnDialog InstallChangeFolder 1 1
@@ -60,11 +59,7 @@ InstallChangeFolder OK SetTargetPath [_BrowseProperty] 1 2
InstallChangeFolder Up DirectoryListUp 0 1 0
InstallWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 1
InstallWelcome Cancel SpawnDialog CancelSetup 1 0
-InstallWelcome Next NewDialog LicenseAgreement HIDEEULA <> 1 0
-InstallWelcome Next NewDialog DestinationFolder HIDEEULA = 1 0
-LicenseAgreement Back NewDialog InstallWelcome 1 0
-LicenseAgreement Cancel SpawnDialog CancelSetup 1 0
-LicenseAgreement Next NewDialog DestinationFolder AgreeToLicense = "Yes" 0
+InstallWelcome Next NewDialog DestinationFolder 1 0
MaintenanceType Back NewDialog MaintenanceWelcome 1 0
MaintenanceType Cancel SpawnDialog CancelSetup 1 0
MaintenanceType Next [ProgressType0] Modify _IsMaintenance = "Change" 2
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
index 54a594f..b3e2cdb 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
@@ -15,7 +15,6 @@ FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retr
FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next 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
MaintenanceWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
OutOfSpace 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Resume Resume Resume
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
index 7fa9fbc..71f84a8 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
@@ -184,18 +184,6 @@ InstallWelcome Image Bitmap 0 0 122 234 1 ImageBmp
InstallWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_125 Cancel
InstallWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_126
InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127
-LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
-LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
-LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp
-LicenseAgreement BannerLine Line 0 44 374 0 1
-LicenseAgreement Branding1 Text 4 229 32 13 3 {&MSSWhiteSerif8}[ProductName]
-LicenseAgreement Branding2 Text 3 228 32 13 65537 [ProductName]
-LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
-LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
-LicenseAgreement DlgLine Line 35 234 339 0 1
-LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
-LicenseAgreement Memo ScrollableText 8 54 358 130 7
-LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp
MaintenanceType BannerLine Line 0 44 374 0 1
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
index f3a286b..9adacf8 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
@@ -12,8 +12,6 @@ CustomSetup Details Hide Installed
CustomSetup InstallLabel Hide Installed
InstallWelcome Copyright Hide SHOWCOPYRIGHT="No"
InstallWelcome Copyright Show SHOWCOPYRIGHT="Yes"
-LicenseAgreement Next Disable AgreeToLicense <> "Yes"
-LicenseAgreement Next Enable AgreeToLicense = "Yes"
ReadyToInstall DlgTitle Show ProgressType0="Modify"
ReadyToInstall DlgTitle2 Show ProgressType0="Repair"
ReadyToInstall DlgTitle3 Show ProgressType0="install"
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
index 49407d4..05254de 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
@@ -17,7 +17,7 @@ AdminWelcome Cancel SpawnDialog CancelSetup 1 0
AdminWelcome Next NewDialog AdminNetworkLocation 1 0
CancelSetup No EndDialog Return 1 0
CancelSetup Yes EndDialog Exit 1 2
-CustomerInformation Back NewDialog LicenseAgreement 1 1
+CustomerInformation Back NewDialog InstallWelcome 1 1
CustomerInformation Cancel SpawnDialog CancelSetup 1 0
CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
@@ -38,8 +38,7 @@ DatabaseFolder Cancel SpawnDialog CancelSetup 1 1
DatabaseFolder ChangeFolder [_BrowseProperty] DATABASEDIR 1 2
DatabaseFolder ChangeFolder SpawnDialog InstallChangeFolder 1 1
DatabaseFolder Next NewDialog SetupType 1 1
-DestinationFolder Back NewDialog LicenseAgreement HIDEEULA <> 1 0
-DestinationFolder Back NewDialog InstallWelcome HIDEEULA = 1 0
+DestinationFolder Back NewDialog InstallWelcome 1 0
DestinationFolder Cancel SpawnDialog CancelSetup 1 1
DestinationFolder ChangeFolder [_BrowseProperty] INSTALLLOCATION 1 2
DestinationFolder ChangeFolder SpawnDialog InstallChangeFolder 1 1
@@ -60,11 +59,7 @@ InstallChangeFolder OK SetTargetPath [_BrowseProperty] 1 2
InstallChangeFolder Up DirectoryListUp 0 1 0
InstallWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 1
InstallWelcome Cancel SpawnDialog CancelSetup 1 0
-InstallWelcome Next NewDialog LicenseAgreement HIDEEULA <> 1 0
-InstallWelcome Next NewDialog DestinationFolder HIDEEULA = 1 0
-LicenseAgreement Back NewDialog InstallWelcome 1 0
-LicenseAgreement Cancel SpawnDialog CancelSetup 1 0
-LicenseAgreement Next NewDialog DestinationFolder AgreeToLicense = "Yes" 0
+InstallWelcome Next NewDialog DestinationFolder 1 0
MaintenanceType Back NewDialog MaintenanceWelcome 1 0
MaintenanceType Cancel SpawnDialog CancelSetup 1 0
MaintenanceType Next [ProgressType0] Modify _IsMaintenance = "Change" 2
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
index 54a594f..b3e2cdb 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
@@ -15,7 +15,6 @@ FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retr
FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next 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
MaintenanceWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
OutOfSpace 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Resume Resume Resume
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 086ab9f..edd7f93 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -13,7 +13,6 @@ Globals
SERVICETAG_PARENTNAME LibreOffice 3.6
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
- HIDELICENSEDIALOG 1
PACKAGEPREFIX
BASISPACKAGEPREFIX libobasis
UREPACKAGEPREFIX libreoffice
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 18cd74e..7d0f56a 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1720,22 +1720,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# setting the encoding in every table (replacing WINDOWSENCODINGTEMPLATE)
installer::windows::idtglobal::set_multilanguageonly_condition($languageidtdir);
- # include the license text into the table Control.idt
-
- if ( ! $allvariableshashref->{'HIDELICENSEDIALOG'} )
- {
- my $licensefilesource = installer::windows::idtglobal::get_rtflicensefilesource($onelanguage, $includepatharrayref_lang);
- my $licensefile = installer::files::read_file($licensefilesource);
- installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, $allvariablesarrayref, $onelanguage, $loggingdir);
- my $controltablename = $languageidtdir . $installer::globals::separator . "Control.idt";
- my $controltable = installer::files::read_file($controltablename);
- installer::windows::idtglobal::add_licensefile_to_database($licensefile, $controltable);
- installer::files::save_file($controltablename, $controltable);
-
- $infoline = "Added licensefile $licensefilesource into database $controltablename\n";
- push(@installer::globals::logfileinfo, $infoline);
- }
-
# include a component into environment table if required
installer::windows::component::set_component_in_environment_table($languageidtdir, $filesinproductlanguageresolvedarrayref);
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 5f477a5..29a98b0 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -408,11 +408,6 @@ sub create_package
my $sla = 'sla.r';
my $ref = "";
- if ( ! $allvariables->{'HIDELICENSEDIALOG'} )
- {
- installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$sla, $includepatharrayref, 0);
- }
-
my $localtempdir = $tempdir;
if (( $installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( $installer::globals::patch ))
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 176e835..cb5fa18 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -1037,75 +1037,6 @@ sub add_officedir_to_database
}
-##############################################################
-# Including the license text into the table control.idt
-##############################################################
-
-sub add_licensefile_to_database
-{
- my ($licensefile, $controltable) = @_;
-
- # Nine tabs before the license text and two tabs after it
- # The license text has to be included into the dialog
- # LicenseAgreement into the control Memo.
-
- my $foundlicenseline = 0;
- my ($number, $line);
-
- for ( my $i = 0; $i <= $#{$controltable}; $i++ )
- {
- $line = ${$controltable}[$i];
-
- if ( $line =~ /^\s*\bLicenseAgreement\b\t\bMemo\t/ )
- {
- $foundlicenseline = 1;
- $number = $i;
- last;
- }
- }
-
- if (!($foundlicenseline))
- {
- installer::exiter::exit_program("ERROR: Line for license file in Control.idt not found!", "add_licensefile_to_database");
- }
- else
- {
- my %control = ();
-
- if ( $line =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
- {
- $control{'Dialog_'} = $1;
- $control{'Control'} = $2;
- $control{'Type'} = $3;
- $control{'X'} = $4;
- $control{'Y'} = $5;
- $control{'Width'} = $6;
- $control{'Height'} = $7;
- $control{'Attributes'} = $8;
- $control{'Property'} = $9;
- $control{'Text'} = $10;
- $control{'Control_Next'} = $11;
- $control{'Help'} = $12;
- }
- else
- {
- installer::exiter::exit_program("ERROR: Could not split line correctly!", "add_licensefile_to_database");
- }
-
- # my $licensetext = get_rtf_licensetext($licensefile);
- my $licensetext = make_string_licensetext($licensefile);
-
- $control{'Text'} = $licensetext;
-
- my $newline = $control{'Dialog_'} . "\t" . $control{'Control'} . "\t" . $control{'Type'} . "\t" .
- $control{'X'} . "\t" . $control{'Y'} . "\t" . $control{'Width'} . "\t" .
- $control{'Height'} . "\t" . $control{'Attributes'} . "\t" . $control{'Property'} . "\t" .
- $control{'Text'} . "\t" . $control{'Control_Next'} . "\t" . $control{'Help'} . "\n";
-
- ${$controltable}[$number] = $newline
- }
-}
-
###################################################################
# Determining the last position in a sequencetable
# into the tables CustomAc.idt and InstallE.idt.
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 6319276..27b19d7 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -390,29 +390,6 @@ sub set_important_properties
push(@{$propertyfile}, $onepropertyline);
}
- # No more license dialog for selected products
- if ( $allvariables->{'HIDELICENSEDIALOG'} )
- {
- my $onepropertyline = "HIDEEULA" . "\t" . "1" . "\n";
-
- my $already_defined = 0;
-
- for ( my $i = 0; $i <= $#{$propertyfile}; $i++ )
- {
- if ( ${$propertyfile}[$i] =~ /^\s*HIDEEULA\t/ )
- {
- ${$propertyfile}[$i] = $onepropertyline;
- $already_defined = 1;
- last;
- }
- }
-
- if ( ! $already_defined )
- {
- push(@{$propertyfile}, $onepropertyline);
- }
- }
-
# Setting .NET requirements
if ( $installer::globals::required_dotnet_version ne "" )
{
commit d03aead7edad06a56f1cdeedcf4224fb608446d3
Author: Andras Timar <atimar at suse.com>
Date: Tue Mar 20 15:29:58 2012 +0100
remove unused xpdinstaller module
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 6856a67..086ab9f 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -62,7 +62,7 @@ LibreOffice
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
FILEFORMATNAME OpenOffice.org
@@ -75,7 +75,6 @@ LibreOffice
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1
- XPDINSTALLER 0
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
@@ -124,7 +123,7 @@ LibreOffice_Dev
REGISTRYLAYERNAME LayerDev
SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
ADDSYSTEMINTEGRATION 1
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
@@ -136,7 +135,6 @@ LibreOffice_Dev
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1
- XPDINSTALLER 0
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
@@ -392,7 +390,7 @@ OxygenOffice
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
FILEFORMATNAME OpenOffice.org
@@ -406,7 +404,6 @@ OxygenOffice
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1
- XPDINSTALLER 0
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index e28e5aa..438dcde 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -785,15 +785,3 @@ Module gid_Module_Oo_Linguistic
gid_File_Lib_Lnth,
gid_File_Share_Registry_Lingucomponent_Xcd);
End
-
-#ifdef LINUX
-Module gid_Module_Root_Userland
- ParentID = gid_Module_Root;
- InstallOrder = "5";
- Name = "gid_Module_Root_Userland";
- Description = "gid_Module_Root_Userland";
- Subdir = "userland";
- Styles = (HIDDEN_ROOT,USERLANDMODULE,USERINSTALLONLY,NOTRELOCATABLE,XPD_ONLY,INSTALLCANFAIL);
- PackageName = "${USERLANDPACKAGENAME}";
-End
-#endif
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index 826991b..a54d1a0 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -68,220 +68,6 @@ End
#endif
#endif
-ScpAction scp_Copy_Xpd_Javaloader
- Copy = "javaloader.sh";
- Name = "setup";
- Styles = (XPD_ONLY);
- UnixRights = 775;
-End
-
-ScpAction scp_Copy_Xpd_Javajarfile
- Copy = "JavaSetup.jar";
- Name = "JavaSetup.jar";
- Styles = (XPD_ONLY);
-End
-
-// #ifdef SOLARIS
-// ScpAction scp_Copy_Xpd_Getuidso
-// Copy = "getuid.so";
-// Name = "getuid.so";
-// Styles = (XPD_ONLY);
-// Subdir = "installdata/getuid";
-// End
-// #endif
-
-// Setup image
-ScpAction scp_Copy_Xpd_Gif_Setup
- Copy = "Setup.gif";
- Name = "Setup.gif";
- Styles = (XPD_ONLY);
- Subdir = "installdata/images";
-End
-
-// Setup help files
-
-ScpAction scp_Copy_Xpd_Help_Html_Acceptlicense
- README_TXT_ALL_LANG(Copy, AcceptLicense, html);
- README_TXT_ALL_LANG(Name, AcceptLicense, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Acceptlicense_En_Us
- Copy = "AcceptLicense_en-US.html";
- Name = "AcceptLicense.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Choosecomponents
- README_TXT_ALL_LANG(Copy, ChooseComponents, html);
- README_TXT_ALL_LANG(Name, ChooseComponents, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Choosecomponents_En_Us
- Copy = "ChooseComponents_en-US.html";
- Name = "ChooseComponents.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Choosedirectory
- README_TXT_ALL_LANG(Copy, ChooseDirectory, html);
- README_TXT_ALL_LANG(Name, ChooseDirectory, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Choosedirectory_En_Us
- Copy = "ChooseDirectory_en-US.html";
- Name = "ChooseDirectory.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseinstallationtype
- README_TXT_ALL_LANG(Copy, ChooseInstallationType, html);
- README_TXT_ALL_LANG(Name, ChooseInstallationType, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseinstallationtype_En_Us
- Copy = "ChooseInstallationType_en-US.html";
- Name = "ChooseInstallationType.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-// ScpAction scp_Copy_Xpd_Help_Html_Chooselanguage
-// README_TXT_ALL_LANG(Copy, ChooseLanguage, html);
-// README_TXT_ALL_LANG(Name, ChooseLanguage, html);
-// Styles = (XPD_ONLY);
-// Subdir = "installdata/html";
-// End
-
-// ScpAction scp_Copy_Xpd_Help_Html_Chooselanguage_En_Us
-// Copy = "ChooseLanguage_en-US.html";
-// Name = "ChooseLanguage.html";
-// Styles = (XPD_ONLY);
-// Subdir = "installdata/html";
-// End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationcomponents
- README_TXT_ALL_LANG(Copy, ChooseUninstallationComponents, html);
- README_TXT_ALL_LANG(Name, ChooseUninstallationComponents, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationcomponents_En_Us
- Copy = "ChooseUninstallationComponents_en-US.html";
- Name = "ChooseUninstallationComponents.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationtype
- README_TXT_ALL_LANG(Copy, ChooseUninstallationType, html);
- README_TXT_ALL_LANG(Name, ChooseUninstallationType, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationtype_En_Us
- Copy = "ChooseUninstallationType_en-US.html";
- Name = "ChooseUninstallationType.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Installationimminent
- README_TXT_ALL_LANG(Copy, InstallationImminent, html);
- README_TXT_ALL_LANG(Name, InstallationImminent, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Installationimminent_En_Us
- Copy = "InstallationImminent_en-US.html";
- Name = "InstallationImminent.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Installationongoing
- README_TXT_ALL_LANG(Copy, InstallationOngoing, html);
- README_TXT_ALL_LANG(Name, InstallationOngoing, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Installationongoing_En_Us
- Copy = "InstallationOngoing_en-US.html";
- Name = "InstallationOngoing.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Prologue
- README_TXT_ALL_LANG(Copy, Prologue, html);
- README_TXT_ALL_LANG(Name, Prologue, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Prologue_En_Us
- Copy = "Prologue_en-US.html";
- Name = "Prologue.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationimminent
- README_TXT_ALL_LANG(Copy, UninstallationImminent, html);
- README_TXT_ALL_LANG(Name, UninstallationImminent, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationimminent_En_Us
- Copy = "UninstallationImminent_en-US.html";
- Name = "UninstallationImminent.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationongoing
- README_TXT_ALL_LANG(Copy, UninstallationOngoing, html);
- README_TXT_ALL_LANG(Name, UninstallationOngoing, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationongoing_En_Us
- Copy = "UninstallationOngoing_en-US.html";
- Name = "UninstallationOngoing.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationprologue
- README_TXT_ALL_LANG(Copy, UninstallationPrologue, html);
- README_TXT_ALL_LANG(Name, UninstallationPrologue, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationprologue_En_Us
- Copy = "UninstallationPrologue_en-US.html";
- Name = "UninstallationPrologue.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
#ifdef MACOSX
ScpAction scp_Copy_Dmg_Background_Image
Copy = "osxdndinstall.png";
diff --git a/setup_native/scripts/userland.txt b/setup_native/scripts/userland.txt
deleted file mode 100644
index 8cd7a18..0000000
--- a/setup_native/scripts/userland.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-USERLANDPACKAGENAME=libreoffice-userland-1.0-0.noarch.rpm
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 73d6b1e..18cd74e 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -87,7 +87,6 @@ use installer::windows::strip;
use installer::windows::update;
use installer::windows::upgrade;
use installer::worker;
-use installer::xpdinstaller;
use installer::ziplist;
#################################################
@@ -313,12 +312,6 @@ if ( $installer::globals::iswindowsbuild ) { installer::control::read_encodingli
if ( $allvariableshashref->{'ADD_INCLUDE_FILES'} ) { installer::worker::add_variables_from_inc_to_hashref($allvariableshashref, $includepatharrayref); }
-################################################
-# Disable xpd installer, if SOLAR_JAVA not set
-################################################
-
-installer::control::check_java_for_xpd($allvariableshashref);
-
#####################################
# Analyzing the setup script
#####################################
@@ -424,13 +417,6 @@ installer::logger::print_message( "... analyzing scpactions ... \n" );
my $scpactionsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "ScpAction");
-# Note: Don't clean away XPD installer stuff before verified whether
-# OxygenOffice still uses it or not, see insesetoo_native/util/openoffice.lst
-if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isxpdplatform ))
-{
- $scpactionsinproductarrayref = installer::scriptitems::remove_Xpdonly_Items($scpactionsinproductarrayref);
-}
-
if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $allvariableshashref->{'PRODUCTNAME'} eq "LibO-dev" ) { installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref); }
@@ -499,11 +485,6 @@ if (!($installer::globals::is_copy_only_project))
$modulesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Module");
- if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isxpdplatform ))
- {
- $modulesinproductarrayref = installer::scriptitems::remove_Xpdonly_Items($modulesinproductarrayref);
- }
-
installer::scriptitems::resolve_assigned_modules($modulesinproductarrayref);
$modulesinproductarrayref = installer::scriptitems::remove_template_modules($modulesinproductarrayref);
@@ -1444,25 +1425,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
} # end of "if ( ! $installer::globals::simple )
- ###########################################
- # xpd installation mechanism
- ###########################################
-
- # Creating the xpd file for the package. This has to happen always
-
- if ( $installer::globals::isxpdplatform )
- {
- if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $installer::globals::patch ))
- {
- if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::call_epm != 0 ))
- {
- installer::xpdinstaller::create_xpd_file($onepackage, $packages, $languagestringref, $allvariableshashref, $modulesinproductarrayref, $installdir, $installer::globals::epmoutpath, $linkpackage, \%installer::globals::xpdpackageinfo);
- $installer::globals::xpd_files_prepared = 1;
- %installer::globals::xpdpackageinfo = ();
- }
- }
- }
-
if ( $installer::globals::makelinuxlinkrpm ) { $k--; } # decreasing the counter to create the link rpm!
} # end of "for ( my $k = 0; $k <= $#{$packages}; $k++ )"
@@ -1499,12 +1461,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild )) { installer::epmfile::finalize_patch($installer::globals::epmoutpath, $allvariableshashref); }
if (( $installer::globals::patch ) && ( $installer::globals::isrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref); }
- # Copying the xpd installer into the installation set
- if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::isxpdplatform ) && ( $installer::globals::xpd_files_prepared ))
- {
- installer::xpdinstaller::create_xpd_installer($installdir, $allvariableshashref, $languagestringref);
- }
-
chdir($currentdir); # changing back into start directory
}
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 54da21a..43694b7 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -464,17 +464,6 @@ sub check_oxtfiles
}
}
-#############################################################
-# Check if Java is available to create xpd installer
-#############################################################
-
-sub check_java_for_xpd
-{
- my ( $allvariables ) = @_;
-
- if ( ! $installer::globals::solarjavaset ) { $allvariables->{'XPDINSTALLER'} = 0; }
-}
-
####################################################################
# Setting global variable "$installer::globals::addchildprojects"
####################################################################
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 830290d..388f9cc 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2802,11 +2802,6 @@ sub copy_childproject_files
installer::systemactions::copy_one_file($sourcefile, $localdestdir);
# Solaris: unpacking tar.gz files and setting new packagename
if ( $installer::globals::issolarispkgbuild ) { $packagename = unpack_tar_gz_file($packagename, $localdestdir); }
-
- if (( $installer::globals::isxpdplatform ) && ( $allvariables->{'XPDINSTALLER'} ))
- {
- installer::xpdinstaller::create_xpd_file_for_childproject($onemodule, $localdestdir, $packagename, $allvariableshashref, $modulesarrayref);
- }
}
}
@@ -2917,9 +2912,7 @@ sub put_systemintegration_into_installset
# Getting name of package from scp-Module
# Search package in list off all include files
# Copy file into installation set and unpack it (always tar.gz)
- # Create xpd file and put it into xpd directory
# tar.gz can contain a different number of packages -> automatically create hidden sub modules
- # xpd file has to be created completely from module and package itself (-> no packagelist!)
# Collect all modules with flag "SYSTEMMODULE"
my $allmodules = collect_modules_with_style("SYSTEMMODULE", $modulesarrayref);
@@ -2950,11 +2943,6 @@ sub put_systemintegration_into_installset
# Adding license content into Solaris packages
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'} ))
- {
- installer::xpdinstaller::create_xpd_file_for_systemintegration($onemodule, $newcontent, $modulesarrayref, $subdir);
- }
}
}
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 077b145..6d8785a 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -274,7 +274,6 @@ BEGIN
$infodirectory = "";
@currentcontent = ();
@installsetcontent = ();
- %xpdpackageinfo = ();
$signfiles_checked = 0;
$dosign = 0;
$pwfile = "";
@@ -291,14 +290,7 @@ BEGIN
$lastsequence_before_merge = 0;
$lastcabfilename = "";
- $createdxpddefaultlang = 0;
- $xpddir = "";
- $productxpdfile = "setup.xpd";
- $xpd_files_prepared = 0;
$defaultlanguage = "";
- @createdxpdfiles = ();
- @allxpdfiles = ();
- $isxpdplatform = 0;
$javalanguagepath = "";
$javasettozero = 0;
$addlicensefile = 1;
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 0686e13..6d99aaa 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -271,7 +271,6 @@ sub setglobalvariables
{
$installer::globals::issolarispkgbuild = 1;
$installer::globals::epmoutpath = "packages";
- $installer::globals::isxpdplatform = 1;
}
}
@@ -310,7 +309,6 @@ sub setglobalvariables
if ( $installer::globals::packageformat eq "rpm" )
{
$installer::globals::isrpmbuild = 1;
- $installer::globals::isxpdplatform = 1;
$installer::globals::epmoutpath = "RPMS";
}
if ( $installer::globals::rpm eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"\$RPM\" has to be defined!", "setglobalvariables"); }
@@ -322,7 +320,6 @@ sub setglobalvariables
if ( $installer::globals::packageformat eq "rpm" )
{
$installer::globals::isrpmbuild = 1;
- $installer::globals::isxpdplatform = 1;
$installer::globals::epmoutpath = "RPMS";
if ( $installer::globals::compiler =~ /unxlngi/ )
{
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index f91e019..a1cbbbf 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1679,42 +1679,6 @@ sub change_keys_of_scpactions
}
############################################################################
-# Removing all xpd only items from installation set (scpactions with
-# the style XPD_ONLY), except an xpd installation set is created
-############################################################################
-
-sub remove_Xpdonly_Items
-{
- my ($itemsarrayref) = @_;
-
- my $infoline;
-
- my @newitemsarray = ();
-
- for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
- {
- my $oneitem = ${$itemsarrayref}[$i];
- my $styles = "";
- if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
- if ( $styles =~ /\bXPD_ONLY\b/ )
- {
- $infoline = "Removing \"xpd only\" item $oneitem->{'gid'} from the installation set.\n";
- push( @installer::globals::globallogfileinfo, $infoline);
-
- next;
- }
-
- push(@newitemsarray, $oneitem);
- }
-
- $infoline = "\n";
- push( @installer::globals::globallogfileinfo, $infoline);
-
- return \@newitemsarray;
-}
-
-############################################################################
# Removing all language pack files from installation set (files with
# the style LANGUAGEPACK), except this is a language pack.
############################################################################
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
deleted file mode 100644
index 26059a7..0000000
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ /dev/null
@@ -1,1813 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-package installer::xpdinstaller;
-
-use Cwd;
-use installer::converter;
-use installer::exiter;
-use installer::globals;
-use installer::languages;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::remover;
-use installer::systemactions;
-
-
-#######################################################
-# Searching for the module name and description in the
-# modules collector
-#######################################################
-
-sub get_module_name_description
-{
- my ($modulesarrayref, $onelanguage, $gid, $type) = @_;
-
- my $found = 0;
-
- my $newstring = "";
-
- for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
- {
- my $onemodule = ${$modulesarrayref}[$i];
-
- if ( $onemodule->{'gid'} eq $gid )
- {
- my $typestring = $type . " " . "(" . $onelanguage . ")";
- if ( $onemodule->{$typestring} ) { $newstring = $onemodule->{$typestring}; }
- $found = 1;
- }
-
- if ( $found ) { last; }
- }
-
- # defaulting to english
-
- if ( ! $found )
- {
- my $defaultlanguage = "en-US";
-
- for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
- {
- my $onemodule = ${$modulesarrayref}[$i];
-
- if ( $onemodule->{'gid'} eq $gid )
- {
- my $typestring = $type . " " . "(" . $defaultlanguage . ")";
- if ( $onemodule->{$typestring} ) { $newstring = $onemodule->{$typestring}; }
- $found = 1;
- }
-
- if ( $found ) { last; }
- }
- }
-
- return $newstring;
-}
-
-###################################################
-# Finding module, specified by the gid
-###################################################
-
-sub get_module
-{
- my ($modulegid, $modulesarrayref) = @_;
-
- my $found = 0;
- my $searchmodule = "";
-
- for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
- {
- my $onemodule = ${$modulesarrayref}[$i];
-
- if ( $onemodule->{'gid'} eq $modulegid )
- {
- $searchmodule = $onemodule;
- $found = 1;
- last;
- }
- }
-
- return $searchmodule;
-}
-
-###################################################
-# Creating package start tag
-###################################################
-
-sub get_package_tag
-{
- my ( $module, $indent, $linkpackage ) = @_;
-
- my $modulegid = $module->{'gid'};
- if ( $linkpackage ) { $modulegid = $modulegid . "u"; }
- my $parentgid = "";
- if ( $module->{'ParentID'} ) { $parentgid = $module->{'ParentID'}; }
- if ( $parentgid eq "" ) { $parentgid = "root"; }
- if ( $module->{'XPDParentID'} ) { $parentgid = $module->{'XPDParentID'}; } # changing parent of "Prg" and "Opt" to "root"
-
- my $tag = $indent . "<package " . "name=" . "\"" . $modulegid . "\" " . "parent=" . "\"" . $parentgid . "\">" . "\n";
-
- return ( $tag, $parentgid );
-}
-
-###################################################
-# Creating display start tag
-###################################################
-
-sub get_display_tag
-{
- my ( $module, $indent ) = @_;
-
- # Styles=(HIDDEN_ROOT)
- my $styles = "";
- my $type = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bHIDDEN_ROOT\b/ ) { $type = "hidden"; }
- else { $type = "show"; }
-
- # special handling for language modules. Only visible in multilingual installation set.
- if (( $styles =~ /\bSHOW_MULTILINGUAL_ONLY\b/ ) && ( ! $installer::globals::ismultilingual )) { $type = "hidden"; }
-
- # special handling for the root module, which has no parent
- my $parentgid = "";
- if ( $module->{'ParentID'} ) { $parentgid = $module->{'ParentID'}; }
- if ( $parentgid eq "" ) { $type = "hidden"; }
-
- my $tag = $indent . "<display " . "type=" . "\"" . $type . "\"" . ">" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Creating installunit start tag
-###################################################
-
-sub get_installunit_tag
-{
- my ( $indent ) = @_;
-
- my $type = $installer::globals::packageformat;
-
- my $tag = $indent . "<installunit " . "type=" . "\"" . $type . "\"" . ">" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Creating simple start tags
-###################################################
-
-sub get_start_tag
-{
- my ( $tag, $indent ) = @_;
-
- my $starttag = $indent . "<" . $tag . ">" . "\n";
- return $starttag;
-}
-
-###################################################
-# Creating end tags
-###################################################
-
-sub get_end_tag
-{
- my ( $tag, $indent ) = @_;
-
- my $endtag = $indent . "</" . $tag . ">" . "\n";
- return $endtag;
-}
-
-###################################################
-# Creating simple complete tag
-###################################################
-
-sub get_tag_line
-{
- my ( $indent, $name, $value ) = @_;
- $value = '' unless defined $value;
-
- my $line = $indent . "<" . $name . ">" . $value . "</" . $name . ">" . "\n";
-
-}
-
-###################################################
-# Asking module for sortkey entry
-###################################################
-
-sub get_sortkey_value
-{
- my ( $module ) = @_;
-
- my $value = "9999";
-
- if ( $module->{'Sortkey'} ) { $value = $module->{'Sortkey'}; }
-
- return $value;
-}
-
-###################################################
-# Asking module for default entry
-###################################################
-
-sub get_default_value
-{
- my ( $module ) = @_;
-
- my $value = "";
-
- if ( $module->{'Default'} ) { $value = $module->{'Default'}; } # is YES or NO
-
- if ( $value =~ /\bNO\b/i ) { $value = "false"; }
- else { $value = "true"; }
-
- return $value;
-}
-
-###################################################
-# Asking module for showinuserinstall entry
-# scp style: DONTSHOWINUSERINSTALL
-###################################################
-
-sub get_showinuserinstall_value
-{
- my ( $module ) = @_;
-
- my $value = "true";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bDONTSHOWINUSERINSTALL\b/ ) { $value = "false"; }
-
- return $value;
-}
-
-###################################################
-# Asking module for showinuserinstall entry
-# scp style: USERINSTALLONLY
-###################################################
-
-sub get_userinstallonly_value
-{
- my ( $module ) = @_;
-
- my $value = "false";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bUSERINSTALLONLY\b/ ) { $value = "true"; }
-
- return $value;
-}
-
-###################################################
-# Asking module for dontuninstall entry
-# scp style: DONTUNINSTALL
-###################################################
-
-sub get_dontuninstall_value
-{
- my ( $module ) = @_;
-
- my $value = "false";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bDONTUNINSTALL\b/ ) { $value = "true"; }
-
- return $value;
-}
-
-###################################################
-# Asking module for XpdCheckSolaris entry
-# (belongs to scp module)
-###################################################
-
-sub get_checksolaris_value
-{
- my ( $module ) = @_;
-
- my $value = "";
- if ( $module->{'XpdCheckSolaris'} ) { $value = $module->{'XpdCheckSolaris'}; }
-
- return $value;
-}
-
-###################################################
-# Asking module for isupdatepackage entry
-# scp style: ISUPDATEPACKAGE
-###################################################
-
-sub get_isupdatepackage_value
-{
- my ( $module ) = @_;
-
- my $value = "false";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bISUPDATEPACKAGE\b/ ) { $value = "true"; }
-
- return $value;
-}
-
-###################################################
-# Asking module for showmultilingualonly entry
-# scp style: SHOW_MULTILINGUAL_ONLY
-###################################################
-
-sub get_showmultilingualonly_value
-{
- my ( $module ) = @_;
-
- my $value = "false";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bSHOW_MULTILINGUAL_ONLY\b/ ) { $value = "true"; }
-
- return $value;
-}
-
-###################################################
-# Asking module for showmultilingualonly entry
-# scp style: SHOW_MULTILINGUAL_ONLY
-###################################################
-
-sub get_applicationmodule_value
-{
- my ( $module ) = @_;
-
- my $value = "false";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bAPPLICATIONMODULE\b/ ) { $value = "true"; }
-
- return $value;
-}
-
-###################################################
-# Asking module for java module entry
-# scp style: JAVAMODULE
-###################################################
-
-sub get_isjavamodule_value
-{
- my $value = "false";
- return $value;
-}
-
-#####################################################################
-# Asking module, if installation shall use --force
-# scp style: USEFORCE (Linux only)
-#####################################################################
-
-sub get_useforce_value
-{
- my ( $module ) = @_;
-
- my $value = "false";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bUSEFORCE\b/ ) { $value = "true"; }
-
- return $value;
-}
-
-###################################################
-# Asking module, if installation can fail
-# scp style: INSTALLCANFAIL
-###################################################
-
-sub get_installcanfail_value
-{
- my ( $module ) = @_;
-
- my $value = "false";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bINSTALLCANFAIL\b/ ) { $value = "true"; }
-
- return $value;
-}
-
-###################################################
-# Asking module, if installation can fail
-# scp style: INSTALLCANFAIL
-###################################################
-
-sub get_forceintoupdate_value
-{
- my ( $module ) = @_;
-
- my $value = "false";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bFORCEINTOUPDATE\b/ ) { $value = "true"; }
-
- return $value;
-}
-
-###################################################
-# Substituting all occurrences of "<" by "<"
-# and all occurrences of ">" by ">"
-###################################################
-
-sub replace_brackets_in_string
-{
- my ( $string ) = @_;
-
- if ( $string =~ /\</ ) { $string =~ s/\</\<\;/g; }
- if ( $string =~ /\>/ ) { $string =~ s/\>/\>\;/g; }
-
- return $string;
-}
-
-###################################################
-# Substituting all occurrences of "\uUXYZ" by
-# "&#xUXYZ;", because the use xml saxparser does
-# not know anything about this encoding. Therfore
-# the xml file can keep standard encoding "UTF-8"
-# and all strings with "\uUXYZ" do not need to
-# be converted from the Java installer.
-###################################################
-
-sub replace_javaencoding_in_string
-{
- my ( $string ) = @_;
-
- while ( $string =~ /(\\u\w\w\w\w)/ )
- {
- my $oldvalue = $1;
- my $newvalue = "";
- if ( $oldvalue =~ /\\u(\w\w\w\w)/ )
- {
- my $number = $1;
- $newvalue = "&#x" . $number . ";";
- }
-
- $string =~ s/\Q$oldvalue\E/$newvalue/;
- }
-
- return $string;
-}
-
-###################################################
-# Collecting language dependent entries from scp
-# (Name and Description)
-###################################################
-
-sub collect_lang_values
-{
- my ($indent, $module, $xpdfile, $searchentry, $saveentry) = @_;
-
- foreach $key (keys %{$module})
- {
- my $write_line = 0;
- my $javalanguage = "";
-
- if ( $key =~ /^\s*\Q$searchentry\E\s+\((\S+)\)\s*$/ ) # this are the language dependent keys
- {
- $language = $1;
- $javalanguage = installer::languages::get_java_language($language);
- $write_line = 1;
- }
- elsif ( $key =~ /^\s*\Q$searchentry\E\s*$/ ) # this are the language independent keys
- {
- $javalanguage = "en_US";
- $write_line = 1;
- }
-
- if ( $write_line )
- {
- my $value = $module->{$key};
- $value = replace_brackets_in_string($value);
- $value = replace_javaencoding_in_string($value);
- my $line = $indent . "<" . $saveentry . " lang=" . "\"" . $javalanguage . "\"" . ">" . $value . "<\/" . $saveentry . ">" . "\n";
- push(@{$xpdfile}, $line);
- }
- }
-}
-
-###################################################
-# Removing language dependent entries from
-# module hash (Name and Description)
-###################################################
-
-sub remove_lang_values
-{
- my ($module, $searchentry) = @_;
-
- my $key = "";
-
- foreach $key (keys %{$module})
- {
- if ( $key =~ /^\s*\Q$searchentry\E\s+\((\S+)\)\s*$/ ) # this are the language dependent keys
- {
- delete($module->{$key});
- }
- }
-}
-
-###################################################
-# Setting package install order
-###################################################
-
-sub get_order_value
-{
- my ( $module ) = @_;
-
- my $value = "1000"; # Setting the default value
-
- if ( $module->{'InstallOrder'} ) { $value = $module->{'InstallOrder'}; }
-
- return $value;
-}
-
-###################################################
-# Checking size of package
-###################################################
-
-sub get_size_value
-{
- my ( $packagename, $xpdinfo ) = @_;
-
- my $value = "";
-
- if ( $xpdinfo->{'FileSize'} )
- {
- $value = $xpdinfo->{'FileSize'};
- return $value;
- }
-
- my $isrpmfile = 0;
- if ( $packagename =~ /\.rpm\s*$/ ) { $isrpmfile = 1; }
-
- if (( $installer::globals::isrpmbuild ) && ( $isrpmfile ))
- {
- if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
-
- my $systemcall = "$installer::globals::rpmquerycommand -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |";
- my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
- if ( defined $ENV{SYSBASE}) {
- my $sysbase = $ENV{SYSBASE};
- if ( !defined ($ld_library_backup) or ("$ld_library_backup" eq "") ) {
- $ld_library_backup = "" if ! defined $ld_library_backup;
- $ENV{LD_LIBRARY_PATH} = "$sysbase/usr/lib";
- } else {
- $ENV{LD_LIBRARY_PATH} = "$ld_library_backup:$sysbase/lib";
- }
- }
- my ($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
- $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
- # Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH
- if ( $error )
- {
- installer::logger::print_message( "... trying /usr/bin/rpm ...\n" );
- my $systemcall = "/usr/bin/rpm -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |";
- ($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 0);
- if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_size_value"); }
- }
- $value = do_sum($rpmout); # adding all filesizes in bytes
- $value = $value/1000;
-
- my $ganzzahl = int $value;
- if ($ganzzahl < $value) { $value = $ganzzahl + 1; }
- else { $value = $ganzzahl; }
-
- my $rpmname = $packagename;
- installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);
- $infoline = "Filesize $rpmname : $value\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
-
- if ( $installer::globals::issolarispkgbuild )
- {
- my $filename = "pkgmap";
- $filename = $packagename . $installer::globals::separator . $filename;
- $file = installer::files::read_file($filename);
-
- for ( my $i = 0; $i <= $#{$file}; $i++ )
- {
- my $line = ${$file}[$i];
- if ( $line =~ /^\s*\:\s+\d+\s+(\d+?)\s+/ )
- {
- $value = $1;
- if ( ! ( $value%2 == 0 )) { $value = $value + 1; }
- $value = $value/2; # not blocks, but kB
- last;
- }
- }
- }
-
- if ( $value eq "" ) { $value = "0"; }
-
- return $value;
-}
-
-###################################################
-# Checking md5 of package
-###################################################
-
-sub get_md5_value
-{
- my ( $packagename, $xpdinfo ) = @_;
-
- my $value = "";
-
- if ( $xpdinfo->{'md5sum'} )
- {
- $value = $xpdinfo->{'md5sum'};
- return $value;
- }
-
- if ( $installer::globals::isrpmbuild )
- {
- my $md5file = "/usr/bin/md5sum";
-
- if ( -x $md5file )
- {
- my $systemcall = "$md5file $packagename 2\>\&1 |";
- my $md5out = make_systemcall($systemcall, 1);
- $value = ${$md5out}[0];
- if ( $value =~ /^\s*(\S+?)\s+.*$/ )
- {
- $value = $1;
- }
-
- my $rpmname = $packagename;
- installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);
- $infoline = "md5sum of $rpmname : $value\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
- }
-
- return $value;
-}
-
-###################################################
-# Checking name of package
-###################################################
-
-sub get_name_value
-{
- my ( $packagename ) = @_;
-
- my $value = $packagename;
-
- # $packagename contains the complete path to the package
- # Only the name of file or directory is required
-
- installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$value);
-
- return $value;
-}
-
-###################################################
-# Checking full package name (Linux only)
-###################################################
-
-sub get_fullpkgname_value
-{
- my ( $packagename, $xpdinfo ) = @_;
-
- my $value = "";
- my $isrpmfile = 0;
- if ( $packagename =~ /\.rpm\s*$/ ) { $isrpmfile = 1; }
-
- if (( $installer::globals::isrpmbuild ) && ( $isrpmfile ))
- {
- if ( $xpdinfo->{'FullPackageName'} )
- {
- $value = $xpdinfo->{'FullPackageName'};
- return $value;
- }
-
- if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
- my $systemcall = "$installer::globals::rpmquerycommand -qp $packagename |";
- my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
- if ( defined $ENV{SYSBASE}) {
- my $sysbase = $ENV{SYSBASE};
- if ( !defined ($ld_library_backup) or ("$ld_library_backup" eq "") ) {
- $ld_library_backup = "" if ! defined $ld_library_backup;
- $ENV{LD_LIBRARY_PATH} = "$sysbase/usr/lib";
- } else {
- $ENV{LD_LIBRARY_PATH} = "$ld_library_backup:$sysbase/lib";
- }
- }
- my ($returnarray, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
- $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
- # Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH
- if ( $error )
- {
- installer::logger::print_message( "... trying /usr/bin/rpm ...\n" );
- my $systemcall = "/usr/bin/rpm -qp $packagename |";
- ($returnarray, $error) = make_systemcall_allowing_error($systemcall, 0, 0);
- if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_fullpkgname_value"); }
- }
- $value = ${$returnarray}[0];
- installer::remover::remove_leading_and_ending_whitespaces(\$value);
-
- my $rpmname = $packagename;
- installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);
-
- $infoline = "Full package name from $rpmname: $value\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
-
- return $value;
-}
-
-###################################################
-# Checking package version (Solaris only)
-###################################################
-
-sub get_pkgversion_value
-{
- my ( $completepackagename, $xpdinfo ) = @_;
-
- my $value = "";
-
- if ( $xpdinfo->{'PkgVersion'} )
- {
- $value = $xpdinfo->{'PkgVersion'};
- return $value;
- }
-
- if ( $installer::globals::issolarispkgbuild )
- {
- my $pkgfile = "pkgparam";
- my $packagepath = $completepackagename;
- installer::pathanalyzer::get_path_from_fullqualifiedname(\$packagepath);
-
- my $packagename = $completepackagename;
- installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$packagename);
-
- my $systemcall = "$pkgfile -d $packagepath $packagename param VERSION 2\>\&1 |";
- my $returnarray = make_systemcall($systemcall, 0);
-
- $value = ${$returnarray}[0];
- installer::remover::remove_leading_and_ending_whitespaces(\$value);
- }
-
- return $value;
-}
-
-###################################################
-# Writing subdirectory into xpd file
-###################################################
-
-sub get_subdir_value
-{
- my ( $packagename, $subdir, $module ) = @_;
-
- my $value = "";
-
- if ( $subdir ) { $value = $subdir; }
-
- if ( $module->{'Subdir'} ) { $value = $module->{'Subdir'}; }
-
- return $value;
-}
-
-###################################################
-# Checking if package is relocatable
-###################################################
-
-sub get_relocatable_value
-{
- my ( $module ) = @_;
-
- my $value = "true";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bNOTRELOCATABLE\b/ ) { $value = "false"; }
-
- return $value;
-}
-
-###################################################
-# Checking if package is relocatable
-###################################################
-
-sub get_languagespecific_value
-{
- my ( $islanguagemodule ) = @_;
-
- my $value = "false";
-
- if ( defined $islanguagemodule && $islanguagemodule == 1 ) { $value = "true"; }
-
- return $value;
-}
-
-#######################################################
-# Adding the values of the array
-#######################################################
-
-sub do_sum
-{
- my ( $allnumbers ) = @_;
-
- my $sum = 0;
-
- for ( my $i = 0; $i <= $#{$allnumbers}; $i++ )
- {
- $sum = $sum + ${$allnumbers}[$i];
- }
-
- return $sum;
-}
-
-#######################################################
-# Executing one system call
-#######################################################
-
-sub make_systemcall
-{
- my ( $systemcall, $logreturn ) = @_;
-
- my @returns = ();
-
- installer::logger::print_message( "... $systemcall ...\n" );
-
- open (REG, "$systemcall");
- while (<REG>) {push(@returns, $_); }
- close (REG);
-
- my $returnvalue = $?; # $? contains the return value of the systemcall
-
- my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- if ( $logreturn )
- {
- for ( my $j = 0; $j <= $#returns; $j++ ) { push( @installer::globals::logfileinfo, "$returns[$j]"); }
- }
-
- if ($returnvalue)
- {
- $infoline = "ERROR: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
- $error_occurred = 1;
- }
- else
- {
- $infoline = "SUCCESS: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
-
- return \@returns;
-}
-
-#######################################################
-# Executing one system call
-#######################################################
-
-sub make_systemcall_allowing_error
-{
- my ( $systemcall, $logreturn, $can_fail ) = @_;
-
- my @returns = ();
-
- installer::logger::print_message( "... $systemcall ...\n" );
-
- open (REG, "$systemcall");
- while (<REG>) {push(@returns, $_); }
- close (REG);
-
- my $returnvalue = $?; # $? contains the return value of the systemcall
-
- my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- if ( $logreturn )
- {
- for ( my $j = 0; $j <= $#returns; $j++ ) { push( @installer::globals::logfileinfo, "$returns[$j]"); }
- }
-
- if ($returnvalue)
- {
- if ( $can_fail )
- {
- $infoline = "WARNING: Failed system call: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
- $error_occurred = 1;
- }
- else
- {
- $infoline = "ERROR: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
- $error_occurred = 1;
- }
- }
- else
- {
- $infoline = "SUCCESS: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
-
- return (\@returns, $returnvalue);
-}
-
-###################################################
-# Setting product name tag
-###################################################
-
-sub get_product_tag
-{
- my ($allvariables, $indent) = @_;
-
- my $productname = $allvariables->{'LCONEWORDPRODUCTNAME'};
- my $tag = $indent . "<product " . "name=" . "\"" . $productname . "\">" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Macro tags
-###################################################
-
-sub set_macro_tag
-{
- my ($allvariables, $indent, $key) = @_;
-
- my $property = "";
- my $value = "";
-
- if ( $key eq "product_name" ) { $property = "PRODUCTNAME"; }
- elsif ( $key eq "product_version" ) { $property = "PRODUCTVERSION"; }
- elsif ( $key eq "product_suffix" ) { $property = "PRODUCTEXTENSION"; }
- elsif ( $key eq "product_fullname" ) { $property = "FULLPRODUCTNAME"; }
-
- if (( $property eq "PRODUCTNAME" ) || ( $property eq "PRODUCTVERSION" ) || ( $property eq "PRODUCTEXTENSION" ))
- {
- $value = $allvariables->{$property};
- }
-
- if ( $property eq "FULLPRODUCTNAME" )
- {
- $value = $allvariables->{"PRODUCTNAME"} . " " . $allvariables->{"PRODUCTVERSION"};
- if ( $allvariables->{"PRODUCTEXTENSION"} ) { $value = $value . " " . $allvariables->{"PRODUCTEXTENSION"}; }
- }
-
- my $tag = $indent . "<macro " . "key=" . "\"" . $key . "\">" . $value . "\<\/macro\>" . "\n";
-
- return $tag;
-
-}
-
-###################################################
-# Setting the minor of the product version
-# Required to check for Major Upgrades.
-###################################################
-
-sub set_minor_tag
-{
- my ($allvariables, $indent) = @_;
-
- my $productminor = 0;
- if ( $allvariables->{"PACKAGEVERSION"} )
- {
- if ( $allvariables->{"PACKAGEVERSION"} =~ /^\s*\d+\.(\d+)/ ) { $productminor = $1; }
- }
- my $tag = $indent . "<productminor>" . $productminor . "</productminor>" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Setting the update behaviour
-###################################################
-
-sub set_update_tag
-{
- my ($allvariables, $indent) = @_;
-
- my $updateflag = "false";
- if ( $allvariables->{"DONTUPDATE"} ) { $updateflag = "true"; }
- my $tag = $indent . "<dontupdate>" . $updateflag . "</dontupdate>" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Setting the license dialog behaviour
-###################################################
-
-sub set_hideeula_tag
-{
- my ($allvariables, $indent) = @_;
-
- my $hidelicenseflag = "false";
- if ( $allvariables->{"HIDELICENSEDIALOG"} ) { $hidelicenseflag = "true"; }
- my $tag = $indent . "<hideeula>" . $hidelicenseflag . "</hideeula>" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Setting default directory
-###################################################
-
-sub set_defaultdir_tag
-{
- my ($allvariables, $indent) = @_;
-
- my $defaultdir = "";
- if ( $allvariables->{"DEFAULTDESTPATH"} ) { $defaultdir = $allvariables->{"DEFAULTDESTPATH"}; }
- my $tag = $indent . "<defaultdir>" . $defaultdir . "</defaultdir>" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Setting product directory
-###################################################
-
-sub set_productdir_tag
-{
- my ($allvariables, $indent) = @_;
-
- my $productdir = "";
- if ( $allvariables->{"UNIXPRODUCTNAME"} )
- {
- $productdir = $allvariables->{"UNIXPRODUCTNAME"};
-
- if ( $allvariables->{"BRANDPACKAGEVERSION"} )
- {
- $productdir = $productdir . $allvariables->{"BRANDPACKAGEVERSION"};
- }
- else
- {
- if ( $allvariables->{"PRODUCTVERSION"} )
- {
- $productdir = $productdir . $allvariables->{"PRODUCTVERSION"};
- }
- }
- }
- my $tag = $indent . "<productdir>" . $productdir . "</productdir>" . "\n";
-
- return $tag;
-}
-
-#####################################################
-# Setting the package directory in installation set
-#####################################################
-
-sub set_packagedir_tag
-{
- my ($indent) = @_;
-
- my $tag = $indent . "<packagedirectory>" . $installer::globals::epmoutpath . "</packagedirectory>" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Setting the packagetype of installation set
-###################################################
-
-sub set_packagetype_tag
-{
- my ($indent) = @_;
-
- my $tag = $indent . "<packageformat>" . $installer::globals::packageformat . "</packageformat>" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Setting the architecture of installation set
-###################################################
-
-sub set_architecture_tag
-{
- my ($indent) = @_;
-
- my $architecture = "";
- if ( $installer::globals::issolarissparcbuild ) { $architecture = "sparc"; }
- if ( $installer::globals::issolarisx86build ) { $architecture = "i386"; }
-
- my $tag = $indent . "<architecture>" . $architecture . "</architecture>" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Setting the multi language tag
-###################################################
-
-sub set_multilanguage_tag
-{
- my ($indent) = @_;
-
- my $value = "false";
- if ( $installer::globals::ismultilingual == 1 ) { $value = "true"; }
-
- my $tag = $indent . "<multilingual>" . $value . "</multilingual>" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Setting the language tag
-###################################################
-
-sub set_language_tag
-{
- my ($languagestringref, $indent) = @_;
-
- my $tag = $indent . "<languages>" . $$languagestringref . "</languages>" . "\n";
-
- return $tag;
-}
-
-###################################################
-# Collecting content for product xpd file
-###################################################
-
-# <?xml version='1.0' encoding='utf-8'?>
-#
-# <!-- General application description -->
-#
-# <product name="openoffice">
-# <macro key="product_name">Sun OpenOffice.org</macro>
-# <macro key="product_version">1.0</macro>
-# <macro key="product_suffix">Mephisto</macro>
-# <macro key="product_fullname">Sun OpenOffice.org 1.0 Mephisto</macro>
-# <defaultdir>/opt/Sun/OpenOffice.org-Mephisto</defaultdir>
-# </product>
-
-sub get_setup_file_content
-{
- my ($allvariables, $languagestringref) = @_;
-
- my @xpdfile = ();
- my $noindent = "";
- my $singleindent = " ";
-
- my $line = "<?xml version='1.0' encoding='utf-8'?>\n\n";
- push(@xpdfile, $line);
- $line = "<!-- General application description -->\n\n";
- push(@xpdfile, $line);
-
- my $tag = get_product_tag($allvariables, $noindent);
- push(@xpdfile, $tag);
-
- $tag = set_macro_tag($allvariables, $singleindent, "product_name");
- push(@xpdfile, $tag);
- $tag = set_macro_tag($allvariables, $singleindent, "product_version");
- push(@xpdfile, $tag);
- $tag = set_macro_tag($allvariables, $singleindent, "product_suffix");
- push(@xpdfile, $tag);
- $tag = set_macro_tag($allvariables, $singleindent, "product_fullname");
- push(@xpdfile, $tag);
-
- $tag = set_defaultdir_tag($allvariables, $singleindent);
- push(@xpdfile, $tag);
-
- $tag = set_productdir_tag($allvariables, $singleindent);
- push(@xpdfile, $tag);
-
- $tag = set_minor_tag($allvariables, $singleindent);
- push(@xpdfile, $tag);
-
- $tag = set_update_tag($allvariables, $singleindent);
- push(@xpdfile, $tag);
-
- $tag = set_packagedir_tag($singleindent);
- push(@xpdfile, $tag);
-
- $tag = set_packagetype_tag($singleindent);
- push(@xpdfile, $tag);
-
- $tag = set_architecture_tag($singleindent);
- push(@xpdfile, $tag);
-
- $tag = set_multilanguage_tag($singleindent);
- push(@xpdfile, $tag);
-
- $tag = set_language_tag($languagestringref, $singleindent);
- push(@xpdfile, $tag);
-
- $tag = set_hideeula_tag($allvariables, $singleindent);
- push(@xpdfile, $tag);
-
- $tag = get_end_tag("product", $noindent);
- push(@xpdfile, $tag);
-
- return \@xpdfile;
-}
-
-###################################################
-# Collecting content for xpd file
-###################################################
-
-sub get_file_content
-{
- my ( $module, $packagename, $solslanguage, $linkpackage, $isemptyparent, $subdir, $islanguagemodule, $onelanguage, $xpdinfo ) = @_;
-
- my @xpdfile = ();
- my $value = "";
- my $line = "";
- my $noindent = "";
- my $singleindent = " ";
- my $doubleindent = $singleindent . $singleindent;
-
- my ( $tag, $parentgid ) = get_package_tag($module, $noindent, $linkpackage);
- push(@xpdfile, $tag);
-
- # start of installunit tag -> using info from scp module
-
- $tag = get_display_tag($module, $singleindent);
- push(@xpdfile, $tag);
-
- $value = get_sortkey_value($module);
- $line = get_tag_line($doubleindent, "sortkey", $value);
- push(@xpdfile, $line);
-
- $value = get_default_value($module);
- $line = get_tag_line($doubleindent, "default", $value);
- push(@xpdfile, $line);
-
- $value = get_showinuserinstall_value($module);
- $line = get_tag_line($doubleindent, "showinuserinstall", $value);
- push(@xpdfile, $line);
-
- $value = get_userinstallonly_value($module);
- $line = get_tag_line($doubleindent, "showinuserinstallonly", $value);
- push(@xpdfile, $line);
-
- $value = get_dontuninstall_value($module);
- $line = get_tag_line($doubleindent, "dontuninstall", $value);
- push(@xpdfile, $line);
-
- $value = get_checksolaris_value($module);
- $line = get_tag_line($doubleindent, "checksolaris", $value);
- push(@xpdfile, $line);
-
- $value = get_isupdatepackage_value($module);
- $line = get_tag_line($doubleindent, "isupdatepackage", $value);
- push(@xpdfile, $line);
-
- $value = get_showmultilingualonly_value($module);
- $line = get_tag_line($doubleindent, "showmultilingualonly", $value);
- push(@xpdfile, $line);
-
- $value = get_applicationmodule_value($module);
- $line = get_tag_line($doubleindent, "applicationmodule", $value);
- push(@xpdfile, $line);
-
- $value = get_isjavamodule_value($module);
- $line = get_tag_line($doubleindent, "isjavapackage", $value);
- push(@xpdfile, $line);
-
- $value = get_installcanfail_value($module);
- $line = get_tag_line($doubleindent, "installcanfail", $value);
- push(@xpdfile, $line);
-
- $value = get_forceintoupdate_value($module);
- $line = get_tag_line($doubleindent, "forceintoupdate", $value);
- push(@xpdfile, $line);
-
- $value = get_useforce_value($module);
- $line = get_tag_line($doubleindent, "useforce", $value);
- push(@xpdfile, $line);
-
- # iterating over all languages to get names and descriptions
- collect_lang_values($doubleindent, $module, \@xpdfile, "Name", "name");
- collect_lang_values($doubleindent, $module, \@xpdfile, "Description", "description");
-
- $tag = get_end_tag("display", $singleindent);
- push(@xpdfile, $tag);
-
- # end of display tag
-
- if ( ! $isemptyparent )
- {
- # start of installunit tag -> using info from package defined in packagelist
-
- $tag = get_installunit_tag($singleindent);
- push(@xpdfile, $tag);
-
- $value = get_size_value($packagename, $xpdinfo);
- $line = get_tag_line($doubleindent, "size", $value);
- push(@xpdfile, $line);
-
- $value = get_order_value($module);
- $line = get_tag_line($doubleindent, "installorder", $value);
- push(@xpdfile, $line);
-
- $value = get_md5_value($packagename, $xpdinfo);
- $line = get_tag_line($doubleindent, "md5", $value);
- push(@xpdfile, $line);
-
- $value = get_name_value($packagename);
- $line = get_tag_line($doubleindent, "name", $value);
- push(@xpdfile, $line);
-
- $value = get_fullpkgname_value($packagename, $xpdinfo);
- $line = get_tag_line($doubleindent, "fullpkgname", $value);
- push(@xpdfile, $line);
-
- $value = get_pkgversion_value($packagename, $xpdinfo);
- $line = get_tag_line($doubleindent, "pkgversion", $value);
- push(@xpdfile, $line);
-
- $value = get_subdir_value($packagename, $subdir, $module);
- $line = get_tag_line($doubleindent, "subdir", $value);
- push(@xpdfile, $line);
-
- $value = get_relocatable_value($module);
- $line = get_tag_line($doubleindent, "relocatable", $value);
- push(@xpdfile, $line);
-
- $value = get_languagespecific_value($islanguagemodule);
- $line = get_tag_line($doubleindent, "languagespecific", $value);
- push(@xpdfile, $line);
-
- $value = $onelanguage;
- $line = get_tag_line($doubleindent, "language", $value);
- push(@xpdfile, $line);
-
- $line = get_tag_line($doubleindent, "solarislanguage", $solslanguage);
- push(@xpdfile, $line);
-
- $tag = get_end_tag("installunit", $singleindent);
- push(@xpdfile, $tag);
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list