GNOME.org
 

ooo-build r13000 - in trunk: . bin patches/dev300 src

Author: pmladek
Date: Mon Jun 30 19:20:39 2008
New Revision: 13000
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13000&view=rev

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

	* bin/package-ooo: remove duplicities from the SDK file list;
	  add also the OOINSTBASE to the lang packs (not only the basis
	  subdirectory)

	* patches/dev300/solenv-installer-lang-filelist-names.diff:
	* patches/dev300/apply: do not print twice the lang name in the
	  filelist; for example, generate gid_Module_Langpack_Basis_es
	  instead of gid_Module_Langpack_Basis_es.es

	* src/cli_cppuhelper.dll.config.in, src/cli_uno_bridge.dll.config.in:
	  FIXME: partly updated the dll.configs; I am not sure how libsal.so.3
	  and libuno_cppu.so.3 could get replaced and what chanes are needed
	  in the mono bridge itself; It will need to update the DllImport
	  calls and maybe more



Added:
   trunk/patches/dev300/solenv-installer-lang-filelist-names.diff
Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/bin/package-ooo
   trunk/patches/dev300/apply
   trunk/src/cli_cppuhelper.dll.config.in
   trunk/src/cli_uno_bridge.dll.config.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jun 30 19:20:39 2008
@@ -1,3 +1,42 @@
+ooo-build-2.99.21:
+
+    + features:
+	+ support dev300-m21 [Kendy, Rene, Tor, others]
+	+ CJK character units back again [Amelia]
+    + fixes:
+	+ lots improvements in the SVG import filter [Thorsten, Fridrich]
+	+ lots fixes in the data pilot (i#83250, i#88473, i#88531) [Kohei]
+	+ lots improvements of the layout stuff [Jan]
+	+ "Animate attached Shape" checkbox (bnc#380036, i#69364) [Thorsten]
+	+ FREQUENCY function regression (i#88477) [Kohei]
+	+ better support for various formula syntax [Kohei]
+	+ escher export and linked graphics [Thorsten]
+	+ better highlighting of current row [Kohei]
+	+ printing crash (i#88818) [Thorsten]
+	+ opening a tab delimited CSV file (n#376473) [Kohei]
+	+ no source border when doing cut [n#367489] [Jon]
+	+ undefined behavior of SbUnoObject (i#88930) [Julian, Kohei]
+    + VBA bits:
+	+ more on user forms and even handling [Noel, Jiao]
+	+ crasher caused by the 3 layer system [Noel]
+	+ hyperlink service and interface [Fong]
+	+ brackets and array syntax handling [Noel]
+	+ workbook/worksheet events and event handle class [Fong]
+	+ non-working mediawiki extension [Noel]
+    + Win32 bits:
+	+ localize.pl and Cygwin pathnames [Tor]
+	+ disable cairo in the Win32 builds [Tor]
+	+ multi-lingual installer fixes (i#88638, i#88639) [Tor]
+	+ build with MSVS 2008 (MSVS9) [Tor]
+	+ lots warning during build [Tor]
+    + build bits:
+	+ build on s390 [Rene]
+	+ packaging of extensions that we build it [Rene]
+	+ variaous fixes [Michel, Rene, others]
+    + updated Debian, Novell, Ubuntu bits [Rene, Petr, Michel]
+    + experimental:
+	+ support for MSVS 2008 (MSVS9)
+
 ooo-build-2.4.0.7
 
     + features:

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Mon Jun 30 19:20:39 2008
@@ -131,12 +131,12 @@
 sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/install-dict.in >| "$OOBUILDDIR/install-dict" || exit 1;
 install_script $OOBUILDDIR/install-dict $OOINSTDIR/install-dict
 
-echo "Building $OOINSTDIR/program/java-set-classpath";
+echo "Building $OOINSTDIR/basis$VERSION/program/java-set-classpath";
 sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/java-set-classpath.in >| "$OOBUILDDIR/java-set-classpath" || exit 1;
 install_script $OOBUILDDIR/java-set-classpath $OOINSTDIR/basis$VERSION/program/java-set-classpath
 
 if test "`uname -i`" = "i386" ; then
-    echo "Building $OOINSTDIR/program/pyunorc-update64";
+    echo "Building $OOINSTDIR/basis$VERSION/program/pyunorc-update64";
     sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/pyunorc-update64.in >| "$OOBUILDDIR/pyunorc-update64" || exit 1;
     install_script $OOBUILDDIR/pyunorc-update64 $OOINSTDIR/basis$VERSION/program/pyunorc-update64
 fi
@@ -401,7 +401,7 @@
 	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/share.*$||" \
 	-e "/\.orig$/D" \
 	-e "/^$/D" \
-	$OODESTDIR/gid_Module_Root_SDK \
+	$OODESTDIR/gid_Module_Root_SDK | sort -u \
 	>$OODESTDIR/gid_Module_Root_SDK.new
     mv $OODESTDIR/gid_Module_Root_SDK.new $OODESTDIR/gid_Module_Root_SDK
     #
@@ -649,7 +649,11 @@
 			test -f gid_Module_Langpack_Binfilter_$lang  && lang_lists="$lang_lists  gid_Module_Langpack_Binfilter_$lang" || :
 			test -f gid_Module_Langpack_Help_$lang  	&& lang_lists="$lang_lists gid_Module_Langpack_Help_$lang" || :
 		fi
-		test -n "$lang_lists" && cat $lang_lists | sort -u >$BUILDDIR/lang_${lang}_list.txt || :
+		if test -n "$lang_lists" ; then
+		    # all files are installed below $OOINSTBASE/basis; we want to own also $OOINSTBASE
+		    echo "%dir $OOINSTBASE" >$BUILDDIR/lang_${lang}_list.txt
+		    cat $lang_lists | sort -u >>$BUILDDIR/lang_${lang}_list.txt
+		fi
 
 	done
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jun 30 19:20:39 2008
@@ -928,6 +928,11 @@
 # omit './' in paths
 solenv-installer-cleaner-paths.diff, pmladek
 
+# do not print twice the lang name in the filelist
+# for example, generate gid_Module_Langpack_Basis_es instead of
+# gid_Module_Langpack_Basis_es.es
+solenv-installer-lang-filelist-names.diff, pmladek
+
 # fix evo2 driver build
 buildfix-connectivity-evoab2.diff, i#91025, pmladek
 
@@ -1850,9 +1855,9 @@
 toolkit-layout-gcc-4.3.2-hack.diff, pmladek
 
 [ LocalizeLayout ]
-cws-layoutdialogs-toolkit-localize.diff
 
-layout-tab-toolkit-localize.diff
+# FIXME dev300 cws-layoutdialogs-toolkit-localize.diff
+# FIXME dev300 layout-tab-toolkit-localize.diff
 
 [ AutoCorrectCapsLock ]
 SectionOwner => kohei

Added: trunk/patches/dev300/solenv-installer-lang-filelist-names.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/solenv-installer-lang-filelist-names.diff	Mon Jun 30 19:20:39 2008
@@ -0,0 +1,10 @@
+--- solenv/bin/modules/installer/worker.pm.old	2008-06-26 18:28:54.000000000 +0200
++++ solenv/bin/modules/installer/worker.pm	2008-06-27 19:36:28.000000000 +0200
+@@ -830,7 +830,6 @@ sub install_simple ($$$$$$)
+ 	{
+ 		my $filelist;
+ 		my $fname = $installer::globals::destdir . "/$packagename";
+-		if ($installer::globals::languagepack) { $fname .= ".$languagestring"; }
+ 		open ($filelist, ">$fname") || die "Can't open $fname: $!";
+ 		print $filelist @lines;
+ 		close ($filelist);

Modified: trunk/src/cli_cppuhelper.dll.config.in
==============================================================================
--- trunk/src/cli_cppuhelper.dll.config.in	(original)
+++ trunk/src/cli_cppuhelper.dll.config.in	Mon Jun 30 19:20:39 2008
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="cli_uno_glue" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libcli_uno_glue.so"/>
+  <dllmap dll="cli_uno_glue" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/basis-link/program/libcli_uno_glue.so"/>
 </configuration>

Modified: trunk/src/cli_uno_bridge.dll.config.in
==============================================================================
--- trunk/src/cli_uno_bridge.dll.config.in	(original)
+++ trunk/src/cli_uno_bridge.dll.config.in	Mon Jun 30 19:20:39 2008
@@ -1,5 +1,7 @@
 <configuration>
-  <dllmap dll="cli_uno" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libcli_uno.so"/>
-  <dllmap dll="sal" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libsal.so.3"/>
-  <dllmap dll="uno_cppu" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libuno_cppu.so.3"/>
+  <dllmap dll="cli_uno" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/basis-link/program/libcli_uno.so"/>
+  <!-- FIXME: need to look for another libraries
+  <dllmap dll="sal" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/basis-link/program/libsal.so.3"/>
+  <dllmap dll="uno_cppu" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/basis-link/program/libuno_cppu.so.3"/>
+  -->
 </configuration>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]