GNOME.org
 

ooo-build r13229 - in trunk: bin/piece doc patches/dev300 scratch/split

Author: michael
Date: Tue Jul 15 16:36:44 2008
New Revision: 13229
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13229&view=rev

Log:
fail if build fails nicely; fix writerfilter, add more spec files.


Added:
   trunk/patches/dev300/piece-sdext.diff
   trunk/patches/dev300/piece-writerfilter.diff
   trunk/scratch/split/ooo3_base.spec
   trunk/scratch/split/ooo3_calc.spec
   trunk/scratch/split/ooo3_writer.spec
Modified:
   trunk/bin/piece/build-generic
   trunk/doc/split.txt
   trunk/patches/dev300/apply

Modified: trunk/bin/piece/build-generic
==============================================================================
--- trunk/bin/piece/build-generic	(original)
+++ trunk/bin/piece/build-generic	Tue Jul 15 16:36:44 2008
@@ -23,7 +23,7 @@
 	--tag=$ooo_build_tag \
 	--distro=$distro --distro=Piece --distro=Binfilter \
 	--distro=System --distro=Sdk --distro=Localize --distro=swext \
-	 `pwd` 
+	 `pwd` || exit 1;
 
 dirs=`/bin/ls | grep -v 'applied_patches' | tr '\n' ':'`
 perl $SOLARENV/bin/build.pl --subdirs:$dirs $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Tue Jul 15 16:36:44 2008
@@ -247,7 +247,7 @@
 	+ components | artwork
 	+ l10n
 	+ impress | filters
-
+	+ 
 
 
 build.pl:

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 15 16:36:44 2008
@@ -2540,6 +2540,8 @@
 piece-desktop.diff
 piece-scripting.diff
 piece-helpcontent2.diff
