GNOME.org
 

ooo-build r12732 - in trunk: . bin desktop

Author: pmladek
Date: Fri May 30 19:40:12 2008
New Revision: 12732
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12732&view=rev

Log:
2008-05-30  Petr Mladek  <pmladek suse cz>

	* configure.in, bin/setup.in, bin/package-ooo, desktop/Makefile.am:
	* desktop/calc.desktop.in.in, desktop/writer.desktop.in.in:
	* desktop/impress.desktop.in.in, bin/generate-bash-completion:
	  bin the obsolete --enable-openxml option; always add the MIME
	  types and file suffixes now



Modified:
   trunk/ChangeLog
   trunk/bin/generate-bash-completion
   trunk/bin/package-ooo
   trunk/bin/setup.in
   trunk/configure.in
   trunk/desktop/Makefile.am
   trunk/desktop/calc.desktop.in.in
   trunk/desktop/impress.desktop.in.in
   trunk/desktop/writer.desktop.in.in

Modified: trunk/bin/generate-bash-completion
==============================================================================
--- trunk/bin/generate-bash-completion	(original)
+++ trunk/bin/generate-bash-completion	Fri May 30 19:40:12 2008
@@ -14,16 +14,19 @@
 	   "tiff", "xbm", "xpm", "odg", "otg", "fodg", "odc", "odi", "sds", "wpg");
 
 my @IMPRESSDOCS=("sxi", "sti", "ppt", "pps", "pot", "sxd", "sda", "sdd", "sdp",
-	      "vor", "cgm", "odp", "otp", "fodp");
+	      "vor", "cgm", "odp", "otp", "fodp", "ppsm", "ppsx", "pptm", "pptx",
+	      "potm", "potx");
 
-my @TEMPLATES=("stw", "dot", "vor", "stc", "xlt", "sti", "pot", "std", "stw");
+my @TEMPLATES=("stw", "dot", "vor", "stc", "xlt", "sti", "pot", "std", "stw",
+	      "dotm", "dotx", "potm", "potx", "xltm", "xltx");
 
 my @MATHDOCS=("sxm", "smf", "mml", "odf");
 
 my @MASTERDOCS=("sxg", "odm", "sgl");
 
 my @WRITERDOCS=("doc", "dot", "rtf", "sxw", "stw", "sdw", "vor", "txt", "htm?",
-	     "xml", "wp", "wpd", "wps", "odt", "ott", "fodt");
+	     "xml", "wp", "wpd", "wps", "odt", "ott", "fodt", "docm", "docx",
+	     "dotm", "dotx");
 
 my @WEBDOCS=("htm", "html", "stw", "txt", "vor", "oth");
 
@@ -31,7 +34,7 @@
 
 my @CALCDOCS=("sxc", "stc", "dif", "dbf", "xls", "xlw", "xlt", "rtf", "sdc", "vor",
 	   "slk", "txt", "htm", "html", "wk1", "wks", "123", "xml", "ods", "ots",
-	   "fods", "csv");
+	   "fods", "csv", "xlsb", "xlsm", "xlsx", "xltm", "xltx");
 
 my @EXTENSIONS=("oxt");
 
@@ -57,7 +60,6 @@
 
     print "Usage: $0 --help\n";
     print "       $0 [--binsuffix=suffix]\n";
-    print "\t\t[--enable-openxml]\n";
     print "\t\t[--office=wrapper_name]\n";
     print "\t\t[--master=wrapper_name]\n";
     print "\t\t[--base=wrapper_name]\n";
@@ -75,7 +77,6 @@
     print "Options:\n";
     print "\t--help\t\tprint this help\n";
     print "\t--binsuffix\tdefines a suffix that is added after each wrapper\n";
-    print "\t--enable-openxml add the supported open XML file format suffixes\n\n";
 
     print "The other options allows to redefine the wrapper names.\n";
     print "The value \"\" can be used to disable any wrapper.\n\n";
@@ -84,7 +85,6 @@
 my $infilename;
 my $outfilename;
 my $binsuffix = '';
