summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-01-08 23:47:02 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-01-10 09:32:36 +0000
commit26c142ca5f2b405b02ab5701dfaeab7bf281a727 (patch)
tree5f13ab387169c4a17ce6c1304430e23eb49f868d /scp2
parenta5838b19bc774efd261c1d6c78a2b6eb62f1b502 (diff)
Kill the ancient StarOffice "patch" concept
For Windows, superseded by Windows Installer patching (i.e., creating .msp files), which is something completely different. (And quite hard to get working... but still a saner approach, I think.) For Linux, many distros use delta RPMs or similar, so no home-grown LO-specific patching mechanism is needed. Remove the -patch and -patchinc command-line options to make_installer.pl and all code that was invoked only when using those. Remove the PATCH and PATCH_ONLY flags in scp2. Remove the patchmsi.dll Windows Installer custom action. Change-Id: I09e949e601a969f88eff60067faa2352f4f89537 Reviewed-on: https://gerrit.libreoffice.org/1605 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'scp2')
-rwxr-xr-xscp2/inc/macros.inc11
-rw-r--r--scp2/source/activex/file_activex.scp7
-rw-r--r--scp2/source/calc/registryitem_calc.scp1
-rw-r--r--scp2/source/draw/registryitem_draw.scp1
-rw-r--r--scp2/source/impress/registryitem_impress.scp1
-rw-r--r--scp2/source/ooo/common_brand.scp20
-rw-r--r--scp2/source/ooo/directory_ooo_macosx.scp1
-rw-r--r--scp2/source/ooo/file_library_ooo.scp15
-rw-r--r--scp2/source/ooo/file_ooo.scp9
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
-rw-r--r--scp2/source/ooo/windowscustomaction_ooo.scp69
-rw-r--r--scp2/source/smoketest/smoketest.scp1
-rw-r--r--scp2/source/writer/registryitem_writer.scp1
13 files changed, 3 insertions, 135 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index c10a136e915a..fd336d01b67f 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -100,11 +100,6 @@
Styles = (PACKED); \
Dir = SCP2_OOO_BIN_DIR
-#define PACKED_LIB_FILE_BODY_PATCH \
- LIB_FILE_BODY; \
- Styles = (PACKED,PATCH); \
- Dir = SCP2_OOO_BIN_DIR
-
#define STD_LIB_FILE(id,name) \
File id \
Name = LIBNAME(name); \
@@ -117,12 +112,6 @@
PACKED_LIB_FILE_BODY; \
End
-#define SPECIAL_LIB_FILE_PATCH(id,name) \
- File id \
- Name = SPECIAL_NAME(name); \
- PACKED_LIB_FILE_BODY_PATCH; \
- End
-
#define STD_RES_FILE(id,name) \
File id \
TXT_FILE_BODY; \
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index 2ff8583cd54a..680480dcc552 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -53,11 +53,4 @@ File gid_File_Lib_Regactivex_Msi
Name = "regactivex.dll";
End
-File gid_File_Lib_Regpatchactivex_Msi
- LIB_FILE_BODY;
- Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "regpatchactivex.dll";
-End
-
#endif // WITH_ACTIVEX_COMPONENT
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 6f886a48506f..d5b5af2aee4a 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -835,7 +835,6 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
ModuleID = gid_Module_Root;
Name = ".fods";
Value = "LibreOffice.CalcDocument.1";
- Styles = (PATCH);
End
RegistryItem gid_Regitem_Fods_Contenttype
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 2caa0bc5a28a..4e900162f1f7 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -843,7 +843,6 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
ModuleID = gid_Module_Root;
Name = ".fodg";
Value = "LibreOffice.DrawDocument.1";
- Styles = (PATCH);
End
RegistryItem gid_Regitem_fodg_KindMap
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 0c76dbd1fc01..8fa7ee966623 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -864,7 +864,6 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
ModuleID = gid_Module_Root;
Name = ".fodp";
Value = "LibreOffice.ImpressDocument.1";
- Styles = (PATCH);
End
RegistryItem gid_Regitem_Fodp_Contenttype
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 9582f7650019..eae79e718bce 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -529,7 +529,7 @@ End
File gid_File_Bin_QStart_Bin
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
- Styles = (PACKED, PATCH);
+ Styles = (PACKED);
Name = "oosplash";
End
@@ -1016,15 +1016,6 @@ ProfileItem gid_Brand_Profileitem_Version_Productminor
Value = "<productminor>";
End
-ProfileItem gid_Brand_Profileitem_Version_Productbuildid
- ProfileID = gid_Brand_Profile_Version_Ini;
- ModuleID = gid_Module_Root_Brand;
- Section = "Version";
- Order = 12;
- Key = "ProductBuildid";
- Value = "<productbuildid>";
-End
-
ProfileItem gid_Brand_Profileitem_Version_Alllanguages
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
@@ -1332,15 +1323,6 @@ ProfileItem gid_Brand_Profileitem_Setup_Upgradecode
End
#endif
-ProfileItem gid_Brand_Profileitem_Setup_Productbuildid
- ProfileID = gid_Brand_Profile_Setup_Ini;
- ModuleID = gid_Module_Root_Brand;
- Section = "Bootstrap";
- Order = 8;
- Key = "ProductBuildid";
- Value = "<productbuildid>";
-End
-
ProfileItem gid_Brand_Profileitem_Setup_Buildid
ProfileID = gid_Brand_Profile_Setup_Ini;
ModuleID = gid_Module_Root_Brand;
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index ab1138d70c44..c8b160e8659d 100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -32,7 +32,6 @@ Directory gid_Dir_Bundle
ParentID = PD_PROGDIR;
HostName = "%PRODUCTNAME.app";
LangPackHostName = "%PRODUCTNAME Language Pack.app";
- PatchHostName = "%PRODUCTNAME Patch.app";
End
Directory gid_Dir_Bundle_Contents
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a804041ab874..65a346f77469 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -753,17 +753,6 @@ End
#endif
-#ifdef WNT
-
-File gid_File_Lib_Patchmsi
- LIB_FILE_BODY;
- Name = "patchmsi.dll";
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
-End
-
-#endif
-
STD_LIB_FILE( gid_File_Lib_Lng, lng)
File gid_File_Lib_Localedata_En
@@ -1424,10 +1413,10 @@ STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
#if defined ENABLE_GSTREAMER
-SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
+SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer, avmediagst )
#endif
#if defined ENABLE_GSTREAMER_0_10
-SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer_0_10, avmediagst_0_10 )
+SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer_0_10, avmediagst_0_10 )
#endif
#if defined WNT
#ifdef ENABLE_DIRECTX
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index e973a5823b07..68fe44839f37 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1122,15 +1122,6 @@ File gid_File_Xsl_Import_Wordml_Wordml2ooo_Props
Name = "/xslt/import/wordml/wordml2ooo_props.xsl";
End
-#ifdef WNT
-File gid_File_Txt_Patchfiles
- TXT_FILE_BODY;
- Name = "patchlist.txt";
- Dir = gid_Brand_Dir_Program;
- Styles = (PACKED,PATCH,PATCH_ONLY,DONTRENAMEINPATCH);
-End
-#endif
-
File gid_Starregistry_Services_Rdb
TXT_FILE_BODY;
Name = "services.rdb";
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 267105189160..0efe8b65a60e 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -449,7 +449,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Msvcp70,
gid_File_Lib_Msvcr70,
gid_File_Lib_Ole,
- gid_File_Lib_Patchmsi,
gid_File_Lib_Reg4allmsdoc,
gid_File_Lib_Qslnkmsi,
gid_File_Lib_Sdqsmsi,
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index b489c3298b5f..a52a07bea4a7 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -244,26 +244,6 @@ WindowsCustomAction gid_Customaction_Patch_Regpatchactivex_Patchactivexcontrol
Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=3", "end");
End
-WindowsCustomAction gid_Customaction_Patch_SetProductInstallModeAction
- Name = "SetProductInstallModeAction";
- Typ = "321";
- Source = "patchmsi.dll";
- Target = "SetProductInstallMode";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not Installed", "FindRelatedProducts");
- Assignment2 = ("InstallUISequence", "Not Installed", "FindRelatedProducts");
-End
-
-WindowsCustomAction gid_Customaction_Patch_InstallExchangeFiles
- Name = "InstallExchangeFiles";
- Typ = "65";
- Source = "patchmsi.dll";
- Target = "InstallPatchedFiles";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not Installed", "behind_InstallFinalize");
- Assignment2 = ("AdminExecuteSequence", "", "behind_InstallFinalize");
-End
-
WindowsCustomAction gid_Customaction_Langpack_Register_Extensions
Name = "RegisterExtensions";
Typ = "65";
@@ -274,34 +254,6 @@ WindowsCustomAction gid_Customaction_Langpack_Register_Extensions
Assignment2 = ("AdminExecuteSequence", "", "end");
End
-WindowsCustomAction gid_Customaction_Patch_SetFeatureState
- Name = "SetFeatureState";
- Typ = "65";
- Source = "patchmsi.dll";
- Target = "SetFeatureState";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not Installed", "SetNewFeatureState");
-End
-
-WindowsCustomAction gid_Customaction_Patch_DeinstallExchangeFiles
- Name = "DeinstallExchangeFiles";
- Typ = "65";
- Source = "patchmsi.dll";
- Target = "UninstallPatchedFiles";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Installed", "RemoveIniValues");
-End
-
-WindowsCustomAction gid_Customaction_Patch_Shutdownquickstarter
- Name = "ShutDownQuickstarter";
- Typ = "65";
- Source = "patchmsi.dll";
- Target = "ShutDownQuickstarter";
- Inbinarytable = 1;
- Assignment1 = ("ControlEvent", "DestinationFolder", "Next", "DoAction", "ShutDownQuickstarter", "1", "0");
- Assignment2 = ("InstallExecuteSequence", "", "IsolateComponents");
-End
-
WindowsCustomAction gid_Customaction_CheckPatchList
Name = "CheckPatchList";
Typ = "65";
@@ -311,27 +263,6 @@ WindowsCustomAction gid_Customaction_CheckPatchList
Assignment1 = ("InstallExecuteSequence", "PATCH", "Patch1NotInstalled");
End
-WindowsCustomAction gid_Customaction_Patch_SetUserInstallMode
- Name = "SetUserInstallMode";
- Typ = "321";
- Source = "patchmsi.dll";
- Target = "GetUserInstallMode";
- Inbinarytable = 1;
- Assignment1 = ("ControlEvent", "InstallWelcome", "Next", "DoAction", "SetUserInstallMode", "1", "1");
- Assignment2 = ("ControlEvent", "InstallChangeFolder", "OK", "DoAction", "SetUserInstallMode", "1", "8");
- Assignment3 = ("ControlCondition", "DestinationFolder", "Next", "Enable", "NOT INVALIDDIRECTORY And NOT PATCHISOLDER And NOT ISWRONGPRODUCT");
- Assignment4 = ("ControlCondition", "DestinationFolder", "Next", "Disable", "INVALIDDIRECTORY Or PATCHISOLDER Or ISWRONGPRODUCT");
- Assignment5 = ("ControlCondition", "DestinationFolder", "LabelStartInstall", "Show", "NOT INVALIDDIRECTORY And NOT PATCHISOLDER And NOT ISWRONGPRODUCT");
- Assignment6 = ("ControlCondition", "DestinationFolder", "LabelInvalidDir", "Show", "INVALIDDIRECTORY");
- Assignment7 = ("ControlCondition", "DestinationFolder", "LabelPatchOlder", "Show", "PATCHISOLDER");
- Assignment8 = ("ControlCondition", "DestinationFolder", "LabelWrongProduct", "Show", "ISWRONGPRODUCT");
- Assignment9 = ("ControlCondition", "DestinationFolder", "LabelStartInstall2", "Show", "NOT INVALIDDIRECTORY And NOT PATCHISOLDER And NOT ISWRONGPRODUCT");
- Assignment10 = ("ControlCondition", "DestinationFolder", "LabelInvalidDir2", "Show", "INVALIDDIRECTORY");
- Assignment11 = ("ControlCondition", "DestinationFolder", "LabelPatchOlder2", "Show", "PATCHISOLDER");
- Assignment12 = ("ControlCondition", "DestinationFolder", "LabelWrongProduct2", "Show", "ISWRONGPRODUCT");
- Assignment13 = ("InstallExecuteSequence", "Not Installed", "PatchIsOlder");
-End
-
WindowsCustomAction gid_Customaction_Langpack_SetUserInstallMode
Name = "SetUserInstallMode";
Typ = "65";
diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp
index 7c368c38cb47..e233a0efb073 100644
--- a/scp2/source/smoketest/smoketest.scp
+++ b/scp2/source/smoketest/smoketest.scp
@@ -62,7 +62,6 @@ Directory gid_Test_Dir_Bundle
ParentID = PD_PROGDIR;
HostName = "%PRODUCTNAME.app";
LangPackHostName = "%PRODUCTNAME Language Pack.app";
- PatchHostName = "%PRODUCTNAME Patch.app";
End
Directory gid_Test_Dir_Bundle_Contents
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 2de4a8bb6ebd..8242f770da19 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1008,7 +1008,6 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
ModuleID = gid_Module_Root;
Name = ".fodt";
Value = "LibreOffice.WriterDocument.1";
- Styles = (PATCH);
End
RegistryItem gid_Regitem_Fodt_Contenttype