ooo-build r13025 - in trunk: . bin bin/piece doc patches patches/dev300 patches/mono scratch/split

From: michael svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13025 - in trunk: . bin bin/piece doc patches patches/dev300 patches/mono scratch/split
Date: Wed, 2 Jul 2008 13:50:50 +0000 (UTC)
Author: michael
Date: Wed Jul  2 13:50:50 2008
New Revision: 13025
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13025&view=rev

Log:
2008-07-02  Michael Meeks  <michael meeks novell com>

        * patches/dev300/solenv-cwsid: remove in m22.

        * bin/package-ooo: install solenv when bootstrapping.

        * patches/mono/*, patches/mono/apply: fixup for m22 &
        rotate older bits, whitespace changes & cli_types ->
cli_uretypes.
        disable emf+-offapi.diff for >= m22

        * download.in: switch to components for split builds.
        * bin/sloppypatch.pl: fix to be a patch-alike, fix -d option.



Added:
   trunk/patches/mono/build-mono-link-m21.diff   (props changed)
      - copied unchanged from r13021, /trunk/patches/mono/build-mono-link.diff
   trunk/patches/mono/buildfix-climaker-disabled-m21.diff   (props changed)
      - copied unchanged from r13021, /trunk/patches/mono/buildfix-climaker-disabled.diff
   trunk/patches/mono/cli_ure-mono-bridge-m21.diff   (props changed)
      - copied unchanged from r13021, /trunk/patches/mono/cli_ure-mono-bridge.diff
   trunk/patches/mono/cli_ure-source-bootstrap-makefile-mk-m21.diff   (props changed)
      - copied unchanged from r13021, /trunk/patches/mono/cli_ure-source-bootstrap-makefile-mk.diff
   trunk/patches/mono/climaker-csharp-win-m21.diff   (props changed)
      - copied unchanged from r13021, /trunk/patches/mono/climaker-csharp-win.diff
   trunk/patches/mono/mono-build-keyfile-m21.diff   (props changed)
      - copied unchanged from r13021, /trunk/patches/mono/mono-build-keyfile.diff
   trunk/patches/mono/mono-build-m21.diff   (props changed)
      - copied unchanged from r13021, /trunk/patches/mono/mono-build.diff
   trunk/patches/mono/mono-climaker-m21.diff   (props changed)
      - copied unchanged from r13021, /trunk/patches/mono/mono-climaker.diff
   trunk/patches/mono/mono-scp2-m21.diff   (props changed)
      - copied unchanged from r13022, /trunk/patches/mono/mono-scp2.diff
Modified:
   trunk/ChangeLog
   trunk/bin/Makefile.am
   trunk/bin/package-ooo
   trunk/bin/piece/build-ure
   trunk/bin/piece/install-ure
   trunk/bin/piece/sys-setup
   trunk/bin/sloppypatch.pl
   trunk/doc/split.txt
   trunk/download.in
   trunk/patches/apply.pl.in
   trunk/patches/dev300/apply
   trunk/patches/mono/build-mono-link.diff
   trunk/patches/mono/buildfix-climaker-disabled.diff
   trunk/patches/mono/cli_ure-mono-bridge.diff
   trunk/patches/mono/cli_ure-source-bootstrap-makefile-mk.diff
   trunk/patches/mono/climaker-csharp-win.diff
   trunk/patches/mono/mono-build-keyfile.diff
   trunk/patches/mono/mono-build.diff
   trunk/patches/mono/mono-climaker.diff
   trunk/patches/mono/mono-scp2.diff
   trunk/scratch/split/ooo3_bootstrap.spec
   trunk/scratch/split/ooo3_ure.spec

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	(original)
+++ trunk/bin/Makefile.am	Wed Jul  2 13:50:50 2008
@@ -36,6 +36,7 @@
 	unpack \
 	setup.in \
 	transform \
+	sloppypatch.pl \
 	README
 
 EXTRA_DIST = $(script_files)

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Wed Jul  2 13:50:50 2008
@@ -14,10 +14,12 @@
 if test "z$PIECE" != "z"; then
     echo "install $PIECE"
     SRCDIR="$OOBUILDDIR/solver/$UPD/$INPATH"
+    mkdir -p $OOINSTDIR/solenv
+    cp -R $OOBUILDDIR/solenv/* $OOINSTDIR/solenv
+
     DEST=$OOINSTDIR/solver
     mkdir -p $DEST
     cp -R $SRCDIR/* $DEST
-
     if test -f "$TOOLSDIR/bin/piece/install-$PIECE"; then
 	echo "$PIECE specific install"
 	. $TOOLSDIR/bin/piece/install-$PIECE

Modified: trunk/bin/piece/build-ure
==============================================================================
--- trunk/bin/piece/build-ure	(original)
+++ trunk/bin/piece/build-ure	Wed Jul  2 13:50:50 2008
@@ -5,8 +5,7 @@
 for a in *; do
 	if test "$a" != "applied_patches"; then
 		cd $a || exit 1;
-		perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
-		perl $SOLARENV/bin/build.pl --deliver $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+		perl $SOLARENV/bin/build.pl --all:$a --deliver $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
 		cd ..
 	fi
 done

Modified: trunk/bin/piece/install-ure
==============================================================================
--- trunk/bin/piece/install-ure	(original)
+++ trunk/bin/piece/install-ure	Wed Jul  2 13:50:50 2008
@@ -1,5 +1,5 @@
-SRCDIR="$OOBUILDDIR/solver/$UPD/$INPATH"
-DEST=$OOINSTDIR/solver
+SRCDIR="$SOLARVER/$INPATH"
+DEST="$OO_SOLVERDIR/solver"
 mkdir -p $DEST
 cp -R $SRCDIR/* $DEST
 ln -s . $DEST/$INPATH

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Wed Jul  2 13:50:50 2008
@@ -14,9 +14,11 @@
 # override / extend ones we need to adapt
 SRC_ROOT=`pwd`
 
-export SOLARVER="$DEV_DIR"
+# create a new local solver
+export SOLARVER="$SRC_ROOT/solver/$UPD"
+export SOLARENV="$DEV_DIR/solenv"
+
 export SOLARVERSION="$SOLARVER"
-export SOLARENV="/home/opt/OpenOffice/HEAD/build/dev300-m19/solenv"
 export SOLARENVINC="$SOLARENV/inc"
 export LOCALINI="$SOLARENV/config"
 export STAR_INIROOT="$SOLARENV/config"

Modified: trunk/bin/sloppypatch.pl
==============================================================================
--- trunk/bin/sloppypatch.pl	(original)
+++ trunk/bin/sloppypatch.pl	Wed Jul  2 13:50:50 2008
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
-use POSIX;
+use IO::File;
+use POSIX qw(tmpnam);
 
 # apply a patch, but only if the top-level directory exists
 # mentioned in the patch; eg.
@@ -9,8 +10,24 @@
 # Bugs:
 #   doesn't cope with '-p' - assumes -p0
 
-my $eliding = 0;
+my $applydir;
+chomp ($applydir = `pwd`);
+for (my $idx = 0; $idx < @ARGV; $idx++) {
+    if ($ARGV[$idx] eq '-d') {
+	$applydir = $ARGV[$idx+1];
+    }
+}
+
+my $tmpfile;
+my $fh;
+for (;;) {
+    $tmpfile = tmpnam();
+    sysopen( $fh, $tmpfile, O_RDWR | O_CREAT | O_EXCL ) && last;
+}
+
+my $eliding = 1;
 my $minusline = '';
+my $sections = 0;
 while (<STDIN>) {
     my $line = $_;
     if ( $line =~ m/^--- /) {
@@ -18,13 +35,31 @@
 	next;
     }
     if ( $line =~ m/^\+\+\+ [ \t]*([^\/]+)([^ \t]+)/ ) {
-	$eliding = ! -d $1;
-	print STDERR (($eliding ? "- skip" : "+ apply") . " fragment for $1$2\n");
+	$eliding = ! -d "$applydir/$1";
 
+	if (!$eliding) {
+	    $sections++;
+	    print STDERR "+ apply fragment for $1$2\n";
+	}
 	$line = $minusline . $line;
 	$minusline = '';
     }
     if (!$eliding) {
-	print $line;
+	print $fh $line;
     }
 }
+
+my $result = 0;
+if ($sections > 0) {
+# patch complains a lot with empty input
+    if (system ("patch @ARGV < $tmpfile")) {
+	 print STDERR "\nError: failed to apply patch @ARGV: $!\n\n";
+    }
+    $result = $? >> 8;
+} else {
+    print STDERR "- skipped whole patch\n";
+}
+
+unlink $tmpfile;
+
+exit $result;

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Wed Jul  2 13:50:50 2008
@@ -232,3 +232,15 @@
 		+ delete junk out of it ?
 			+ remove duplicates (somehow)
 			+ install earlier ?
+
+Hunk #1 succeeded at 31 (offset -4 lines).
+patching file cli_ure/prj/build.lst
+Hunk #1 FAILED at 2.
+1 out of 1 hunk FAILED -- saving rejects to file cli_ure/prj/build.lst.rej
+patching file cli_ure/prj/d.lst
+
+FIXME:
+	+ rename each piece into it's own directory:
+		+ dev300-m22-ure [etc.]
+		+ so RPMs can build happily together in parallel on the same host.
+

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Wed Jul  2 13:50:50 2008
@@ -279,7 +279,7 @@
     push @files, ( source_file( "libs-gui" ) );
     push @files, ( source_file( "libs-core" ) );
     push @files, ( source_file( "libs-extern" ) );
-    push @files, ( source_file( "extensions" ) );
+    push @files, ( source_file( "components" ) );
     push @files, ( source_file( "postprocess" ) );
 } else {
     push @files, ( source_file( "core" ) );

Modified: trunk/patches/apply.pl.in
==============================================================================
--- trunk/patches/apply.pl.in	(original)
+++ trunk/patches/apply.pl.in	Wed Jul  2 13:50:50 2008
@@ -1,5 +1,9 @@
 #!/usr/bin/perl -w
 
+#
+# Warning - this file is generated from apply.pl.in - do not edit apply.pl
+#
+
 use File::Copy;
 use File::Basename;
 
@@ -1113,12 +1117,15 @@
     $applied_patches = $dest_dir.'/applied_patches';
 
     $opts = join ' ', @arguments;
-    $base_cmd = "@GNUPATCH@ -l -p0 $opts -d $dest_dir";
+    my $base_args = " -l -p0 $opts -d $dest_dir";
+    $base_cmd = "patch";
     if ($pieces) {
 	# nasty path mess
-	my $sloppy_cmd = "$patch_dir/../../bin/sloppypatch.pl";
-	$base_cmd = '$sloppy_cmd | ' . $base_cmd;
+	$base_cmd = "$patch_dir/../../bin/sloppypatch.pl";
+	-f $base_cmd || die "no sloppy patch command $base_cmd";
     }
+    $base_cmd = $base_cmd . $base_args;
+
     if (is_old_patch_version()) {
 	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
     }

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul  2 13:50:50 2008
@@ -505,10 +505,6 @@
 # for example, it fixes unopkg to do not show random localization
 tools-resmgr-set-defaultlocale.diff, n#399101, i#90820, pmladek
 
-# explicitely convert cwsid to integer
-# otherwise, cws-extract does not work with perl-5.10 on openSUSE-11.0
-solenv-cwsid.diff, i#90853, pmladek
-
 # Allow some technically illegal pathname components on Win32
 # (directories with trailing spaces or periods) because some SMB
 # servers like Netware (and Samba, if mangled names = No) do serve
@@ -518,6 +514,11 @@
 # ensure that ant can do regexp matches.
 ant-regexp-test.diff, i#89383, michael
 
+[ Fixes < dev300-m22 >= beb300-m1 ]
+# explicitely convert cwsid to integer
+# otherwise, cws-extract does not work with perl-5.10 on openSUSE-11.0
+solenv-cwsid.diff, i#90853, pmladek
+
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to
 # share the same name to be part of the same group.
@@ -1349,32 +1350,44 @@
 #
 # These patches are experimental beware ...
 #
-mono-scp2.diff
-
-cli_ure-mono-bridge.diff
 
 cli_ure-source-bootstrap-assembly-cs.diff
-cli_ure-source-bootstrap-makefile-mk.diff
 cli_ure-source-bootstrap-managed_bootstrap-cs.diff
 cli_ure-source-bootstrap-native_glue-cxx.diff
 mono-testtools.diff
 
 # The build
-mono-build.diff
+[ Mono >= dev300-m22 ]
+mono-scp2.diff, rodo
+cli_ure-source-bootstrap-makefile-mk.diff, rodo
+cli_ure-mono-bridge.diff, rodo
+mono-build.diff, rodo
 build-mono-link.diff, jholesov
-
-cli_ure-prj-build-lst.diff
-
 # sign the output assembly using the key pair; it is needed to install
 # the versioned assemblies into the system Global Assembly Cache  (GAC)
+mono-build-keyfile.diff, rodo
+mono-climaker.diff, rodo
+climaker-csharp-win.diff, rodo
+buildfix-climaker-disabled.diff, rodo
+
+[ Mono < dev300-m22 >= beb300-m1 ]
+mono-scp2-m21.diff
+cli_ure-source-bootstrap-makefile-mk-m21.diff, rodo
+cli_ure-mono-bridge-m21.diff, rodo
+mono-build-m21.diff, rodo
+build-mono-link-m21.diff, jholesov
+mono-build-keyfile-m21.diff, rodo
+mono-climaker-m21.diff, rodo
+climaker-csharp-win-m21.diff, rodo
+buildfix-climaker-disabled-m21.diff, rodo
+
+[ Mono ]
+SectionOwner => rodo
 
-mono-build-keyfile.diff
+cli_ure-prj-build-lst.diff
 
 # climaker rewritten in C#
-mono-climaker.diff
 mono-climaker-config.diff
-climaker-csharp-win.diff
-buildfix-climaker-disabled.diff
 mono-climaker-bridgetest.diff
 
 [ VBAObjects ]
@@ -2057,6 +2070,7 @@
 xmloff-import-crash-fix-for-i90562.diff, i#90562, flr
 
 [ EMFPlus ]
+SectionOwner => rodo
 emf+-canvas.diff
 emf+-canvas-line-width.diff
 emf+-canvas-vcl-clear.diff
@@ -2066,7 +2080,6 @@
 emf+-cppcanvas-renderer.diff
 emf+-cppcanvas-emfplus.diff
 emf+-cppcanvas-polyaction.diff
-emf+-offapi.diff
 emf+-offapi-renderer.diff
 emf+-vcl-bitmap.diff
 emf+-vcl-renderer.diff
@@ -2080,6 +2093,9 @@
 emf+-use-canvas-only-for-emf+.diff, rodo
 emf+-embedded-mf-image.diff, rodo
 
+[ EMFPlus < dev300-m22 >= beb300-m1 ]
+emf+-offapi.diff
+
 [ LinkWarningDlg ]
 linkwarn-dlg-in-apps.diff, n#348149, thorsten
 linkwarn-sfx2-disable-cb-persistency.diff, n#348149, thorsten

Modified: trunk/patches/mono/build-mono-link.diff
==============================================================================
--- trunk/patches/mono/build-mono-link.diff	(original)
+++ trunk/patches/mono/build-mono-link.diff	Wed Jul  2 13:50:50 2008
@@ -46,8 +46,8 @@
  	+$(WRAPCMD) AL.exe -out:$@ \
  			-version:$(CLI_TYPES_POLICY_VERSION) \
  			-keyfile:$(BIN)$/cliuno.snk \
--			-link:$(BIN)$/cli_types.config
-+			-link:cli_types.config,$(BIN)$/cli_types.config
+-			-link:$(BIN)$/cli_uretypes.config
++			-link:cli_uretypes.config,$(BIN)$/cli_uretypes.config
  
  #Create the config file that is used with the policy assembly
- $(BIN)$/cli_types.config: cli_types_config $(BIN)$/cliureversion.mk 
+ $(BIN)$/cli_uretypes.config: cli_uretypes_config $(BIN)$/cliureversion.mk 

Modified: trunk/patches/mono/buildfix-climaker-disabled.diff
==============================================================================
--- trunk/patches/mono/buildfix-climaker-disabled.diff	(original)
+++ trunk/patches/mono/buildfix-climaker-disabled.diff	Wed Jul  2 13:50:50 2008
@@ -28,18 +28,3 @@
  
  NO_OFFUH=TRUE
  CPPUMAKERFLAGS =
-@@ -128,11 +132,11 @@ $(BIN)$/climaker.exe.config : climaker.e
- 	$(GNUCOPY) -f $? $@
- .IF "$(USE_SHELL)"!="4nt"
- 	chmod +x $@
--.ENDIF
-+.ENDIF # "$(USE_SHELL)"!="4nt"
- 
- .INCLUDE :  target.mk
- .INCLUDE : $(PRJ)$/util$/target.pmk
- 
--.ENDIF
-+.ENDIF # "$(BUILD_FOR_CLI)" == ""
- 
--.ENDIF
-+.ENDIF # "$(ENABLE_MONO)" == "YES"

Modified: trunk/patches/mono/cli_ure-mono-bridge.diff
==============================================================================
--- trunk/patches/mono/cli_ure-mono-bridge.diff	(original)
+++ trunk/patches/mono/cli_ure-mono-bridge.diff	Wed Jul  2 13:50:50 2008
@@ -1453,7 +1453,7 @@
 +            isPolymorphic = true;
 +        }
 +        
-+        result = Type.GetType(loadName + ",cli_types");
++        result = Type.GetType(loadName + ",cli_uretypes");
 +
 +        if (result == null)
 +            result = Type.GetType(loadName + ",cli_basetypes");
@@ -2397,7 +2397,7 @@
 +		-out:$@						\
 +		-keyfile:$(BIN)$/cliuno.snk \
 +		-reference:$(BIN)$/cli_basetypes.dll	\
-+		-reference:$(BIN)$/cli_types.dll	\
++		-reference:$(BIN)$/cli_uretypes.dll	\
 +		$(CSFILES)
 +
 +SLOFILES=                       \

Modified: trunk/patches/mono/cli_ure-source-bootstrap-makefile-mk.diff
==============================================================================
--- trunk/patches/mono/cli_ure-source-bootstrap-makefile-mk.diff	(original)
+++ trunk/patches/mono/cli_ure-source-bootstrap-makefile-mk.diff	Wed Jul  2 13:50:50 2008
@@ -79,14 +79,14 @@
 +
 +EXTERNAL_DIR=$(PRJ)$/..$/external/cli
 +
-+$(OUT)$/bin$/cli_types.dll : $(EXTERNAL_DIR)$/cli_types.dll
++$(OUT)$/bin$/cli_uretypes.dll : $(EXTERNAL_DIR)$/cli_uretypes.dll
 +	+$(COPY) $< $@
 +
-+$(BIN)$/cli_cppuhelper.dll : $(CSFILES) $(OUT)$/bin$/cli_types.dll
++$(BIN)$/cli_cppuhelper.dll : $(CSFILES) $(OUT)$/bin$/cli_uretypes.dll
 +	+$(CSC) $(CSCFLAGS) \
 +		-target:library \
 +		-out:$@ \
-+		-reference:$(OUT)$/bin$/cli_types.dll \
++		-reference:$(OUT)$/bin$/cli_uretypes.dll \
 +		-reference:System.dll \
 +		$(CSFILES)
 +	@echo "If code has changed then provide a policy assembly and change the version!"

Modified: trunk/patches/mono/climaker-csharp-win.diff
==============================================================================
--- trunk/patches/mono/climaker-csharp-win.diff	(original)
+++ trunk/patches/mono/climaker-csharp-win.diff	Wed Jul  2 13:50:50 2008
@@ -310,7 +310,7 @@
 diff -rup cli_ure-bak/source/climaker/makefile.mk cli_ure/source/climaker/makefile.mk
 --- cli_ure-bak/source/climaker/makefile.mk	2007-03-29 16:22:58.000000000 +0200
 +++ cli_ure/source/climaker/makefile.mk	2007-03-29 16:26:16.000000000 +0200
-@@ -103,48 +103,26 @@ UNOTYPES = \
+@@ -103,47 +103,29 @@ UNOTYPES = \
  	com.sun.star.reflection.XSingletonTypeDescription2		\
  	com.sun.star.reflection.XStructTypeDescription
  
@@ -355,37 +355,29 @@
 -
 -$(OBJFILES): $(BIN)$/cli_basetypes.dll
 -
--ALLTAR : $(BIN)$/climaker.exe.config
-+SLOFILES = $(SLO)$/climaker_mono.obj
-+SHL1OBJS=$(SLOFILES)
-+SHL1STDLIBS=$(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-+SHL1TARGET=$(TARGET)
-+SHL1IMPLIB=i$(TARGET).lib
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1VERSIONMAP=climaker.map
 +
-+DEF1NAME=$(SHL1TARGET)
++# Comment out - it seems this is no longer necessary (?)
 +
-+ALLTAR : $(BIN)/climaker.exe $(BIN)$/climaker.exe.config
-+
-+CSFILES = climaker_csharp.cs
-+
-+$(BIN)/climaker.exe:   $(CSFILES)
-+        +$(CSC) $(CSCFLAGS) -debug:full \
-+                -out:$@ \
-+                -reference:$(OUT)$/bin$/cli_basetypes.dll \
-+                -reference:System.dll \
-+                $(CSFILES)
- 
- $(BIN)$/climaker.exe.config : climaker.exe.config
- 	$(GNUCOPY) -f $? $@
-@@ -152,6 +130,9 @@ $(BIN)$/climaker.exe.config : climaker.e
- 	+chmod +x $@
- .ENDIF
++#SLOFILES = $(SLO)$/climaker_mono.obj
++#SHL1OBJS=$(SLOFILES)
++#SHL1STDLIBS=$(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
++#SHL1TARGET=$(TARGET)
++#SHL1IMPLIB=i$(TARGET).lib
++#SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++#SHL1VERSIONMAP=climaker.map
++#
++#DEF1NAME=$(SHL1TARGET)
++#
++#ALLTAR : $(BIN)/climaker.exe $(BIN)$/climaker.exe.config
++#
++#CSFILES = climaker_csharp.cs
++#
++#$(BIN)/climaker.exe:   $(CSFILES)
++#        +$(CSC) $(CSCFLAGS) -debug:full \
++#                -out:$@ \
++#                -reference:$(OUT)$/bin$/cli_basetypes.dll \
++#                -reference:System.dll \
++#                $(CSFILES)
  
-+.INCLUDE :  target.mk
-+.INCLUDE : $(PRJ)$/util$/target.pmk
-+
  .ENDIF
  
- .ENDIF

Modified: trunk/patches/mono/mono-build-keyfile.diff
==============================================================================
--- trunk/patches/mono/mono-build-keyfile.diff	(original)
+++ trunk/patches/mono/mono-build-keyfile.diff	Wed Jul  2 13:50:50 2008
@@ -15,7 +15,7 @@
  		-target:library \
  		-out:$@ \
 +		-keyfile:$(BIN)$/cliuno.snk \
- 		-reference:$(OUT)$/bin$/cli_types.dll \
+ 		-reference:$(OUT)$/bin$/cli_uretypes.dll \
  		-reference:System.dll \
  		$(CSFILES)
 --- cli_ure/prj/d.lst.old	2006-09-05 20:19:35.000000000 +0200
@@ -36,6 +36,6 @@
  		-target:library \
  		-out:$@ \
 +		-keyfile:$(BIN)$/cliuno.snk \
- 		-reference:$(OUT)$/bin$/cli_types.dll \
+ 		-reference:$(OUT)$/bin$/cli_uretypes.dll \
  		-reference:System.dll \
  		$(CSFILES)

Modified: trunk/patches/mono/mono-build.diff
==============================================================================
--- trunk/patches/mono/mono-build.diff	(original)
+++ trunk/patches/mono/mono-build.diff	Wed Jul  2 13:50:50 2008
@@ -140,29 +140,31 @@
 ===================================================================
 --- cli_ure/prj/build.lst       9 May 2007 13:29:37 -0000       1.11
 +++ cli_ure/prj/build.lst       4 Jul 2007 16:37:10 -0000
-@@ -2,12 +2,13 @@
- ure    cli_ure                                         usr1    -       all     ure_mkout NULL
- ure    cli_ure\inc                                     nmake   -   all   ure_inc NULL
- ure    cli_ure\version                         nmake   -   all   ure_source_version ure_inc NULL
--ure    cli_ure\source                          nmake   -   w,vc7   ure_source_source ure_inc NULL
--ure    cli_ure\source\basetypes        nmake   -       w,vc7   ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
--ure    cli_ure\source\climaker         nmake   -       w,vc7   ure_source_climaker ure_source_basetypes.w ure_inc NULL
--ure    cli_ure\unotypes                        nmake   -       w,vc7   ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
--ure    cli_ure\source\ure                      nmake   -       w,vc7   ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
+@@ -2,13 +2,13 @@
+ ure	cli_ure						usr1	-	all	ure_mkout NULL
+ ure	cli_ure\inc					nmake   -   all   ure_inc NULL
+ ure	cli_ure\version				nmake   -   all   ure_source_version ure_inc NULL
+-ure	cli_ure\source				nmake   -   w,vc7   ure_source_source ure_inc NULL
+-ure	cli_ure\source\basetypes	nmake	-	w,vc7	ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
+-ure	cli_ure\source\climaker		nmake	-	w,vc7	ure_source_climaker ure_source_basetypes.w ure_inc NULL
+-ure	cli_ure\unotypes			nmake	-	w,vc7	ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
+-ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
 -ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
 -ure	cli_ure\source\mono_bridge      nmake   -       u       ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
--ure    cli_ure\source\native           nmake   -       w,vc7   ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
--#ure   cli_ure\util                    nmake   -       w,vc7   ure_util ure_source_ure.w ure_source_native.w NULL
-+ure	cli_ure\source                          nmake   -   all   ure_source_source ure_inc NULL
+-ure	cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
+-
+-#ure	cli_ure\util					nmake	-		w,vc7	ure_util ure_source_ure.w ure_source_native.w NULL
++ure	cli_ure\source					nmake   -		all		ure_source_source ure_inc NULL
 +ure	cli_ure\source\basetypes        nmake   -       all     ure_source_basetypes ure_source_version ure_source_source ure_inc NULL
 +ure	cli_ure\source\bootstrap        nmake   -       u       ure_source_bootstrap ure_source_source ure_source_basetypes ure_inc NULL
 +ure	cli_ure\source\climaker         nmake   -       all     ure_source_climaker ure_source_basetypes ure_inc NULL
-+ure	cli_ure\unotypes                        nmake   -       all     ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
-+ure	cli_ure\source\ure                      nmake   -       all     ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
-+ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
++ure	cli_ure\unotypes				nmake   -       all     ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
++ure	cli_ure\source\ure				nmake   -       all     ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
++ure	cli_ure\source\uno_bridge		nmake	-		w,vc7	ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
 +ure	cli_ure\source\mono_bridge      nmake   -       u       ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
 +ure	cli_ure\source\native           nmake   -       w,vc7   ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
 +#ure	cli_ure\util                    nmake   -       w,vc7   ure_util ure_source_ure ure_source_native NULL
+
 Index: cli_ure/prj/d.lst
 ===================================================================
 --- cli_ure/prj/d.lst.orig	2006-01-08 20:48:38.000000000 +0100

Modified: trunk/patches/mono/mono-climaker.diff
==============================================================================
--- trunk/patches/mono/mono-climaker.diff	(original)
+++ trunk/patches/mono/mono-climaker.diff	Wed Jul  2 13:50:50 2008
@@ -7,12 +7,12 @@
  
 +.IF "$(ENABLE_MONO_CLIMAKER)" != "YES"
 +
- $(OUT)$/bin$/cli_types.dll : $(EXTERNAL_DIR)$/cli_types.dll
+ $(OUT)$/bin$/cli_uretypes.dll : $(EXTERNAL_DIR)$/cli_uretypes.dll
  	+$(COPY) $< $@
  
 +.ENDIF
 +
- $(BIN)$/cli_cppuhelper.dll : $(CSFILES) $(OUT)$/bin$/cli_types.dll
+ $(BIN)$/cli_cppuhelper.dll : $(CSFILES) $(OUT)$/bin$/cli_uretypes.dll
  	+$(CSC) $(CSCFLAGS) \
  		-target:library \
 diff -rup cli_ure-orig/source/climaker/makefile.mk cli_ure/source/climaker/makefile.mk
@@ -77,25 +77,26 @@
  .INCLUDE : $(BIN)$/cliureversion.mk
  
 @@ -64,8 +71,8 @@ CLIMAKERFLAGS += --verbose
- 
+ .ENDIF
  
  #When changing the assembly version then this must also be done in scp2
--$(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/climaker.exe $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
--	$(WRAPCMD) $(OUT)$/bin$/climaker.exe $(CLIMAKERFLAGS) \
-+$(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/$(CLIMAKER) $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
-+	$(WRAPCMD) $(OUT)$/bin$/$(CLIMAKER) $(CLIMAKERFLAGS) \
+-$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/climaker.exe $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
+-	$(WRAPCMD) $(BIN)$/climaker.exe $(CLIMAKERFLAGS) \
++$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/$(CLIMAKER) $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
++	$(WRAPCMD) $(BIN)$/$(CLIMAKER) $(CLIMAKERFLAGS) \
  		--out $@ \
-                 --keyfile $(BIN)$/cliuno.snk \
- 		--assembly-version $(CLI_TYPES_NEW_VERSION) \
+ 		--keyfile $(BIN)$/cliuno.snk \
+ 		--assembly-version $(CLI_URETYPES_NEW_VERSION) \
 @@ -78,7 +85,7 @@ $(OUT)$/bin$/cli_types.dll : $(OUT)$/bin
- #do not forget to deliver cli_types.config. It is NOT embedded in the policy file.
- # iz62624: Add dependency for "$(OUT)$/bin$/cli_types.dll" because climaker locks cliuno.mk.
- $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_types.config $(OUT)$/bin$/cli_types.dll
+ 
+ #do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.
+ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_uretypes.config $(OUT)$/bin$/cli_uretypes.dll
 -	$(WRAPCMD) AL.exe -out:$@ \
 +	$(WRAPCMD) $(AL) -out:$@ \
- 			-version:$(CLI_TYPES_POLICY_VERSION) \
+ 			-version:$(CLI_URETYPES_POLICY_VERSION) \
  			-keyfile:$(BIN)$/cliuno.snk \
- 			-link:cli_types.config,$(BIN)$/cli_types.config
+ 			-link:cli_uretypes.config,$(BIN)$/cli_uretypes.config
+
 --- /dev/null	2007-01-26 18:41:26.000000000 +0100
 +++ cli_ure/source/climaker/climaker_mono.cxx	2007-02-16 21:05:58.000000000 +0100
 @@ -0,0 +1,1247 @@
@@ -3165,8 +3166,8 @@
 +    IntPtr mUnoHelper;
 +
 +//     string mOutputDir = "./";
-+//     string mOutputFile = "cli_types.dll";
-+//     string mName = "cli_types";
++//     string mOutputFile = "cli_uretypes.dll";
++//     string mName = "cli_uretypes";
 +
 +	string mOutputDir;
 +	string mOutputFile;
@@ -4375,7 +4376,7 @@
 +		" -h, --help                    this message\n" +
 +		"\n" +
 +		"example: climaker --out cli_mytypes.dll \\\n" +
-+		"                  --reference cli_types.dll \\\n" +
++		"                  --reference cli_uretypes.dll \\\n" +
 +		"                  --extra types.rdb \\\n" +
 +		"                  mytypes.rdb\n" +
 +		"\n";

Modified: trunk/patches/mono/mono-scp2.diff
==============================================================================
--- trunk/patches/mono/mono-scp2.diff	(original)
+++ trunk/patches/mono/mono-scp2.diff	Wed Jul  2 13:50:50 2008
@@ -17,91 +17,3 @@
  SCPDEFS+=-DSYSTEM_SNDFILE
  .ENDIF
 
-Index: scp2/source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.96
-diff -u -r1.96 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp	30 Mar 2005 11:40:14 -0000	1.96
-+++ scp2/source/ooo/file_library_ooo.scp	7 Apr 2005 17:06:32 -0000
-@@ -219,7 +219,7 @@
- 
- #endif
- 
--#if defined WNT && (defined M1400 || defined M1310) // currently the only cli platform
-+#if defined ENABLE_MONO || (defined WNT && (defined M1400 || defined M1310)) // currently the only cli platform
- 
- File gid_File_Lib_Cli_Cppuhelper_Assembly
-     TXT_FILE_BODY;
-@@ -246,7 +246,7 @@
- 
- #endif
- 
--#if defined WNT && (defined M1400 || defined M1310) // currently the only cli platform
-+#if defined ENABLE_MONO || (defined WNT && (defined M1400 || defined M1310)) // currently the only cli platform
- 
- File gid_File_Lib_Cli_Types_Assembly
-     TXT_FILE_BODY;
-@@ -273,7 +273,7 @@
- 
- #endif
- 
--#if defined WNT && (defined M1400 || defined M1310) // currently the only cli platform
-+#if defined ENABLE_MONO || (defined WNT && (defined M1400 || defined M1310)) // currently the only cli platform
- 
- File gid_File_Lib_Cli_Basetypes_Assembly
-     TXT_FILE_BODY;
-@@ -300,6 +300,44 @@
- 
- #endif
- 
-+#ifdef ENABLE_MONO
-+
-+File gid_File_Lib_Cli_Uno_Glue
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+    Dir = gid_Dir_Program;
-+  #ifdef UNX
-+    Name = STRING(CONCAT2(libcli_uno_glue,UNXSUFFIX));
-+  #else
-+    Name = "cli_uno_glue.dll";
-+  #endif
-+End
-+
-+File gid_File_Lib_Cli_Uno
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+    Dir = gid_Dir_Program;
-+  #ifdef UNX
-+    Name = STRING(CONCAT2(libcli_uno,UNXSUFFIX));
-+  #else
-+    Name = "cli_uno.dll";
-+  #endif
-+End
-+
-+File gid_File_Lib_Cli_Uno_Bridge_Assembly
-+    TXT_FILE_BODY;
-+    Styles = (PACKED, ASSEMBLY);
-+    Name = "cli_uno_bridge.dll";
-+    Dir = gid_Dir_Program;
-+    Assemblyname = "cli_uno_bridge";
-+    PublicKeyToken = "ce2cb7e279207b9e";
-+    Version = "1.0.0.0";
-+    Culture = "neutral";
-+    Attributes = "0";
-+End
-+
-+#endif
-+
- #if defined WNT && (defined M1400 || defined M1310) // currently the only cli platform
- 
- File gid_File_Lib_Cli_Ure
-@@ -311,7 +349,7 @@
- 
- #endif
- 
--#if defined WNT && (defined M1400 || defined M1310) // currently the only cli platform
-+#if defined ENABLE_MONO || (defined WNT && (defined M1400 || defined M1310)) // currently the only cli platform
- 
- File gid_File_Lib_Cli_Ure_Assembly
-     TXT_FILE_BODY;

Modified: trunk/scratch/split/ooo3_bootstrap.spec
==============================================================================
--- trunk/scratch/split/ooo3_bootstrap.spec	(original)
+++ trunk/scratch/split/ooo3_bootstrap.spec	Wed Jul  2 13:50:50 2008
@@ -127,11 +127,11 @@
 %define	      ooo_home		ooo-3
 %define	      ooo_build_dir	build
 %define	      ooo_build_version 2.99.4
-%define	      ooo_build_tag     dev300-m19
+%define	      ooo_build_tag     dev300-m22
 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:        1
+Release:        3
 AutoReqProv:    on
 PreReq:         coreutils /usr/bin/update-mime-database
 PreReq:         %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq}

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Wed Jul  2 13:50:50 2008
@@ -12,14 +12,14 @@
 
 %define         piece ure
 Name:           ooo3_%piece
-BuildRequires:  ooo3_base-devel
+BuildRequires:  ooo3_bootstrap-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m19
+%define	      ooo_build_tag     dev300-m22
 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:        1
+Release:        3
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -44,14 +44,20 @@
 
 #setup env.
 OO_INSTDIR=%{_libdir}/%ooo_home/
-OO_SOLVERDIR=%{_libdir}/%ooo_home/solver
-OO_TOOLSDIR=%{_libdir}/%ooo_home/ooo-build/bin
+OO_SOLVERDIR=$OO_INSTDIR/solver
+OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 
+$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE `pwd` 
 source $OO_TOOLSDIR/piece/sys-setup
 $OO_TOOLSDIR/piece/build-%piece
 
 %install
 
+#setup env.
+OO_INSTDIR=%{_libdir}/%ooo_home/
+OO_SOLVERDIR=$OO_INSTDIR/solver
+OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+
 source $OO_TOOLSDIR/piece/sys-setup
 $OO_TOOLSDIR/piece/install-%piece
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]