-my $openxml;
 
 my $opt;
 foreach my $arg (@ARGV) {
@@ -93,8 +93,6 @@
 		exit 0;
 	} elsif ( $arg =~ /--binsuffix=(.*)/ ) {
 		$binsuffix = "$1";
-	} elsif ( $arg =~ /--enable-openxml/ ) {
-		$openxml = 1;
 	} elsif ( $arg =~ /--office=(.*)/ ) {
 		$APPS{'office'} = "$1";
 	} elsif ( $arg =~ /--master=(.*)/ ) {
@@ -147,14 +145,6 @@
     $APPS{$app} .= "$binsuffix" unless ( "$APPS{$app}" eq "" );
 }
 
-# add the supported open XML file format suffixes
-if ($openxml) {
-    push @IMPRESSDOCS, "ppsm" , "ppsx" , "pptm" , "pptx", "potm" , "potx";
-    push @TEMPLATES, "dotm" , "dotx" , "potm" , "potx" , "xltm" , "xltx";
-    push @WRITERDOCS, "docm" , "docx" , "dotm" , "dotx";
-    push @CALCDOCS, "xlsb" , "xlsm" , "xlsx", "xltm" , "xltx";
-}
-
 sub print_suffixes_check {
     my $app = shift(@_);
     my $first_suffix = shift(@_);

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Fri May 30 19:40:12 2008
@@ -93,11 +93,7 @@
 
 # create bash completion
 mkdir -p $OODESTDIR/etc/bash_completion.d
-gen_bash_comp_opts=--binsuffix="$BINSUFFIX"
-if test "z$ENABLE_OPENXML" = "zyes" ; then
-    gen_bash_comp_opts="$gen_bash_comp_opts --enable-openxml"
-fi
-$TOOLSDIR/bin/generate-bash-completion $gen_bash_comp_opts $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
 
 if test "z$VENDORNAME" != "zRedHat"; then
 	mkdir -p $MANDIR/man1

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Fri May 30 19:40:12 2008
@@ -30,7 +30,6 @@
 SPLIT_APP_MODULES='@SPLIT_APP_MODULES@'
 SPLIT_OPT_FEATURES='@SPLIT_OPT_FEATURES@'
 RUN_POST_INSTALL_SCRIPTS='@RUN_POST_INSTALL_SCRIPTS@'
-ENABLE_OPENXML='@ENABLE_OPENXML@'
 TOOLSDIR='@TOOLSDIR@'
 ENABLE_ODK='@ENABLE_ODK@'
 USE_PREBUILD_UNOWINREG_DLL='@USE_PREBUILD_UNOWINREG_DLL@'

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri May 30 19:40:12 2008
@@ -251,13 +251,6 @@
 			  the package after it is installed.],
 ,)
 
