GNOME.org
 

ooo-build r13731 - in trunk: . bin bin/piece patches/dev300 patches/mono src

Author: pmladek
Date: Fri Aug 29 15:40:28 2008
New Revision: 13731
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13731&view=rev

Log:
2008-08-29  Petr Mladek  <pmladek suse cz>

	* patches/dev300/piece-unoil.diff, patches/dev300/piece-cli_ure.diff:
	* patches/dev300/apply: fix the split build with mono enabled

	* patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff:
	  fix for mono, version 2.0

	* bin/piece/sys-setup.in, bin/piece/Makefile.am, configure.in:
	* bin/piece/build-generic, bin/piece/install-generic: remember
	  the DISTRO and OO_INSTDIR setting when building bootstrap, so we do
	  not need to pass them for build-generic and install-generic again
	  and again
	* bin/piece/sys-setup: was renamed to sys-setup.in
	
	* bin/piece/build-generic: bin hardcoded /usr/lib/ooo-3
	* bin/piece/install-bootstrap, bin/package-ooo: fix permitions of the
	  devel stuff

	* bin/unpack: install unowinreg.dll also when building bootstrap

	* src/setup_native_packinfo-ooo300-m3.tar.bz2: update for ooo300-m3
	* src/setup_native_packinfo-m25.tar.bz2: bin obsolete



Added:
   trunk/bin/piece/sys-setup.in   (contents, props changed)
      - copied, changed from r13730, /trunk/bin/piece/sys-setup
   trunk/patches/dev300/piece-cli_ure.diff
   trunk/src/setup_native_packinfo-ooo300-m3.tar.bz2   (contents, props changed)
Removed:
   trunk/bin/piece/sys-setup
   trunk/src/setup_native_packinfo-m25.tar.bz2
Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/bin/piece/Makefile.am
   trunk/bin/piece/build-generic
   trunk/bin/piece/install-bootstrap
   trunk/bin/piece/install-generic
   trunk/bin/unpack
   trunk/configure.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-unoil.diff
   trunk/patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Fri Aug 29 15:40:28 2008
