ooo-build r13204 - in trunk: doc patches/dev300 scratch/split

From: michael svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13204 - in trunk: doc patches/dev300 scratch/split
Date: Mon, 14 Jul 2008 20:49:17 +0000 (UTC)
Author: michael
Date: Mon Jul 14 20:49:16 2008
New Revision: 13204
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13204&view=rev

Log:
add more piece-al work ...


Added:
   trunk/patches/dev300/piece-deliver.diff
   trunk/scratch/split/ooo3_components.spec
   trunk/scratch/split/ooo3_filters.spec
Modified:
   trunk/doc/split.txt
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-basic.diff
   trunk/patches/dev300/piece-svx.diff

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Mon Jul 14 20:49:16 2008
@@ -243,7 +243,8 @@
 	+ bootstrap
 	+ ure | libs_extern
 	+ libs_gui
-	+ 
+	+ libs_core
+	+ components | ? filters
 
 	+ artwork
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 14 20:49:16 2008
@@ -2465,6 +2465,7 @@
 piece-svx.diff
 # zipintro is not kind to us ...
 piece-desktop.diff
+piece-scripting.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Modified: trunk/patches/dev300/piece-basic.diff
==============================================================================
--- trunk/patches/dev300/piece-basic.diff	(original)
+++ trunk/patches/dev300/piece-basic.diff	Mon Jul 14 20:49:16 2008
@@ -1,14 +1,14 @@
---- /usr/src/packages/BUILD/dev300-m21-libs_core/basic/source/classes/makefile.mk	2008-07-14 15:27:47.000000000 +0100
-+++ /tmp/makefile.mk	2008-07-14 15:26:21.000000000 +0100
-@@ -45,9 +45,8 @@
+--- basic/source/classes/makefile.mk
++++ basic/source/classes/makefile.mk
+@@ -45,8 +45,9 @@
          $(MISC)$/$(TARGET).don \
          $(SLOTARGET)
  
--OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
--$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
--        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+-        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
++$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
          echo $@
  
  # --- Allgemein -----------------------------------------------------------

Added: trunk/patches/dev300/piece-deliver.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-deliver.diff	Mon Jul 14 20:49:16 2008
@@ -0,0 +1,39 @@
+--- solenv/bin/deliver.pl
++++ solenv/bin/deliver.pl
+@@ -440,6 +440,13 @@
+     $opt_force = 1 if $opt_delete;
+ }
+ 
++# return the base directory to install to
++sub get_dest_base()
++{
++    return $ENV{'SOLARPIECEVERSION'} if (defined $ENV{'SOLARPIECEVERSION'});
++    return $ENV{'SOLARVERSION'};
++}
++
+ sub init_globals 
+ {
+     my $ext;
+@@ -458,10 +465,10 @@
+     my $build_sosl    = $ENV{'BUILD_SOSL'};
+     my $common_outdir = $ENV{'COMMON_OUTDIR'};
+     my $inpath        = $ENV{'INPATH'};
+-    my $solarversion  = $ENV{'SOLARVERSION'};
+     my $updater       = $ENV{'UPDATER'};
+     my $updminor      = $ENV{'UPDMINOR'};
+     my $work_stamp    = $ENV{'WORK_STAMP'};
++    my $solarversion  = get_dest_base();
+     
+     # special security check for release engineers
+     if ( defined($updater) && !defined($build_sosl) && !$opt_force) {
+@@ -1144,8 +1151,8 @@
+         warn "Neither common nor platform tree?";
+         return;
+     }
+-    # make 'to' relative to SOLARVERSION
+-    my $solarversion  = $ENV{'SOLARVERSION'};
++    # make 'to' relative to the base path
++    my $solarversion  = get_dest_base();
+     $solarversion =~ s#\\#/#g;
+     $entry[2] =~ s/^\Q$solarversion\E\///;
+     # strip minor from 'to'

Modified: trunk/patches/dev300/piece-svx.diff
==============================================================================
--- trunk/patches/dev300/piece-svx.diff	(original)
+++ trunk/patches/dev300/piece-svx.diff	Mon Jul 14 20:49:16 2008
@@ -4,13 +4,13 @@
          svxitems.sdi \
  	fmslots.sdi \
  	svx.sdi	\
--	$(SOLARPIECE)$/$(INPATH)$/inc$/sfxslots.ilb	\
-+	$(SOLARINCXDIR)$/sfxslots.ilb	\
+-	$(SOLARINCXDIR)$/sfxslots.ilb	\
++	$(SOLARPIECE)$/$(INPATH)$/inc$/sfxslots.ilb	\
  	xoitems.sdi \
  	svxitems.sdi
  
---- /svx/util/makefile.mk
-+++ /svx/util/makefile.mk
+--- svx/util/makefile.mk
++++ svx/util/makefile.mk
 @@ -206,7 +206,7 @@
                  $(SRS)$/svxlink.srs \
                  $(SRS)$/accessibility.srs \

Added: trunk/scratch/split/ooo3_components.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3_components.spec	Mon Jul 14 20:49:16 2008
@@ -0,0 +1,86 @@
+#
+# 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         piece      components
+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_SOLVERDIR=$OO_INSTDIR/solver
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+
+$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
+source $OO_TOOLSDIR/piece/sys-setup
+
+export VERBOSE=1
+# export EXTRA_BUILD_FLAGS="-P2"
+$OO_TOOLSDIR/piece/build-generic %piece
+
+%install
+
+#setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_SOLVERDIR=$OO_INSTDIR/solver
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export DESTDIR=$RPM_BUILD_ROOT
+
+source $OO_TOOLSDIR/piece/sys-setup
+$OO_TOOLSDIR/piece/install-generic %piece
+
+%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_filters.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3_filters.spec	Mon Jul 14 20:49:16 2008
@@ -0,0 +1,86 @@
+#
+# 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         piece      filters
+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_SOLVERDIR=$OO_INSTDIR/solver
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+
+$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
+source $OO_TOOLSDIR/piece/sys-setup
+
+export VERBOSE=1
+# export EXTRA_BUILD_FLAGS="-P2"
+$OO_TOOLSDIR/piece/build-generic %piece
+
+%install
+
+#setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_SOLVERDIR=$OO_INSTDIR/solver
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export DESTDIR=$RPM_BUILD_ROOT
+
+source $OO_TOOLSDIR/piece/sys-setup
+$OO_TOOLSDIR/piece/install-generic %piece
+
+%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]