[ooo-build-commit] .: 2 commits - configure.in patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Sat Aug 14 10:02:21 PDT 2010
configure.in | 2
patches/dev300/extensions_packinfo.diff | 17 -
patches/dev300/scp2_extensions.diff | 314 +++++++++++++++++++++++----
patches/dev300/scp2_makefile_extensions.diff | 6
4 files changed, 274 insertions(+), 65 deletions(-)
New commits:
commit 9f57f2af892a53853856ee994709e9fa5c0003d9
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Aug 14 18:59:24 2010 +0200
Update extension configuration
Update extension configuration to follow tha latest changes in
3.3.0 version. We are using own directories to every extension.
* patches/dev300/extensions_packinfo.diff:
* patches/dev300/scp2_extensions.diff:
* patches/dev300/scp2_makefile_extensions.diff:
diff --git a/patches/dev300/extensions_packinfo.diff b/patches/dev300/extensions_packinfo.diff
index ee1dec9..78843df 100644
--- a/patches/dev300/extensions_packinfo.diff
+++ b/patches/dev300/extensions_packinfo.diff
@@ -1,6 +1,6 @@
--- setup_native/source/packinfo/packinfo_extensions.txt 2008-06-06 22:36:48.000000000 +0200
+++ setup_native/source/packinfo/packinfo_extensions.txt 2010-03-08 20:27:56.000000000 +0100
-@@ -0,0 +1,273 @@
+@@ -0,0 +1,258 @@
+# Format:
+
+# Start
@@ -21,7 +21,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_MINIMIZER"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presentation-minimizer"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-presentation-minimizer"
@@ -37,7 +36,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_REPORTDESIGN"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-report-builder"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-report-builder"
@@ -53,7 +51,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_MEDIAWIKI"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-mediawiki-publisher"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-mediawiki-publisher"
@@ -69,7 +66,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_PRESENTER_SCREEN"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presenter-screen"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-presenter-screen"
@@ -85,7 +81,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_PDFIMPORT"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-pdf-import"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-pdf-import"
@@ -117,7 +112,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_NumberText"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-numbertext"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-numbertext"
@@ -133,7 +127,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_HunArt"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-hunart"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-hunart"
@@ -149,7 +142,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_Typo"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-typo"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-typo"
@@ -165,7 +157,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_CT2N"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-ct2n"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-ct2n"
@@ -181,7 +172,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_Watch_Window"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-watch-window"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-watch-window"
@@ -197,7 +187,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_Google_Docs"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-google-docs"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-google-docs"
@@ -213,7 +202,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_NLPSolver"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-nlpsolver"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-nlpsolver"
@@ -229,7 +217,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_LanguageTool"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-languagetool"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-languagetool"
@@ -245,7 +232,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_MySQLConnector"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-mysql-connector"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-mysql-connector"
@@ -261,7 +247,6 @@
+
+Start
+module = "gid_Module_Optional_Extensions_OOoBlogger"
-+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-oooblogger"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-oooblogger"
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index feed038..e2476ad 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -5,11 +5,11 @@
+*
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $RCSfile: file_accessories.scp,v $
++ * $RCSfile: file_extensions.scp,v $
+ *
-+ * $Revision: 1.0 $
++ * $Revision: 1.2 $
+ *
-+ * last change: $Author: KAMI $ $Date: 2006/07/02 14:50:39 $
++ * last change: $Author: KAMI $ $Date: 2010/08/010 23:58:39 $
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
@@ -46,8 +46,8 @@
+
+File gid_File_Oxt_Presentation_Minimizer
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer;
+ Name = "presentation-minimizer.oxt";
+End
+
@@ -59,8 +59,8 @@
+
+File gid_File_Oxt_Report_Builder
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_Report_Builder;
+ Name = "report-builder.oxt";
+End
+
@@ -72,8 +72,8 @@
+
+File gid_File_Oxt_MediaWiki
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_MediaWiki;
+ Name = "wiki-publisher.oxt";
+End
+
@@ -85,8 +85,8 @@
+
+File gid_File_Oxt_Presenter_Screen
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_Presenter_Screen;
+ Name = "presenter-screen.oxt";
+End
+
@@ -98,8 +98,8 @@
+
+File gid_File_Oxt_PDF_Import
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_PDF_Import;
+ Name = "pdfimport.oxt";
+End
+
@@ -125,8 +125,8 @@
+
+File gid_File_Oxt_NumberText
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_NumberText;
+ Name = "numbertext.oxt";
+End
+
@@ -137,10 +137,10 @@
+#ifdef WITH_EXTENSION_CT2N
+
+File gid_File_Oxt_CT2N
-+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
-+ Name = "ConvertTextToNumber-1.3.2.oxt";
++ TXT_FILE_BODY;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_CT2N;
++ Name = "ConvertTextToNumber-1.3.2.oxt";
+End
+
+#endif
@@ -151,8 +151,8 @@
+
+File gid_File_Oxt_HunArt
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_HunArt;
+ Name = "hunart.oxt";
+End
+
@@ -164,8 +164,8 @@
+
+File gid_File_Oxt_Typo
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_Typo;
+ Name = "typo.oxt";
+End
+
@@ -177,8 +177,8 @@
+
+File gid_File_Oxt_Watch_Window
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_Watch_Window;
+ Name = "WatchWindow.oxt";
+End
+
@@ -190,8 +190,8 @@
+
+File gid_File_Oxt_Google_Docs
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_Google_Docs;
+ Name = "gdocs.oxt";
+End
+
@@ -203,8 +203,8 @@
+
+File gid_File_Oxt_NLPSolver
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
+ Name = "NLPSolver.oxt";
+End
+
@@ -215,10 +215,10 @@
+#ifdef WITH_EXTENSION_LANGUAGETOOL
+
+File gid_File_Oxt_LanguageTool
-+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
-+ Name = "LanguageTool.oxt";
++ TXT_FILE_BODY;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_LanguageTool;
++ Name = "LanguageTool.oxt";
+End
+
+#endif
@@ -228,10 +228,10 @@
+#ifdef WITH_EXTENSION_MYSQLC
+
+File gid_File_Oxt_MySQLConnector
-+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
-+ Name = "mysql-connector-ooo.oxt";
++ TXT_FILE_BODY;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector;
++ Name = "mysql-connector-ooo.oxt";
+End
+
+#endif
@@ -242,8 +242,8 @@
+
+File gid_File_Oxt_OOoBlogger
+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Extensions_Install;
++ Styles = (PACKED, ARCHIVE);
++ Dir = gid_Brand_Dir_Share_Extensions_OOoBlogger;
+ Name = "oooblogger-0.1.oxt";
+End
+
@@ -267,18 +267,239 @@
+End
+
+#endif
+--- scp2/source/extensions/directory_extensions.scp.old 2009-10-27 15:31:48.000000000 +0100
++++ scp2/source/extensions/directory_extensions.scp 2009-10-27 15:36:41.000000000 +0100
+@@ -0,0 +1,218 @@
++/*************************************************************************
++*
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: directory_extensions.scp,v $
++ *
++ * $Revision: 1.0 $
++ *
++ * last change: $Author: KAMI $ $Date: 2010/08/12 21:29:17 $
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library 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 for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++************************************************************************/
++
++#include "macros.inc"
++
++/* *** Additional Extensions *** */
++
++/* ** Presentation Minimizer ** */
++
++#ifndef WITHOUT_EXTENSION_MINIMIZER
++
++Directory gid_Brand_Dir_Share_Extensions_Presentation_Minimizer
++ ParentID = gid_Brand_Dir_Share_Extensions;
++ DosName = "presentation-minimizer";
++End
++
++#endif
++
++/* ** Report Builder ** */
++
++#ifndef WITHOUT_EXTENSION_REPORTDESIGN
++
++Directory gid_Brand_Dir_Share_Extensions_Report_Builder
++ ParentID = gid_Brand_Dir_Share_Extensions;
++ DosName = "report-builder";
++End
++
++#endif
++
++/* ** MediaWiki Publisher** */
++
++#ifndef WITHOUT_EXTENSION_MEDIAWIKI
++
++Directory gid_Brand_Dir_Share_Extensions_MediaWiki
++ ParentID = gid_Brand_Dir_Share_Extensions;
++ DosName = "wiki-publisher";
++End
++
++#endif
++
++/* ** Presenter Screen ** */
++
++#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
++
++Directory gid_Brand_Dir_Share_Extensions_Presenter_Screen
++ ParentID = gid_Brand_Dir_Share_Extensions;
++ DosName = "presenter-screen";
++End
++
++#endif
++
++/* ** PDF Import ** */
++
++#ifndef WITHOUT_EXTENSION_PDFIMPORT
++
++Directory gid_Brand_Dir_Share_Extensions_PDF_Import
++ ParentID = gid_Brand_Dir_Share_Extensions;
++ DosName = "pdfimport";
++End
++
++#endif
++
++/* ** Lightproof ** */
++
++#ifdef WITH_EXTENSION_LIGHTPROOF
++
++
++#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
++
++Directory gid_Brand_Dir_Share_Extensions_CT2N
++ ParentID = gid_Brand_Dir_Share_Extensions;
++ DosName = "ConvertTextToNumber-1.3.2";
++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
++
++/* ** 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
++
++Directory gid_Brand_Dir_Share_Extensions_NLPSolver
++ ParentID = gid_Brand_Dir_Share_Extensions;
++ DosName = "NLPSolver";
++End
++
++#endif
++
++/* ** LanguageTool ** */
++
++#ifdef WITH_EXTENSION_LANGUAGETOOL
++
++Directory gid_Brand_Dir_Share_Extensions_LanguageTool
++ ParentID = gid_Brand_Dir_Share_Extensions;
++ DosName = "LanguageTool";
++End
++
++#endif
++
++/* ** MySQL Connector ** */
++
++#ifdef WITH_EXTENSION_MYSQLC
++
++Directory gid_Brand_Dir_Share_Extensions_MySQLConnector
++ ParentID = gid_Brand_Dir_Share_Extensions;
++ DosName = "mysql-connector-ooo";
++End
++
++#endif
++
++/* ** oooblogger ** */
++
++#ifdef WITH_EXTENSION_OOOBLOGGER
++
++Directory gid_Brand_Dir_Share_Extensions_OOoBlogger
++ ParentID = gid_Brand_Dir_Share_Extensions;
++ DosName = "oooblogger-0.1";
++End
++
++#endif
++
++
++/* ** Sun Template Pack ** */
++
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
++
++
++#endif
--- scp2/source/extensions/makefile.mk.old 2009-10-27 15:31:48.000000000 +0100
+++ scp2/source/extensions/makefile.mk 2009-10-27 15:31:48.000000000 +0100
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
-+# $Revision: 1.0 $
++# $Revision: 1.1 $
+#
-+# last change: $Author: KAMI $ $Date: 2008/03/19 14:50:39 $
++# last change: $Author: KAMI $ $Date: 2010/08/12 22:05:54 $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
@@ -319,14 +540,15 @@
+
+SCP_PRODUCT_TYPE=osl
+PARFILES= \
-+ module_extensions.par \
-+ module_extensions_sun_templates.par \
++ module_extensions.par \
++ module_extensions_sun_templates.par \
+ module_extensions_lightproof.par \
++ directory_extensions.par \
+ file_extensions.par
+
+ULFFILES= \
-+ module_extensions.ulf \
-+ module_extensions_sun_templates.ulf \
++ module_extensions.ulf \
++ module_extensions_sun_templates.ulf \
+ module_extensions_lightproof.ulf
+
+# --- File ---------------------------------------------------------
diff --git a/patches/dev300/scp2_makefile_extensions.diff b/patches/dev300/scp2_makefile_extensions.diff
index 6146239..1a3812b 100644
--- a/patches/dev300/scp2_makefile_extensions.diff
+++ b/patches/dev300/scp2_makefile_extensions.diff
@@ -1,23 +1,25 @@
--- scp2/util/makefile.mk.orig 2008-03-19 07:37:00.000000000 +0100
+++ scp2/util/makefile.mk 2008-03-19 10:24:18.000000000 +0100
-@@ -81,6 +81,10 @@
+@@ -81,6 +81,11 @@
module_systemint.par \
module_graphicfilter.par \
file_graphicfilter.par \
+ module_extensions.par \
+ module_extensions_sun_templates.par \
+ module_extensions_lightproof.par \
++ directory_extensions.par \
+ file_extensions.par \
module_testtool.par \
file_testtool.par \
module_xsltfilter.par \
-@@ -222,6 +224,10 @@
+@@ -222,6 +224,11 @@
module_systemint.par \
module_graphicfilter.par \
file_graphicfilter.par \
+ module_extensions.par \
+ module_extensions_sun_templates.par \
+ module_extensions_lightproof.par \
++ directory_extensions.par \
+ file_extensions.par \
module_testtool.par \
file_testtool.par \
commit cc817ea5ef5f2b3117c66c88fd92d50645c642fd
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Aug 14 18:54:46 2010 +0200
Update extension aids version to 20100813
* configure.in:
diff --git a/configure.in b/configure.in
index 1a6a4c8..68c9521 100644
--- a/configure.in
+++ b/configure.in
@@ -900,7 +900,7 @@ AC_SUBST(CAIRO_CONFIGURE_FLAG)
PREBUILT_WRITINGAIDS_TIMESTAMP=20091204
AC_SUBST(PREBUILT_WRITINGAIDS_TIMESTAMP)
-PREBUILT_EXTENSIONAIDS_TIMESTAMP=20100612
+PREBUILT_EXTENSIONAIDS_TIMESTAMP=20100813
AC_SUBST(PREBUILT_EXTENSIONAIDS_TIMESTAMP)
BUILD_MOZILLA_SOURCE='seamonkey-1.1.14.source.tar.gz'
More information about the ooo-build-commit
mailing list