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

From: michael svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13510 - in trunk: . doc patches/dev300 scratch/split
Date: Mon, 11 Aug 2008 11:35:27 +0000 (UTC)
Author: michael
Date: Mon Aug 11 11:35:27 2008
New Revision: 13510
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13510&view=rev

Log:
more piece work,

2008-08-11  Michael Meeks  <michael meeks novell com>

        * patches/dev300/sd-builddep.diff,
        * patches/dev300/apply: fix sd build deps.



Added:
   trunk/patches/dev300/sd-builddep.diff
Modified:
   trunk/ChangeLog
   trunk/doc/split.txt
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-solenv.diff
   trunk/patches/dev300/piece-target.diff
   trunk/scratch/split/ooo3_artwork.spec
   trunk/scratch/split/ooo3_base.spec
   trunk/scratch/split/ooo3_bootstrap.spec
   trunk/scratch/split/ooo3_calc.spec
   trunk/scratch/split/ooo3_components.spec
   trunk/scratch/split/ooo3_filters.spec
   trunk/scratch/split/ooo3_impress.spec
   trunk/scratch/split/ooo3_l10n.spec
   trunk/scratch/split/ooo3_libs_core.spec
   trunk/scratch/split/ooo3_libs_extern.spec
   trunk/scratch/split/ooo3_libs_gui.spec
   trunk/scratch/split/ooo3_ure.spec
   trunk/scratch/split/ooo3_writer.spec
   trunk/scratch/split/rpmbuild

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Mon Aug 11 11:35:27 2008
@@ -309,4 +309,7 @@
 make_installer.pl [!] ... can't mangle include path ...
 	+ need a different include path for certain control files [!?]
 
+filters - urgh; tons of flaking ANT / classpath bits ...
+
+find BUILD/dev300-m25-filters -name 'build.xml'
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Aug 11 11:35:27 2008
@@ -415,6 +415,7 @@
 [ Fixes ]
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
+sd-builddep.diff, i#92662, michael
 
 # use basic (advanced) shapes for rectangle/ellipse on draw/impress's toolbars. make shapes wrap words by default, n#171052, rodo
 sd-toolbar-advanced-shapes.diff, n#171052, rodo

Modified: trunk/patches/dev300/piece-solenv.diff
==============================================================================
--- trunk/patches/dev300/piece-solenv.diff	(original)
+++ trunk/patches/dev300/piece-solenv.diff	Mon Aug 11 11:35:27 2008
@@ -28,9 +28,9 @@
 -	
 +
 +	$split = 0;
+ 	$required_dotnet_version = "2.0.0.0";
  	$productextension = "";
  	@languageproducts = ();
- 	$build = "";
 @@ -428,6 +429,8 @@
  	if ( $plat =~ /linux/i ) { $islinux = 1; } 
  	if ( $plat =~ /solaris/i ) { $issolaris = 1; } 
@@ -195,7 +195,7 @@
  
  		push @lines, "$destination\n";
  		# printf "cp $sourcepath $destdir$destination\n";
--		copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $!";
+-		copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
 +
 +		next if ($installer::globals::split && $sourcepath eq '');
 +

Modified: trunk/patches/dev300/piece-target.diff
==============================================================================
--- trunk/patches/dev300/piece-target.diff	(original)
+++ trunk/patches/dev300/piece-target.diff	Mon Aug 11 11:35:27 2008
@@ -68,14 +68,3 @@
  
  CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
  
-@@ -1088,10 +1082,6 @@
- LOCAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS)
- LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON
- 
--.IF "$(ENABLE_GSTREAMER)" == "TRUE"
--CDEFS+=-DGSTREAMER
--.ENDIF
--
- # compose flags and defines for GUI
- .IF "$(TARGETTYPE)"=="GUI"
- CDEFS+= $(CDEFSGUI)

Added: trunk/patches/dev300/sd-builddep.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sd-builddep.diff	Mon Aug 11 11:35:27 2008
@@ -0,0 +1,8 @@
+--- sd/prj/build.lst
++++ sd/prj/build.lst
+@@ -1,4 +1,4 @@
+-sd	sd	:	svx stoc uui canvas NULL
++sd	sd	:	animations svx stoc uui canvas NULL
+ sd	sd										usr1	-	all	sd_mkout NULL
+ sd	sd\inc									nmake		-	all	sd_inc NULL
+ sd	sd\prj									get		-	all	sd_prj NULL