@@ -20,11 +20,17 @@
     DEST=$OOINSTDIR/solver
     mkdir -p $DEST
     cp -R $SRCDIR/* $DEST
+
 #    ln -sf $OOBUILDDIR/solver/$UPD/$INPATH .
     if test -f "$TOOLSDIR/bin/piece/install-$PIECE"; then
 	echo "$PIECE specific install"
 	source $TOOLSDIR/bin/piece/install-$PIECE || exit 1
     fi
+
+    find $OOINSTDIR/solenv $OOINSTDIR/solver -depth -name "CVS" -type d -exec rm -rf {} \;
+    find $OOINSTDIR/solenv $OOINSTDIR/solver -name "*.orig" -exec rm -rf {} \;
+    find $OOINSTDIR/solenv $OOINSTDIR/solver -type f -exec chmod go-w {} \;
+
     exit 0;
 fi
 

Modified: trunk/bin/piece/Makefile.am
==============================================================================
--- trunk/bin/piece/Makefile.am	(original)
+++ trunk/bin/piece/Makefile.am	Fri Aug 29 15:40:28 2008
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-	sys-setup \
+	sys-setup.in \
 	unpack-l10n \
 	copyexcept \
 	noulf noulfconv \

Modified: trunk/bin/piece/build-generic
==============================================================================
--- trunk/bin/piece/build-generic	(original)
+++ trunk/bin/piece/build-generic	Fri Aug 29 15:40:28 2008
@@ -2,7 +2,6 @@
 
 piece=$1
 ooo_build_tag=$2
-distro=$3
 
 source $OO_TOOLSDIR/piece/sys-setup
 
@@ -24,7 +23,7 @@
 # drop --distro=Localize for now ...
 $OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces \
 	--tag=$ooo_build_tag \
-	--distro=$distro --distro=Piece --distro=Binfilter \
+	--distro=$DISTRO --distro=Piece --distro=Binfilter \
 	--distro=System --distro=Sdk --distro=swext \
 	 `pwd` || exit 1;
 

Modified: trunk/bin/piece/install-bootstrap
==============================================================================
--- trunk/bin/piece/install-bootstrap	(original)
+++ trunk/bin/piece/install-bootstrap	Fri Aug 29 15:40:28 2008
@@ -32,4 +32,8 @@
    $TOOLSDIR/src/*.odb \
    $OOINSTDIR/ooo-build/src
 
+find $OOINSTDIR/ooo-build -depth -name "CVS" -type d -exec rm -rf {} \;
+find $OOINSTDIR/ooo-build -name "*.orig" -exec rm -rf {} \;
+find $OOINSTDIR/ooo-build -type f -exec chmod go-w {} \;
+
 echo "done bootstrap specific install"

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Fri Aug 29 15:40:28 2008
@@ -2,13 +2,12 @@
 
 piece=$1
 ooo_build_tag=$2
-distro=$3
 
 source $OO_TOOLSDIR/piece/sys-setup
 
 custom_install="$OO_TOOLSDIR/piece/inst-$piece"
 if test -f $custom_install; then
-    $custom_install $piece $ooo_build_tag $distro
+    $custom_install $piece $ooo_build_tag $DISTRO
 fi
 
 # ----- monster make_installer section -----
@@ -29,7 +28,7 @@
 fi
 
 perl -w $SOLARENV/bin/make_installer.pl \
-     -f /usr/lib/ooo-3/solver/instsetoo_native/util/openoffice.lst \
+     -f $OO_INSTDIR/solver/instsetoo_native/util/openoffice.lst \
      -l $LANGS -p OpenOffice -debug -verbose -log -buildid $BUILD -destdir $DESTDIR \
      -dontstrip -simple $OO_INSTDIR
 

Copied: trunk/bin/piece/sys-setup.in (from r13730, /trunk/bin/piece/sys-setup)
==============================================================================
--- /trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup.in	Fri Aug 29 15:40:28 2008
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# stuff from configure
+export DISTRO='@DISTRO@'
+export OO_INSTDIR= libdir@/@OOOINSTALLDIRNAME@
+
 if test "z$OO_INSTDIR" == "z"; then
     echo "Error: missing oo instdir"
     exit 1

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Fri Aug 29 15:40:28 2008
@@ -187,7 +187,7 @@
 		ln -s "$BUILDDIR/$CVSTAG-$PIECE" $OOBUILDDIR
 		# ugly hack around odd positioning of this info
 		echo "Unpacking setup_native .txt pieces"
-		($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-m25.tar.bz2 | $GNUTAR xpf - ) || exit
+		($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-ooo300-m3.tar.bz2 | $GNUTAR xpf - ) || exit
 	fi
 fi
 
@@ -243,11 +243,15 @@
     done
     ;;
 esac
+fi
+
 
 # copy in unowinreg.dll if we need to
 # it is necessary in ODK
 # it can be built even on linux by mingw32, though
+if test "z$PIECE" = "z" -o "z$PIECE" = "zbootstrap" ; then
 if test "$USE_PREBUILD_UNOWINREG_DLL" = "YES" ; then
+    mkdir -p $OOBUILDDIR/external/unowinreg/ || exit 1;
     $GNUCP -f $SRCDIR/unowinreg.dll $OOBUILDDIR/external/unowinreg/ || exit 1;
 fi
 fi

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Aug 29 15:40:28 2008
@@ -1252,6 +1252,7 @@
 Makefile
 bin/setup
 bin/Makefile
+bin/piece/sys-setup
 bin/piece/Makefile
 desktop/Makefile
 desktop/16x16/Makefile

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Aug 29 15:40:28 2008
@@ -2547,6 +2547,7 @@
 piece-postprocess.diff
 piece-packimages.diff
 piece-automation.diff
+piece-cli_ure.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Added: trunk/patches/dev300/piece-cli_ure.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-cli_ure.diff	Fri Aug 29 15:40:28 2008
@@ -0,0 +1,39 @@
+--- cli_ure/unotypes/makefile.mk.old	2008-08-29 13:34:51.000000000 +0200
++++ cli_ure/unotypes/makefile.mk	2008-08-29 14:29:05.000000000 +0200
+@@ -44,7 +44,7 @@ TARGET = unotypes
+ .IF "$(BUILD_FOR_CLI)" != "" && ("$(GUI)" == "WNT" || "$(ENABLE_MONO_CLIMAKER)" == "YES")
+ 
+ .IF "$(ENABLE_MONO_CLIMAKER)" == "YES"
+-WRAPCMD=MONO_PATH=$(OUT)/bin:$(MONO_PATH) LD_LIBRARY_PATH=$(SOLARLIBDIR):$(OUT)/lib
++WRAPCMD=MONO_PATH=$(OUT)/bin:$(MONO_PATH) LD_LIBRARY_PATH=$(SOLARLIBDIR):$(SOLARPIECE)$/$(INPATH)$/lib:$(OUT)/lib
+ CLIMAKER=climaker
+ .ELSE
+ CLIMAKER=climaker.exe
+@@ -64,14 +64,14 @@ CLIMAKERFLAGS += --verbose
+ .ENDIF
+ 
+ #When changing the assembly version then this must also be done in scp2
+-$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/$(CLIMAKER) $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
++$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/$(CLIMAKER) $(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb $(BIN)$/cliureversion.mk
+ 	$(WRAPCMD) $(BIN)$/$(CLIMAKER) $(CLIMAKERFLAGS) \
+ 		--out $@ \
+ 		--keyfile $(BIN)$/cliuno.snk \
+ 		--assembly-version $(CLI_URETYPES_NEW_VERSION) \
+ 		--assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
+ 		--assembly-company "OpenOffice.org" \
+-		$(SOLARBINDIR)$/udkapi.rdb
++		$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
+ 
+ #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
+--- cli_ure/qa/climaker/makefile.mk.old	2008-06-25 14:05:37.000000000 +0200
++++ cli_ure/qa/climaker/makefile.mk	2008-08-29 13:50:49.000000000 +0200
+@@ -106,7 +106,7 @@ $(OUTDIR)$/types.rdb: $(OUTDIR)$/types.u
+ $(OUTDIR)$/cli_test_types.dll: $(OUTDIR)$/types.rdb $(BIN)$/climaker.exe $(BIN)$/cli_uretypes.dll
+     $(CLIMAKER) $(CLIMAKERFLAGS) --out $@  \
+ 		-r $(BIN)$/cli_uretypes.dll \
+-		-X $(SOLARBINDIR)$/types.rdb \
++		-X $(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb \
+ 		$(OUTDIR)$/types.rdb
+ 
+ 

Modified: trunk/patches/dev300/piece-unoil.diff
==============================================================================
--- trunk/patches/dev300/piece-unoil.diff	(original)
+++ trunk/patches/dev300/piece-unoil.diff	Fri Aug 29 15:40:28 2008
@@ -12,3 +12,50 @@
  
  .INCLUDE: target.mk
  
+--- unoil/climaker/makefile.mk.old	2008-08-29 16:01:05.000000000 +0200
++++ unoil/climaker/makefile.mk	2008-08-29 16:13:28.000000000 +0200
+@@ -61,11 +61,11 @@ ALLTAR : \
+ 
+ .IF "$(ENABLE_MONO_CLIMAKER)" == "YES"
+ 
+-CLIMAKER=$(SOLARBINDIR)$/climaker
++CLIMAKER=$(SOLARPIECE)$/$(INPATH)$/bin$/climaker
+ 
+ .ELSE
+ 
+-CLIMAKER=$(WRAPCMD) $(SOLARBINDIR)$/climaker.exe
++CLIMAKER=$(WRAPCMD) $(SOLARPIECE)$/$(INPATH)$/bin$/climaker.exe
+ 
+ .ENDIF
+ 
+@@ -75,8 +75,8 @@ CLIMAKERFLAGS =
+ CLIMAKERFLAGS += --verbose
+ .ENDIF
+ 
+-RDB = $(SOLARBINDIR)$/offapi.rdb
+-EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
++RDB = $(SOLARPIECE)$/$(INPATH)$/bin$/offapi.rdb
++EXTRA_RDB = $(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
+ 
+ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt
+ 	$(CLIMAKER) $(CLIMAKERFLAGS) \
+@@ -85,8 +85,8 @@ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA
+ 		--assembly-company "OpenOffice.org" \
+ 		--assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
+ 		-X $(EXTRA_RDB) \
+-		-r $(SOLARBINDIR)$/cli_uretypes.dll \
+-        --keyfile $(SOLARBINDIR)$/cliuno.snk \
++		-r $(SOLARPIECE)$/$(INPATH)$/bin$/cli_uretypes.dll \
++        --keyfile $(SOLARPIECE)$/$(INPATH)$/bin$/cliuno.snk \
+ 		$(RDB)
+ 		
+ 
+@@ -100,7 +100,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_oo
+ 	$(GNUCOPY) $(BIN)$/cli_oootypes.config .
+ 	$(WRAPCMD) $(AL) -out:$@ \
+ 			 -version:$(CLI_OOOTYPES_POLICY_VERSION) \
+-			 -keyfile:$(SOLARBINDIR)$/cliuno.snk \
++			 -keyfile:$(SOLARPIECE)$/$(INPATH)$/bin$/cliuno.snk \
+ 			 -link:cli_oootypes.config
+ 	$(RM) cli_oootypes.config
+ 

Modified: trunk/patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff
==============================================================================
--- trunk/patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff	(original)
+++ trunk/patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff	Fri Aug 29 15:40:28 2008
@@ -118,7 +118,7 @@
 +
 +    static object ExtractObject(IntPtr managed)
 +    {
-+        GCHandle handle = GCHandle.op_Explicit(managed);
++        GCHandle handle = (GCHandle)managed;
 +        object ret = handle.Target;
 +        handle.Free();
 +        return ret;

Added: trunk/src/setup_native_packinfo-ooo300-m3.tar.bz2
==============================================================================
Binary file. No diff available.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]