-AC_ARG_ENABLE(openxml,
-[
-  --enable-openxml
-			  Enable support for open XML file formats, such as
-			  bash completion, MIME type detection],
-,)
-
 AC_ARG_WITH(arch,
 [
   --with-arch             Define the architecture that we will target.
@@ -757,22 +750,6 @@
 fi
 AC_SUBST(OOO_STRIP)
 
-ENABLE_OPENXML="no"
-ADD_OPENXML_PRESENTATION_MIME=
-ADD_OPENXML_SPREADSHEET_MIME=
-ADD_OPENXML_WORD_MIME=
-if test "$enable_openxml" = "yes"; then
-    ENABLE_OPENXML="yes"
-    ADD_OPENXML_PRESENTATION_MIME=\;application/vnd.ms-powerpoint.slideshow.macroEnabled.12\;application/vnd.openxmlformats-officedocument.presentationml.slideshow\;application/vnd.ms-powerpoint.presentation.macroEnabled.12\;application/vnd.openxmlformats-officedocument.presentationml.presentation\;application/vnd.ms-powerpoint.template.macroEnabled.12\;application/vnd.openxmlformats-officedocument.presentationml.template
-    ADD_OPENXML_SPREADSHEET_MIME=\;application/vnd.ms-excel.sheet.binary.macroEnabled.12\;application/vnd.ms-excel.sheet.macroEnabled.12\;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\;application/vnd.ms-excel.template.macroEnabled.12\;application/vnd.openxmlformats-officedocument.spreadsheetml.template
-    ADD_OPENXML_WORD_MIME='\;application/vnd.ms-word.document.macroEnabled.12\;application/vnd.openxmlformats-officedocument.wordprocessingml.document\;application/vnd.ms-word.template.macroEnabled.12\;application/vnd.openxmlformats-officedocument.wordprocessingml.template'
-fi
-AC_SUBST(ENABLE_OPENXML)
-AC_SUBST(ADD_OPENXML_PRESENTATION_MIME)
-AC_SUBST(ADD_OPENXML_SPREADSHEET_MIME)
-AC_SUBST(ADD_OPENXML_WORD_MIME)
-
-
 ARCHITECTURE="unxlngi4"
 if test "z$with_arch" != "z"; then
     if test "z$with_arch" = "zppc"; then

Modified: trunk/desktop/Makefile.am
==============================================================================
--- trunk/desktop/Makefile.am	(original)
+++ trunk/desktop/Makefile.am	Fri May 30 19:40:12 2008
@@ -18,11 +18,7 @@
 	$(top_builddir)/intltool-merge $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 %: %.in
-	sed -e "s|\ OOO_BINSUFFIX\@|@OOO_BINSUFFIX@|" \
-	    -e "s|\ STARTUPNOTIFY\@|@STARTUPNOTIFY@|" \
-	    -e "s|\ ADD_OPENXML_PRESENTATION_MIME\@|@ADD_OPENXML_PRESENTATION_MIME@|" \
-	    -e "s|\ ADD_OPENXML_SPREADSHEET_MIME\@|@ADD_OPENXML_SPREADSHEET_MIME@|" \
-	    -e "s|\ ADD_OPENXML_WORD_MIME\@|@ADD_OPENXML_WORD_MIME@|" $< > $@
+	sed -e "s|\ OOO_BINSUFFIX\@|@OOO_BINSUFFIX@|" $< > $@
 
 EXTRA_DIST=$(desktop_in_files) \
 	$(old_gnome_files) \

Modified: trunk/desktop/calc.desktop.in.in
==============================================================================
--- trunk/desktop/calc.desktop.in.in	(original)
+++ trunk/desktop/calc.desktop.in.in	Fri May 30 19:40:12 2008
@@ -8,7 +8,7 @@
 InitialPreference=6
 Categories=Office;Spreadsheet;
 StartupNotify=false
-MimeType=application/msexcel;application/vnd.lotus-1-2-3;application/vnd.ms-excel;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-dbase;application/x-dbf;application/x-quattropro;text/csv;text/spreadsheet;text/x-csv ADD_OPENXML_SPREADSHEET_MIME@;
+MimeType=application/msexcel;application/vnd.lotus-1-2-3;application/vnd.ms-excel;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-dbase;application/x-dbf;application/x-quattropro;text/csv;text/spreadsheet;text/x-csv;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;
 _Name=OpenOffice.org Calc
 _GenericName=Spreadsheet
 _Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.

Modified: trunk/desktop/impress.desktop.in.in
==============================================================================
--- trunk/desktop/impress.desktop.in.in	(original)
+++ trunk/desktop/impress.desktop.in.in	Fri May 30 19:40:12 2008
@@ -7,7 +7,7 @@
 Type=Application
 Categories=Office;Presentation;
 StartupNotify=false
-MimeType=application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.stardivision.impress;application/vnd.sun.xml.impress;application/vnd sun xml impress template ADD_OPENXML_PRESENTATION_MIME@;
+MimeType=application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.stardivision.impress;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;
 InitialPreference=5
 _Name=OpenOffice.org Impress
 _GenericName=Presentation

Modified: trunk/desktop/writer.desktop.in.in
==============================================================================
--- trunk/desktop/writer.desktop.in.in	(original)
+++ trunk/desktop/writer.desktop.in.in	Fri May 30 19:40:12 2008
@@ -7,7 +7,7 @@
 Type=Application
 Categories=Office;WordProcessor;
 StartupNotify=false
-MimeType=application/msword;application/rtf;application/vnd.ms-works;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.stardivision.writer-global;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.wordperfect;application/wordperfect;application/x-extension-txt;application/x-t602;text/plain;text/rtf ADD_OPENXML_WORD_MIME@;
+MimeType=application/msword;application/rtf;application/vnd.ms-works;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.stardivision.writer-global;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.wordperfect;application/wordperfect;application/x-extension-txt;application/x-t602;text/plain;text/rtf;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;
 InitialPreference=5
 _Name=OpenOffice.org Writer
 _GenericName=Word Processor
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]