+piece-sdext.diff
+piece-writerfilter.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Added: trunk/patches/dev300/piece-sdext.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-sdext.diff	Tue Jul 15 16:36:44 2008
@@ -0,0 +1,11 @@
+--- sdext/source/minimizer/makefile.mk
++++ sdext/source/minimizer/makefile.mk
+@@ -123,7 +123,7 @@
+ 
+ .INCLUDE : extension_post.mk
+ 
+-$(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
++$(COMPONENT_BITMAPS) : $(SOLARVER)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ 

Added: trunk/patches/dev300/piece-writerfilter.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-writerfilter.diff	Tue Jul 15 16:36:44 2008
@@ -0,0 +1,11 @@
+--- writerfilter/source/ooxml/makefile.mk
++++ writerfilter/source/ooxml/makefile.mk
+@@ -185,7 +185,7 @@
+ .ENDIF
+ 
+ $(TOKENXMLTMP): 
+-    $(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
++    $(TYPE) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
+ 
+ $(TOKENXML): tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter
+ 	$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@

Added: trunk/scratch/split/ooo3_base.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3_base.spec	Tue Jul 15 16:36:44 2008
@@ -0,0 +1,79 @@
+#
+# spec file for package OpenOffice_org (Version 2.4.1.7)
+#
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define         distro     SUSE
+%define         piece      base
+Name:           ooo3_%piece
+Requires:       ooo3_libs_core
+BuildRequires:  ooo3_libs_core-devel
+%define	      ooo_prefix	%_libdir
+%define	      ooo_home		ooo-3
+%define	      ooo_build_tag     dev300-m21
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Group:          Productivity/Office/Suite
+Version:        3
+Release:        5
+AutoReqProv:    on
+Summary:        A Free Office Suite (Framework)
+Url:            http://www.openoffice.org/
+Source:         %ooo_build_tag-%piece.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+ure
+
+%package devel
+Requires:       ooo3_ure-devel ooo3_libs_extern-devel
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Summary:        A Free Office Suite (Framework)
+Group:          Productivity/Office/Suite
+AutoReqProv:    off
+
+%description devel
+devel package
+
+%prep
+%setup -q -n %ooo_build_tag-%piece
+
+%build
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export VERBOSE=1
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
+
+%install
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export DESTDIR=$RPM_BUILD_ROOT
+
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
+
+%clean
+%post
+%post devel
+
+%files
+%defattr(-,root,root)
+# FIXME - should have the actual files in it ! ;-)
+# except we have ~none here - just a devel package (?)
+# is there anything we absolutely need here ?
+
+%files devel
+%defattr(-,root,root)
+%dir %ooo_prefix/%ooo_home/solver
+%ooo_prefix/%ooo_home/solver/*
+
+%changelog

Added: trunk/scratch/split/ooo3_calc.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3_calc.spec	Tue Jul 15 16:36:44 2008
@@ -0,0 +1,79 @@
+#
+# spec file for package OpenOffice_org (Version 2.4.1.7)
+#
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define         distro     SUSE
+%define         piece      calc
+Name:           ooo3_%piece
+Requires:       ooo3_libs_core
+BuildRequires:  ooo3_libs_core-devel
+%define	      ooo_prefix	%_libdir
+%define	      ooo_home		ooo-3
+%define	      ooo_build_tag     dev300-m21
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Group:          Productivity/Office/Suite
+Version:        3
+Release:        5
+AutoReqProv:    on
+Summary:        A Free Office Suite (Framework)
+Url:            http://www.openoffice.org/
+Source:         %ooo_build_tag-%piece.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+ure
+
+%package devel
+Requires:       ooo3_ure-devel ooo3_libs_extern-devel
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Summary:        A Free Office Suite (Framework)
+Group:          Productivity/Office/Suite
+AutoReqProv:    off
+
+%description devel
+devel package
+
+%prep
+%setup -q -n %ooo_build_tag-%piece
+
+%build
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export VERBOSE=1
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
+
+%install
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export DESTDIR=$RPM_BUILD_ROOT
+
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
+
+%clean
+%post
+%post devel
+
+%files
+%defattr(-,root,root)
+# FIXME - should have the actual files in it ! ;-)
+# except we have ~none here - just a devel package (?)
+# is there anything we absolutely need here ?
+
+%files devel
+%defattr(-,root,root)
+%dir %ooo_prefix/%ooo_home/solver
+%ooo_prefix/%ooo_home/solver/*
+
+%changelog

Added: trunk/scratch/split/ooo3_writer.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3_writer.spec	Tue Jul 15 16:36:44 2008
@@ -0,0 +1,79 @@
+#
+# spec file for package OpenOffice_org (Version 2.4.1.7)
+#
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define         distro     SUSE
+%define         piece      writer
+Name:           ooo3_%piece
+Requires:       ooo3_libs_core
+BuildRequires:  ooo3_libs_core-devel
+%define	      ooo_prefix	%_libdir
+%define	      ooo_home		ooo-3
+%define	      ooo_build_tag     dev300-m21
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Group:          Productivity/Office/Suite
+Version:        3
+Release:        5
+AutoReqProv:    on
+Summary:        A Free Office Suite (Framework)
+Url:            http://www.openoffice.org/
+Source:         %ooo_build_tag-%piece.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+ure
+
+%package devel
+Requires:       ooo3_ure-devel ooo3_libs_extern-devel
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Summary:        A Free Office Suite (Framework)
+Group:          Productivity/Office/Suite
+AutoReqProv:    off
+
+%description devel
+devel package
+
+%prep
+%setup -q -n %ooo_build_tag-%piece
+
+%build
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export VERBOSE=1
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
+
+%install
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export DESTDIR=$RPM_BUILD_ROOT
+
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
+
+%clean
+%post
+%post devel
+
+%files
+%defattr(-,root,root)
+# FIXME - should have the actual files in it ! ;-)
+# except we have ~none here - just a devel package (?)
+# is there anything we absolutely need here ?
+
+%files devel
+%defattr(-,root,root)
+%dir %ooo_prefix/%ooo_home/solver
+%ooo_prefix/%ooo_home/solver/*
+
+%changelog
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]