diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-02-05 20:20:13 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-02-05 20:30:07 +0100 |
commit | 73f4ef48d065c4108de4af52a4dc7d86815b9b05 (patch) | |
tree | 24e12b0f4266ed6125de9393a87d145cf469555f /scp2 | |
parent | f504768a96601622f089dc6ee7620df1d014c6fb (diff) |
scp2: stop cargo-culting DONT_OVERWRITE around
There appears to be no usage of this Style in the installer Perl code in
the git history.
Change-Id: I137627505af5c7b33006437e83624b34ca2e3583
Diffstat (limited to 'scp2')
-rwxr-xr-x | scp2/inc/macros.inc | 6 | ||||
-rw-r--r-- | scp2/source/accessories/file_samples_accessories.scp | 12 | ||||
-rw-r--r-- | scp2/source/accessories/file_templates_accessories.scp | 66 | ||||
-rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 18 | ||||
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 10 |
5 files changed, 56 insertions, 56 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index c70bafd25406..9266bb56e3e7 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -226,7 +226,7 @@ End TXT_FILE_BODY; \ Name = STRING(CONCAT2(name,.jar)); \ Dir = gid_Dir_Classes; \ - Styles = (PACKED,DONT_OVERWRITE); \ + Styles = (PACKED); \ End #define URE_JAR_FILE(id,name) \ @@ -549,13 +549,13 @@ End File gid_File_Extra_Gall##id \ Dir = FILELIST_DIR; \ TXT_FILE_BODY; \ - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \ + Styles = (FILELIST, WORKSTATION); \ Name = STRING(CONCAT3(Gallery/,id,.filelist)); \ End \ File gid_File_Extra_GallFiles##id \ Dir = FILELIST_DIR; \ TXT_FILE_BODY; \ - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \ + Styles = (FILELIST, WORKSTATION); \ Name = STRING(CONCAT3(Gallery/Files/,id,.filelist)); \ End diff --git a/scp2/source/accessories/file_samples_accessories.scp b/scp2/source/accessories/file_samples_accessories.scp index c495d8d475cf..eb29717735a6 100644 --- a/scp2/source/accessories/file_samples_accessories.scp +++ b/scp2/source/accessories/file_samples_accessories.scp @@ -17,21 +17,21 @@ File gid_File_Extra_Samples_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamples,filelist); End File gid_File_Extra_Samples_Documentations_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamplesdocumentation,filelist); End File gid_File_Extra_Samples_Advertisement_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamplesadvertisement,filelist); End @@ -40,21 +40,21 @@ End File gid_File_Extra_Samples_NONFREE_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamplesnonfree,filelist); End File gid_File_Extra_Samples_NONFREE_Documentations_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamplesnonfreedocumentation,filelist); End File gid_File_Extra_Samples_NONFREE_Advertisement_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamplesnonfreeadvertisement,filelist); End diff --git a/scp2/source/accessories/file_templates_accessories.scp b/scp2/source/accessories/file_templates_accessories.scp index 76100c25907f..2f570a0e9c48 100644 --- a/scp2/source/accessories/file_templates_accessories.scp +++ b/scp2/source/accessories/file_templates_accessories.scp @@ -17,77 +17,77 @@ File gid_File_Extra_Templates_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplates,filelist); End File gid_File_Extra_Templates_Layout_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplateslayout,filelist); End File gid_File_Extra_Templates_Present_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatespresent,filelist); End File gid_File_Extra_Templates_Educate_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplateseducate,filelist); End File gid_File_Extra_Templates_Finance_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesfinance,filelist); End File gid_File_Extra_Templates_Forms_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesforms,filelist); End File gid_File_Extra_Templates_Labels_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplateslabels,filelist); End File gid_File_Extra_Templates_Misc_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesmisc,filelist); End File gid_File_Extra_Templates_Officorr_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesofficorr,filelist); End File gid_File_Extra_Templates_Offimisc_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesoffimisc,filelist); End File gid_File_Extra_Templates_Personal_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatespersonal,filelist); End @@ -96,77 +96,77 @@ End File gid_File_Extra_Templates_Common Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommon.filelist"; End File gid_File_Extra_Templates_Common_Layout Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommonlayout.filelist"; End File gid_File_Extra_Templates_Common_Present Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommonpresent.filelist"; End File gid_File_Extra_Templates_Common_Educate Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommoneducate.filelist"; End File gid_File_Extra_Templates_Common_Finance Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommonfinance.filelist"; End File gid_File_Extra_Templates_Common_Forms Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommonforms.filelist"; End File gid_File_Extra_Templates_Common_Labels Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommonlabels.filelist"; End File gid_File_Extra_Templates_Common_Misc Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommonmisc.filelist"; End File gid_File_Extra_Templates_Common_Officorr Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommonofficorr.filelist"; End File gid_File_Extra_Templates_Common_Offimisc Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommonoffimisc.filelist"; End File gid_File_Extra_Templates_Common_Personal Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "accessories_accessoriestemplatescommonpersonal.filelist"; End @@ -175,77 +175,77 @@ End File gid_File_Extra_Templates_NONFREE_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfree,filelist); End File gid_File_Extra_Templates_NONFREE_Layout_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfreelayout,filelist); End File gid_File_Extra_Templates_NONFREE_Present_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfreepresent,filelist); End File gid_File_Extra_Templates_NONFREE_Educate_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfreeeducate,filelist); End File gid_File_Extra_Templates_NONFREE_Finance_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfreefinance,filelist); End File gid_File_Extra_Templates_NONFREE_Forms_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfreeforms,filelist); End File gid_File_Extra_Templates_NONFREE_Labels_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfreelabels,filelist); End File gid_File_Extra_Templates_NONFREE_Misc_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfreemisc,filelist); End File gid_File_Extra_Templates_NONFREE_Officorr_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfreeofficorr,filelist); End File gid_File_Extra_Templates_NONFREE_Offimisc_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfreeoffimisc,filelist); End File gid_File_Extra_Templates_NONFREE_Personal_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesnonfreepersonal,filelist); End diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index b9490bd68ba7..f1cb3b43948f 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -28,14 +28,14 @@ End File gid_File_Extra_Autotextshare_Lang Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); EXTRA_ALL_LANG(autotextshare,filelist); End File gid_File_Extra_Autotextuser Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DOCLANG, DONT_OVERWRITE); + Styles = (FILELIST, WORKSTATION, DOCLANG); Name = "extras_autotextuser.filelist"; End @@ -53,7 +53,7 @@ End File gid_File_Extra_Cfgusr Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Styles = (FILELIST, WORKSTATION); Name = "extras_cfgusr.filelist"; End @@ -74,14 +74,14 @@ End File gid_File_Extra_Database Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Styles = (FILELIST, WORKSTATION); Name = "extras_database.filelist"; End File gid_File_Extra_Databasebiblio Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Styles = (FILELIST, WORKSTATION); Name = "extras_databasebiblio.filelist"; End @@ -112,7 +112,7 @@ End File gid_File_Extra_Fontunxpsprint Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE, CONFIGFILE); + Styles = (FILELIST, CONFIGFILE); Name = "psprint_config_fontunxpsprint.filelist"; End @@ -158,7 +158,7 @@ GALLERY_FILELIST(txtshapes) File gid_File_Extra_Gallmytheme Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Styles = (FILELIST, WORKSTATION); Name = "extras_gallmytheme.filelist"; End @@ -186,7 +186,7 @@ End File gid_File_Extra_Palettes Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Styles = (FILELIST, WORKSTATION); Name = "extras_palettes.filelist"; End @@ -207,7 +207,7 @@ End File gid_File_Extra_Tplwizdesktop Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "extras_tplwizdesktop.filelist"; End diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index ab2cfe4c2c7c..881a5efd85fe 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -97,21 +97,21 @@ End File gid_File_Basic_User Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Styles = (FILELIST, WORKSTATION); Name = "wizards_basicusr.filelist"; End File gid_File_Basic_Share Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Styles = (FILELIST, WORKSTATION); Name = "wizards_basicshare.filelist"; End File gid_File_Basic_User_Standard Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Styles = (FILELIST, WORKSTATION); Name = "wizards_basicsrvstandard.filelist"; End @@ -342,7 +342,7 @@ File gid_File_Jar_Unoil TXT_FILE_BODY; Name = "unoil.jar"; Dir = gid_Dir_Classes; - Styles = (PACKED,DONT_OVERWRITE); + Styles = (PACKED); End #endif @@ -400,7 +400,7 @@ End File gid_File_Share_Fingerprint Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (FILELIST, DONT_OVERWRITE); + Styles = (FILELIST); Name = "libexttextcat_fingerprint.filelist"; End |