ooo-build r13606 - in trunk: . patches/dev300
- From: szalaik svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13606 - in trunk: . patches/dev300
- Date: Sun, 17 Aug 2008 15:12:56 +0000 (UTC)
Author: szalaik
Date: Sun Aug 17 15:12:56 2008
New Revision: 13606
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13606&view=rev
Log:
2008-08-16 Kalman Szalai - KAMI <kamihir freemail hu>
* patches/dev300/premium-splitted-language-packages.diff:
Fix for samples directory in three layer installer.
* patches/dev300/extensions_packinfo.diff:
Extension packinfo update.
* patches/dev300/scp2_accessories.diff
* patches/dev300/scp2_build_accessories.diff:
Fix issues with directories in three layer installer.
* patches/dev300/apply:
Using extension based language tools instead of using prebuilt
writingaids for OxygenOffice.
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/extensions_packinfo.diff
trunk/patches/dev300/premium-splitted-language-packages.diff
trunk/patches/dev300/scp2_accessories.diff
trunk/patches/dev300/scp2_build_accessories.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Sun Aug 17 15:12:56 2008
@@ -2270,9 +2270,6 @@
ooowikipedia_genericcommands.diff
ooowikipedia_writer.diff
ooowikipedia_toolbars.diff
-# Using prebuilt Writing Aids for all platforms in OxygenOffice Professional
-win32-prebuilt-writingaids-zip.diff
-win32-prebuilt-writingaids-zip-scp2.diff
[ Win32Only ]
mozilla-source-1.7.5.patch.diff, i#84961, tml
Modified: trunk/patches/dev300/extensions_packinfo.diff
==============================================================================
--- trunk/patches/dev300/extensions_packinfo.diff (original)
+++ trunk/patches/dev300/extensions_packinfo.diff Sun Aug 17 15:12:56 2008
@@ -1,40 +1,38 @@
--- setup_native/source/packinfo/packinfo_office.txt.orig 2008-01-14 20:09:47.000000000 +0100
+++ setup_native/source/packinfo/packinfo_office.txt 2008-03-29 11:00:24.000000000 +0100
-@@ -63,6 +63,40 @@
+@@ -63,6 +63,39 @@
End
Start
+module = "gid_Module_Optional_Extensions_SDEXT"
+script = "shellscripts_extensions.txt"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extension-presentation-minimizer"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
++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 = "%UNIXPRODUCTNAME-extension-presentation-minimizer"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extension-presentation-minimizer"
-+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
+copyright = "1999-2008 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "OpenOffice.org"
+description = "Presentation Minimizer extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+packageversion = "%OOOPACKAGEVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
+End
+
+Start
+module = "gid_Module_Optional_Extensions_REPORTDESIGN"
+script = "shellscripts_extensions.txt"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extension-report-builder"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
-+packagename = "%UNIXPRODUCTNAME-extension-report-builder"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extension-report-builder"
-+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
++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%WITHOUTDOTOOOBASEVERSION-extension-report-builder"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
+copyright = "1999-2008 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "OpenOffice.org"
+description = "Report Builder extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+packageversion = "%OOOPACKAGEVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
+End
+
+Start
Modified: trunk/patches/dev300/premium-splitted-language-packages.diff
==============================================================================
--- trunk/patches/dev300/premium-splitted-language-packages.diff (original)
+++ trunk/patches/dev300/premium-splitted-language-packages.diff Sun Aug 17 15:12:56 2008
@@ -54,7 +54,7 @@
+solariscopyright = "solariscopyrightfile"
+vendor = "%PRODUCTNAME"
+description = "Extra documentations for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
+
Modified: trunk/patches/dev300/scp2_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_accessories.diff (original)
+++ trunk/patches/dev300/scp2_accessories.diff Sun Aug 17 15:12:56 2008
@@ -1030,21 +1030,21 @@
+ Dir = gid_Dir_Samples_Language;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamples);
++ DIR_IDENT_ALL_LANG(kamisamples);
+End
+
+File gid_File_Extra_Samples_Documentations_KAMI
+ Dir = gid_Dir_Samples_Documentations;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamplesdocumentation);
++ DIR_IDENT_ALL_LANG(kamisamplesdocumentation);
+End
+
+File gid_File_Extra_Samples_Advertisement_KAMI
+ Dir = gid_Dir_Samples_Advertisement;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamplesadvertisement);
++ DIR_IDENT_ALL_LANG(kamisamplesadvertisement);
+End
+
+/* ** Samples - NON FREE** */
@@ -1053,21 +1053,21 @@
+ Dir = gid_Dir_Samples_Language;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamplesnonfree);
++ DIR_IDENT_ALL_LANG(kamisamplesnonfree);
+End
+
+File gid_File_Extra_Samples_NONFREE_Documentations_KAMI
+ Dir = gid_Dir_Samples_Documentations;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamplesnonfreedocumentation);
++ DIR_IDENT_ALL_LANG(kamisamplesnonfreedocumentation);
+End
+
+File gid_File_Extra_Samples_NONFREE_Advertisement_KAMI
+ Dir = gid_Dir_Samples_Advertisement;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamisamplesnonfreeadvertisement);
++ DIR_IDENT_ALL_LANG(kamisamplesnonfreeadvertisement);
+End
+
+#endif
@@ -1122,77 +1122,77 @@
+ Dir = gid_Dir_Template_Language;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplates);
++ DIR_IDENT_ALL_LANG(kamitemplates);
+End
+
+File gid_File_Extra_Templates_Layout_KAMI
+ Dir = gid_Dir_Template_Layout;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplateslayout);
++ DIR_IDENT_ALL_LANG(kamitemplateslayout);
+End
+
+File gid_File_Extra_Templates_Present_KAMI
+ Dir = gid_Dir_Template_Presnt;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatespresent);
++ DIR_IDENT_ALL_LANG(kamitemplatespresent);
+End
+
+File gid_File_Extra_Templates_Educate_KAMI
+ Dir = gid_Dir_Template_Educate;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplateseducate);
++ DIR_IDENT_ALL_LANG(kamitemplateseducate);
+End
+
+File gid_File_Extra_Templates_Finance_KAMI
+ Dir = gid_Dir_Template_Finance;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesfinance);
++ DIR_IDENT_ALL_LANG(kamitemplatesfinance);
+End
+
+File gid_File_Extra_Templates_Forms_KAMI
+ Dir = gid_Dir_Template_Forms;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesforms);
++ DIR_IDENT_ALL_LANG(kamitemplatesforms);
+End
+
+File gid_File_Extra_Templates_Labels_KAMI
+ Dir = gid_Dir_Template_Labels;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplateslabels);
++ DIR_IDENT_ALL_LANG(kamitemplateslabels);
+End
+
+File gid_File_Extra_Templates_Misc_KAMI
+ Dir = gid_Dir_Template_Misc;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesmisc);
++ DIR_IDENT_ALL_LANG(kamitemplatesmisc);
+End
+
+File gid_File_Extra_Templates_Officorr_KAMI
+ Dir = gid_Dir_Template_Officorr;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesofficorr);
++ DIR_IDENT_ALL_LANG(kamitemplatesofficorr);
+End
+
+File gid_File_Extra_Templates_Offimisc_KAMI
+ Dir = gid_Dir_Template_Offimisc;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesoffimisc);
++ DIR_IDENT_ALL_LANG(kamitemplatesoffimisc);
+End
+
+File gid_File_Extra_Templates_Personal_KAMI
+ Dir = gid_Dir_Template_Personal;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatespersonal);
++ DIR_IDENT_ALL_LANG(kamitemplatespersonal);
+End
+
+/* ** Templates - Common ** */
@@ -1280,77 +1280,77 @@
+ Dir = gid_Dir_Template_Language;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfree);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfree);
+End
+
+File gid_File_Extra_Templates_NONFREE_Layout_KAMI
+ Dir = gid_Dir_Template_Layout;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreelayout);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfreelayout);
+End
+
+File gid_File_Extra_Templates_NONFREE_Present_KAMI
+ Dir = gid_Dir_Template_Presnt;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreepresent);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfreepresent);
+End
+
+File gid_File_Extra_Templates_NONFREE_Educate_KAMI
+ Dir = gid_Dir_Template_Educate;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreeeducate);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfreeeducate);
+End
+
+File gid_File_Extra_Templates_NONFREE_Finance_KAMI
+ Dir = gid_Dir_Template_Finance;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreefinance);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfreefinance);
+End
+
+File gid_File_Extra_Templates_NONFREE_Forms_KAMI
+ Dir = gid_Dir_Template_Forms;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreeforms);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfreeforms);
+End
+
+File gid_File_Extra_Templates_NONFREE_Labels_KAMI
+ Dir = gid_Dir_Template_Labels;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreelabels);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfreelabels);
+End
+
+File gid_File_Extra_Templates_NONFREE_Misc_KAMI
+ Dir = gid_Dir_Template_Misc;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreemisc);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfreemisc);
+End
+
+File gid_File_Extra_Templates_NONFREE_Officorr_KAMI
+ Dir = gid_Dir_Template_Officorr;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreeofficorr);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfreeofficorr);
+End
+
+File gid_File_Extra_Templates_NONFREE_Offimisc_KAMI
+ Dir = gid_Dir_Template_Offimisc;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreeoffimisc);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfreeoffimisc);
+End
+
+File gid_File_Extra_Templates_NONFREE_Personal_KAMI
+ Dir = gid_Dir_Template_Personal;
+ TXT_FILE_BODY;
+ Styles = (ARCHIVE, DONT_OVERWRITE);
-+ EXTRA_ALL_LANG(kamitemplatesnonfreepersonal);
++ DIR_IDENT_ALL_LANG(kamitemplatesnonfreepersonal);
+End
+
+#endif
Modified: trunk/patches/dev300/scp2_build_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_build_accessories.diff (original)
+++ trunk/patches/dev300/scp2_build_accessories.diff Sun Aug 17 15:12:56 2008
@@ -4,7 +4,7 @@
cp scp2\source\xsltfilter nmake - all cp_xsltfilter cp_langmacros cp_langtemplates NULL
cp scp2\source\winexplorerext nmake - all cp_winexplorerext cp_langmacros cp_langtemplates NULL
cp scp2\source\onlineupdate nmake - all cp_update cp_langmacros cp_langtemplates NULL
--cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+-cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+cp scp2\source\accessories nmake - all cp_accessories cp_langmacros NULL
-+cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
++cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]