move bundled binary OXT to new module external/misc_extensions

... and use ExtensionPackageSet to copy them to INSTDIR.

Change-Id: I3c77e986c308ffbabb5e55b93d3e04e6282bf4c9

2 files changed, 32 insertions, 137 deletions

diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 31f2e32985dd..92b0dcf9e1f6 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -33,17 +33,6 @@ End
 
 #endif
 
-/* ** Numbertext ** */
-
-#ifdef WITH_EXTENSION_NUMBERTEXT
-
-Directory gid_Brand_Dir_Share_Extensions_NumberText
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "numbertext";
-End
-
-#endif
-
 /* ** ConvertTextToNumber ** */
 
 #ifdef WITH_EXTENSION_CT2N
@@ -55,83 +44,6 @@ End
 
 #endif
 
-/* ** Hungarian Cross-reference Toolbar** */
-
-#ifdef WITH_EXTENSION_HUNART
-
-Directory gid_Brand_Dir_Share_Extensions_HunArt
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "hunart";
-End
-
-#endif
-
-/* ** Typography Toolbar** */
-
-#ifdef WITH_EXTENSION_TYPO
-
-Directory gid_Brand_Dir_Share_Extensions_Typo
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "typo";
-End
-
-#endif
-
-/* ** Watch Window ** */
-
-#ifdef WITH_EXTENSION_WATCH_WINDOW
-
-Directory gid_Brand_Dir_Share_Extensions_Watch_Window
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "WatchWindow";
-End
-
-#endif
-
-/* ** Diagram ** */
-
-#ifdef WITH_EXTENSION_DIAGRAM
-
-Directory gid_Brand_Dir_Share_Extensions_Diagram
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "Diagram";
-End
-
-#endif
-
-/* ** Validator ** */
-
-#ifdef WITH_EXTENSION_VALIDATOR
-
-Directory gid_Brand_Dir_Share_Extensions_Validator
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "Validator";
-End
-
-#endif
-
-/* ** Barcode ** */
-
-#ifdef WITH_EXTENSION_BARCODE
-
-Directory gid_Brand_Dir_Share_Extensions_Barcode
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "Barcode";
-End
-
-#endif
-
-/* ** Google Docs ** */
-
-#ifdef WITH_EXTENSION_GOOGLE_DOCS
-
-Directory gid_Brand_Dir_Share_Extensions_Google_Docs
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "gdocs";
-End
-
-#endif
-
 /* ** NLPSolver ** */
 
 #ifdef WITH_EXTENSION_NLPSOLVER
@@ -154,21 +66,4 @@ End
 
 #endif
 
-/* ** Sun Template Pack ** */
-
-#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
-
-Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName (en-US) = "Sun_ODF_Template_Pack_en-US";
-    DosName (de) = "Sun_ODF_Template_Pack_de";
-    DosName (es) = "Sun_ODF_Template_Pack_es";
-    DosName (fr) = "Sun_ODF_Template_Pack_fr";
-    DosName (hu) = "Sun_ODF_Template_Pack_hu";
-    DosName (it) = "Sun_ODF_Template_Pack_it";
-    DosName = "Sun_ODF_Template_Pack";
-End
-
-#endif
-
 #endif
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index f76f25fe241e..09966f796aa9 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -41,9 +41,9 @@ End
 
 File gid_File_Oxt_NumberText
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_NumberText;
-    Name = "numbertext.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "numbertext.filelist";
 End
 
 #endif
@@ -67,9 +67,9 @@ End
 
 File gid_File_Oxt_HunArt
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_HunArt;
-    Name = "hunart.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "hunart.filelist";
 End
 
 #endif
@@ -80,9 +80,9 @@ End
 
 File gid_File_Oxt_Typo
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Typo;
-    Name = "typo.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "typo.filelist";
 End
 
 #endif
@@ -93,9 +93,9 @@ End
 
 File gid_File_Oxt_Watch_Window
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Watch_Window;
-    Name = "WatchWindow.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "WatchWindow.filelist";
 End
 
 #endif
@@ -106,9 +106,9 @@ End
 
 File gid_File_Oxt_Diagram
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Diagram;
-    Name = "SmART.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "SmART.filelist";
 End
 
 #endif
@@ -119,9 +119,9 @@ End
 
 File gid_File_Oxt_Validator
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Validator;
-    Name = "Validator.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "Validator.filelist";
 End
 
 #endif
@@ -132,9 +132,9 @@ End
 
 File gid_File_Oxt_Barcode
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Barcode;
-    Name = "Barcode.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "Barcode.filelist";
 End
 
 #endif
@@ -145,9 +145,9 @@ End
 
 File gid_File_Oxt_Google_Docs
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Google_Docs;
-    Name = "gdocs.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "gdocs.filelist";
 End
 
 #endif
@@ -197,14 +197,14 @@ End
 
 File gid_File_Optional_Extensions_Sun_Template_Pack
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack;
-    Name (en-US) = "Sun-ODF-Template-Pack-en-US.oxt";
-    Name (de) = "Sun-ODF-Template-Pack-de.oxt";
-    Name (it) = "Sun-ODF-Template-Pack-it.oxt";
-    Name (fr) = "Sun-ODF-Template-Pack-fr.oxt";
-    Name (es) = "Sun-ODF-Template-Pack-es.oxt";
-    Name (hu) = "Sun-ODF-Template-Pack-hu.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name (en-US) = "Sun_ODF_Template_Pack_en-US.filelist";
+    Name (de) = "Sun_ODF_Template_Pack_de.filelist";
+    Name (it) = "Sun_ODF_Template_Pack_it.filelist";
+    Name (fr) = "Sun_ODF_Template_Pack_fr.filelist";
+    Name (es) = "Sun_ODF_Template_Pack_es.filelist";
+    Name (hu) = "Sun_ODF_Template_Pack_hu.filelist";
 End
 
 #endif