Modified: trunk/scratch/split/ooo3_artwork.spec
==============================================================================
--- trunk/scratch/split/ooo3_artwork.spec	(original)
+++ trunk/scratch/split/ooo3_artwork.spec	Mon Aug 11 11:35:27 2008
@@ -16,7 +16,7 @@
 BuildRequires:  ooo3_bootstrap
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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

Modified: trunk/scratch/split/ooo3_base.spec
==============================================================================
--- trunk/scratch/split/ooo3_base.spec	(original)
+++ trunk/scratch/split/ooo3_base.spec	Mon Aug 11 11:35:27 2008
@@ -17,7 +17,7 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -51,7 +51,7 @@
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_bootstrap.spec
==============================================================================
--- trunk/scratch/split/ooo3_bootstrap.spec	(original)
+++ trunk/scratch/split/ooo3_bootstrap.spec	Mon Aug 11 11:35:27 2008
@@ -127,7 +127,7 @@
 %define	      ooo_home		ooo-3
 %define	      ooo_build_dir	build
 %define	      ooo_build_version 2.99.25
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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

Modified: trunk/scratch/split/ooo3_calc.spec
==============================================================================
--- trunk/scratch/split/ooo3_calc.spec	(original)
+++ trunk/scratch/split/ooo3_calc.spec	Mon Aug 11 11:35:27 2008
@@ -17,7 +17,7 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -51,7 +51,7 @@
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_components.spec
==============================================================================
--- trunk/scratch/split/ooo3_components.spec	(original)
+++ trunk/scratch/split/ooo3_components.spec	Mon Aug 11 11:35:27 2008
@@ -17,7 +17,7 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -51,7 +51,7 @@
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_filters.spec
==============================================================================
--- trunk/scratch/split/ooo3_filters.spec	(original)
+++ trunk/scratch/split/ooo3_filters.spec	Mon Aug 11 11:35:27 2008
@@ -17,7 +17,7 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -51,7 +51,7 @@
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_impress.spec
==============================================================================
--- trunk/scratch/split/ooo3_impress.spec	(original)
+++ trunk/scratch/split/ooo3_impress.spec	Mon Aug 11 11:35:27 2008
@@ -17,7 +17,7 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -51,7 +51,7 @@
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
 OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_l10n.spec
==============================================================================
--- trunk/scratch/split/ooo3_l10n.spec	(original)
+++ trunk/scratch/split/ooo3_l10n.spec	Mon Aug 11 11:35:27 2008
@@ -17,7 +17,7 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -50,8 +50,9 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
-export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+# don't build help 8x since - well - it needs a shed load of memory.
+export EXTRA_BUILD_FLAGS=%{?jobs:-P2}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P2}"
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_libs_core.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_core.spec	(original)
+++ trunk/scratch/split/ooo3_libs_core.spec	Mon Aug 11 11:35:27 2008
@@ -17,7 +17,7 @@
 BuildRequires:  ooo3_libs_gui-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -51,7 +51,7 @@
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_libs_extern.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_extern.spec	(original)
+++ trunk/scratch/split/ooo3_libs_extern.spec	Mon Aug 11 11:35:27 2008
@@ -18,7 +18,7 @@
 BuildRequires:  ooo3_bootstrap ooo3_ure
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -52,7 +52,7 @@
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_libs_gui.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_gui.spec	(original)
+++ trunk/scratch/split/ooo3_libs_gui.spec	Mon Aug 11 11:35:27 2008
@@ -17,7 +17,7 @@
 BuildRequires:  ooo3_bootstrap ooo3_libs_extern-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -51,7 +51,7 @@
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Mon Aug 11 11:35:27 2008
@@ -17,7 +17,7 @@
 BuildRequires:  ooo3_bootstrap
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -51,7 +51,7 @@
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_writer.spec
==============================================================================
--- trunk/scratch/split/ooo3_writer.spec	(original)
+++ trunk/scratch/split/ooo3_writer.spec	Mon Aug 11 11:35:27 2008
@@ -17,7 +17,7 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m28
+%define	      ooo_build_tag     ooo300-m1
 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
@@ -51,7 +51,7 @@
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
-export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/rpmbuild
==============================================================================
--- trunk/scratch/split/rpmbuild	(original)
+++ trunk/scratch/split/rpmbuild	Mon Aug 11 11:35:27 2008
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export PATH="/opt/icecream/bin:$PATH"
 modules="bootstrap ure libs_extern artwork libs_gui libs_core components l10n impress writer calc base filters"
 if test "z$1" != "z"; then
    buildfrom=$1
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]