ooo-build r14074 - in branches/ooo-build-3-0: . patches/dev300

[szalaik svn gnome org]

Author: szalaik
Date: Thu Sep 25 09:28:16 2008
New Revision: 14074
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14074&view=rev

Log:
2008-09-25  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/extensions_configure.diff
	* patches/dev300/scp2_extensions.diff:
	Extension integration work, introduce 
--with-extension-integration
	switch. Small fixes.
	


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/extensions_configure.diff
   branches/ooo-build-3-0/patches/dev300/scp2_extensions.diff

Modified: branches/ooo-build-3-0/patches/dev300/extensions_configure.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/extensions_configure.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/extensions_configure.diff	Thu Sep 25 09:28:16 2008
@@ -5,10 +5,10 @@
                            version, use this option.
  ],,enable_mozilla="yes")
 +
-+AC_ARG_WITH(sun-templates,
++AC_ARG_WITH(extension-integration,
 +[
-+  --with-sun-templates      Provides automatic download and integration of SUN
-+			  Microsystems' template packages relesead to Extensions site.],
++  --with-extension integration      It will integrate the builded extensions
++			  to the installer of the product.],
 +,)
 +
  AC_ARG_WITH(fonts,
@@ -59,10 +59,24 @@
    SYSTEM_JFREEREPORT=NO
  fi
  AC_SUBST(ENABLE_REPORTBUILDER)
-@@ -6055,6 +6068,38 @@
+@@ -6055,6 +6068,53 @@
  fi
  
  dnl ===================================================================
++dnl Test whether to integrate extensions into the product's installer
++dnl ===================================================================
++AC_MSG_CHECKING([for Sun Professinal Template Pack intergration (only supported languages displayed)])
++if test "z$with_extension_integration" = "z" -o "z$ith_extension_integration" = "zno" ; then
++  WITH_EXTENSION_INTEGRATION=NO
++  AC_MSG_RESULT([no integration])
++else
++  WITH_EXTENSION_INTEGRATION=YES
++  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_INTEGRATION"
++  AC_MSG_RESULT([integration])
++fi
++AC_SUBST(WITH_EXTENSION_INTEGRATION)
++
++dnl ===================================================================
 +dnl Test whether to include Sun Professinal Template Pack
 +dnl ===================================================================
 +AC_MSG_CHECKING([for Sun Professinal Template Pack intergration (only supported languages displayed)])
@@ -87,7 +101,8 @@
 +    for lang in $wanted_sun_templates ; do
 +	if test -n "`echo $with_lang | grep "$lang"`" ; then
 +		SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
-+      SCPDEFS="$SCPDEFS -DWITH_WITH_EXTENSION_SUN_TEMPLATE_PACK_$lang"
++		fixed_lang=`echo $lang | sed -e s/-/_/g`
++       SCPDEFS="$SCPDEFS -DWITH_WITH_EXTENSION_SUN_TEMPLATE_PACK_$fixed_lang"
 +	fi
 +    done
 +    AC_MSG_RESULT([$SUNTEMPLATES_LANG])

Modified: branches/ooo-build-3-0/patches/dev300/scp2_extensions.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/scp2_extensions.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/scp2_extensions.diff	Thu Sep 25 09:28:16 2008
@@ -108,7 +108,7 @@
 +
 +/* ** Sun Template Pack (en-US) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_en-US
++#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_en_US
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_en-US
 +    TXT_FILE_BODY;
@@ -235,7 +235,7 @@
 diff -Naur scp2/source/extensions/module_extensions.scp scp2/source/extensions/module_extensions.scp
 --- scp2/source/extensions/module_extensions.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/module_extensions.scp	2008-03-29 07:50:23.000000000 +0100
-@@ -0,0 +1,196 @@
+@@ -0,0 +1,206 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -285,6 +285,7 @@
 +/* ** SUN Presentation Minimizer ** */
 +
 +#ifndef WITHOUT_EXTENSION_MINIMIZER
++#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_MINIMIZER
 +    PackageInfo = "packinfo_office.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MINIMIZER);
@@ -296,10 +297,12 @@
 +    Styles = ( );
 +End
 +#endif
++#endif
 +
 +/* ** SUN Report Builder ** */
 +
 +#ifndef WITHOUT_EXTENSION_REPORTDESIGN
++#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_REPORTDESIGN
 +    PackageInfo = "packinfo_office.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
@@ -311,10 +314,12 @@
 +    Styles = ( );
 +End
 +#endif
++#endif
 +
 +/* ** SUN MediaWiki Publisher** */
 +
 +#ifndef WITHOUT_EXTENSION_MEDIAWIKI
++#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_MEDIAWIKI
 +    PackageInfo = "packinfo_office.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI);
@@ -326,10 +331,12 @@
 +    Styles = ( );
 +End
 +#endif
++#endif
 +					
 +/* ** SUN Report Builder ** */
 +
 +#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
++#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_PRESENTER_SCREEN
 +    PackageInfo = "packinfo_office.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN);
@@ -341,10 +348,12 @@
 +    Styles = ( );
 +End
 +#endif
++#endif
 +										
 +/* ** SUN PDF Import ** */
 +
 +#ifndef WITHOUT_EXTENSION_PDFIMPORT
++#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_PDFIMPORT
 +    PackageInfo = "packinfo_office.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT);
@@ -356,10 +365,11 @@
 +    Styles = ( );
 +End
 +#endif
++#endif
 +
 +/* ** SUN Template Pack (en-US)** */
 +
-+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en-US
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_en-US
 +    PackageInfo = "packinfo_office.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US);