GNOME.org
 

ooo-build r14748 - in trunk: . bin/piece patches/dev300

Author: pmladek
Date: Thu Dec  4 15:57:49 2008
New Revision: 14748
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14748&view=rev

Log:
2008-12-04  Petr Mladek  <pmladek suse cz>

	* patches/dev300/buildfix-openjdk-6-no-rhino.diff: improve to add
	  all *.jar files (except for rhino.jar) to the bootclasspath;
	  it fixes build with IBM Java where more .jars are needed and
	  the list might be version-dependent (bnc#449711)

	* patches/dev300/pyuno-python-2.6-uno-import.diff, patches/dev300/apply:
	  fixed uno_import function for python-2.6; fixed mail merge
	  (bnc#448776); many thanks to Jan Matejek for the patch

	* bin/piece/install-generic, bin/piece/build-generic: allow to use
	  prebuilt cli dlls for older distributions and ppc

	* bin/piece/post-inst-postprocess:
	* bin/piece/file-list-libs_core:
	* bin/piece/file-list-calc:
	* bin/piece/file-list-writer:
	* bin/piece/file-list-libs_extern:
	* bin/piece/file-list-impress:
	* bin/piece/file-list-components: prune redundant basis3.0/ure-link
	  and solver/bin/userland.txt



Added:
   trunk/bin/piece/file-list-libs_extern   (contents, props changed)
   trunk/patches/dev300/pyuno-python-2.6-uno-import.diff
Modified:
   trunk/ChangeLog
   trunk/bin/piece/build-generic
   trunk/bin/piece/file-list-calc
   trunk/bin/piece/file-list-components
   trunk/bin/piece/file-list-impress
   trunk/bin/piece/file-list-libs_core
   trunk/bin/piece/file-list-writer
   trunk/bin/piece/install-generic
   trunk/bin/piece/post-inst-postprocess
   trunk/patches/dev300/apply
   trunk/patches/dev300/buildfix-openjdk-6-no-rhino.diff

Modified: trunk/bin/piece/build-generic
==============================================================================
--- trunk/bin/piece/build-generic	(original)
+++ trunk/bin/piece/build-generic	Thu Dec  4 15:57:49 2008
@@ -28,7 +28,11 @@
 	 `pwd` || exit 1;
 
 # available source dirs
-dirs=`/bin/ls | grep -v -e 'applied_patches' -e '^solver' -e 'ooo-build' | tr '\n' ':'`
+omit_dirs="-e applied_patches -e ^solver -e ooo-build"
+if test "$piece" != "libs_extern" ; then
+    omit_dirs="$omit_dirs -e ^external\$"
+fi
+dirs=`/bin/ls | grep -v $omit_dirs | tr '\n' ':'`
 # clean build?
 if test ! -d solver; then
     echo "A very clean straight-through build - deferring dep generation"

Modified: trunk/bin/piece/file-list-calc
==============================================================================
--- trunk/bin/piece/file-list-calc	(original)
+++ trunk/bin/piece/file-list-calc	Thu Dec  4 15:57:49 2008
@@ -10,3 +10,6 @@
 
 # install the prebuilt registry files
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"
+
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"

Modified: trunk/bin/piece/file-list-components
==============================================================================
--- trunk/bin/piece/file-list-components	(original)
+++ trunk/bin/piece/file-list-components	Thu Dec  4 15:57:49 2008
@@ -18,8 +18,11 @@
 
 # prune redundant files the scp2 likes to make for us
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
 remove_dir  "files-$piece.txt" "$OO_INSTDIR/ure"
+
 # solver is not in the file list, so rm is enough
 rm -f "$DESTDIR/$OO_INSTDIR/solver/bin/packinfo*.txt"
+rm -f "$DESTDIR/$OO_INSTDIR/solver/bin/userland.txt"
 
 exit 0

Modified: trunk/bin/piece/file-list-impress
==============================================================================
--- trunk/bin/piece/file-list-impress	(original)
+++ trunk/bin/piece/file-list-impress	Thu Dec  4 15:57:49 2008
@@ -15,3 +15,6 @@
 # install the prebuilt registry files
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "draw"
+
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"

Modified: trunk/bin/piece/file-list-libs_core
==============================================================================
--- trunk/bin/piece/file-list-libs_core	(original)
+++ trunk/bin/piece/file-list-libs_core	Thu Dec  4 15:57:49 2008
@@ -42,6 +42,7 @@
 
 # mess
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/program/services.rdb"
 remove_dir  "files-$piece.txt" "$OO_INSTDIR/ure"
 

Added: trunk/bin/piece/file-list-libs_extern
==============================================================================
--- (empty file)
+++ trunk/bin/piece/file-list-libs_extern	Thu Dec  4 15:57:49 2008
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+piece=$1
+ooo_build_tag=$2
+
+source $OO_TOOLSDIR/piece/sys-setup
+
+$OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
+
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+
+exit 0

Modified: trunk/bin/piece/file-list-writer
==============================================================================
--- trunk/bin/piece/file-list-writer	(original)
+++ trunk/bin/piece/file-list-writer	Thu Dec  4 15:57:49 2008
@@ -17,3 +17,6 @@
 # install the prebuilt registry files
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "math"
+
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Thu Dec  4 15:57:49 2008
@@ -52,6 +52,15 @@
 $OO_TOOLSDIR/piece/copyexcept -x $filelist $SRCDIR/* $DEST
 rm -f $filelist
 
+# FIXME: we need to provide external files also in other pieces (e.g. prebuild mono.dlls)
+#        external is automatically taken into build dependencies even when removed from
+#        the dirs list in build-generic
+#        => the build.lst and deliver.log must be deleted in other pieces to avoid conflict of devel packages
+if test "$piece" != "libs_extern" ; then
+    rm -f $DEST/inc/external/build.lst
+    rm -f $DEST/inc/external/deliver.log
+fi
+
 # hotfix post upstream install
 # allows to modify the install process from the piece package sources
 hotfix_post_upstream_install="ooo-build/bin/post-upstream-install"

Modified: trunk/bin/piece/post-inst-postprocess
==============================================================================
--- trunk/bin/piece/post-inst-postprocess	(original)
+++ trunk/bin/piece/post-inst-postprocess	Thu Dec  4 15:57:49 2008
@@ -40,5 +40,8 @@
 #        it has been already generated by bin/piece/file-list-ure
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/program/pythonloader.unorc"
 
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+
 # no need for solver bits at this late stage
 rm -Rf "$DESTDIR/$OO_INSTDIR/solver"

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Dec  4 15:57:49 2008
@@ -63,8 +63,8 @@
 SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, Java14, OpenGLTransitionsMesa703
 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, Java14
 SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, PostgreSQL
-SUSE-11.1 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL
-SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL
+SUSE-11.1 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL, Python26
+SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL, Python26
 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
 # Debian
 DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, BerkeleyDB43, Split, PostgreSQL
@@ -1112,6 +1112,11 @@
 # another fallback to load libhsqldb with JRE 1.4
 connectivity-load-libhsqldb-with-jre-1.4.diff, n#431360, pmladek
 
+[ Python26 ]
+
+# python2.6 has __import__ with four parameters
+pyuno-python-2.6-uno-import.diff, n#448776, pmladek
+
 [ GTK28 ]
 
 # gtk-2.8 does not know the link-color properties;

Modified: trunk/patches/dev300/buildfix-openjdk-6-no-rhino.diff
==============================================================================
--- trunk/patches/dev300/buildfix-openjdk-6-no-rhino.diff	(original)
+++ trunk/patches/dev300/buildfix-openjdk-6-no-rhino.diff	Thu Dec  4 15:57:49 2008
@@ -1,41 +1,62 @@
-? unxlngx6.pro
-Index: rhino1_5R5.patch
-===================================================================
-RCS file: /cvs/external/rhino/rhino1_5R5.patch,v
-retrieving revision 1.3
-diff -u -r1.3 rhino1_5R5.patch
---- rhino/rhino1_5R5.patch	11 Apr 2008 07:03:06 -0000	1.3
-+++ rhino/rhino1_5R5.patch	12 Aug 2008 20:08:16 -0000
-@@ -1174,3 +1174,14 @@
+--- rhino/rhino1_5R5.patch.old	2008-12-03 20:22:39.000000000 +0100
++++ rhino/rhino1_5R5.patch	2008-12-03 20:22:30.000000000 +0100
+@@ -1174,3 +1174,30 @@
           PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
           return new ProtectionDomain(cs, pc);
       }
-+--- misc/rhino1_5R5/toolsrc/build.xml	2004-03-25 17:54:34.000000000 -0300
-++++ misc/build/rhino1_5R5/toolsrc/build.xml	2008-08-12 16:58:52.000000000 -0
-+va	Fri Mar 28 17:24:23 2008
-+@@ -68,6 +32,7 @@
++--- misc/rhino1_5R5/toolsrc/build.xml	2008-12-03 20:20:21.000000000 +0100
+++++ misc/build/rhino1_5R5/toolsrc/build.xml	2008-12-03 20:19:28.000000000 +0100
++@@ -6,6 +6,16 @@ Requires Ant version 1.2
++ -->
++ <project name="toolsrc" default="compile" basedir=".">
++ 
+++  <!-- rhino.jar from OpenJDK breaks build -->
+++  <path id="my.bootstrap.classpath">
+++     <fileset dir="${java.home}/">
+++       <include name="jre/lib/*.jar"/>
+++       <include name="lib/*.jar"/>
+++       <exclude name="jre/lib/rhino.jar"/>
+++       <exclude name="lib/rhino.jar"/>
+++     </fileset>
+++  </path>
+++
++   <target name="properties">
++     <property name="nest" value=".."/>
++     <property name="build.dir" value="./build"/>
++@@ -32,6 +42,7 @@ Requires Ant version 1.2
 +            includes="org/**/*.java"
 +            deprecation="on"
 +            debug="${debug}">
-++      <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
+++      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
 +     </javac>
 +     <copy todir="${nest}/${classes}">
 +       <fileset dir="." includes="org/**/*.properties" />
-? unxlngx6.pro
-Index: java/build.xml
-===================================================================
-RCS file: /cvs/framework/scripting/java/build.xml,v
-retrieving revision 1.36
-diff -u -r1.36 build.xml
---- scripting/java/build.xml	11 Apr 2008 09:46:13 -0000	1.36
-+++ scripting/java/build.xml	12 Aug 2008 23:20:31 -0000
-@@ -85,7 +85,9 @@
+--- scripting/java/build.xml.old.orig	2008-12-03 20:08:19.000000000 +0100
++++ scripting/java/build.xml	2008-12-03 20:12:57.000000000 +0100
+@@ -85,6 +85,16 @@
+     <pathelement path="${jardir}"/>
+     <pathelement path="${netbeans.install.path}/modules/ext/nb-editor.jar"/>
+   </path>
++
++  <!-- rhino.jar from OpenJDK breaks build -->
++  <path id="my.bootstrap.classpath">
++     <fileset dir="${java.home}/">
++       <include name="jre/lib/*.jar"/>
++       <include name="lib/*.jar"/>
++       <exclude name="jre/lib/rhino.jar"/>
++       <exclude name="lib/rhino.jar"/>
++     </fileset>
++  </path>
+     
+   <!-- ===================== Prepare Directories ========================= -->
+   <target name="prepare">
+@@ -95,7 +105,9 @@
    <target name="compile" depends="prepare">
      <javac srcdir="com" destdir="${jardir}"
           includes="**/*.java" classpathref="idlclasspath"
 -         debug="${debug}" optimize="${optimize}" deprecation="off"/>
 +         debug="${debug}" optimize="${optimize}" deprecation="off">
-+	 <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
++      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
 +    </javac>
      <javac srcdir="Framework/" destdir="${jardir}"
           includes="**/*.java" classpathref="idlclasspath" debug="${debug}" 

Added: trunk/patches/dev300/pyuno-python-2.6-uno-import.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/pyuno-python-2.6-uno-import.diff	Thu Dec  4 15:57:49 2008
@@ -0,0 +1,26 @@
+--- pyuno/source/module/uno.py.old	2008-04-11 12:36:09.000000000 +0200
++++ pyuno/source/module/uno.py	2008-11-27 20:41:07.000000000 +0100
+@@ -249,19 +249,13 @@ def invoke( object, methodname, argTuple
+ #---------------------------------------------------------------------------------------
+ # don't use any functions beyond this point, private section, likely to change
+ #---------------------------------------------------------------------------------------
+-def _uno_import( name, *optargs ):
++def _uno_import( name, globals={}, locals={}, fromlist=[], level=-1 ):
+     try:
+ #       print "optargs = " + repr(optargs)
+-        if len(optargs) == 0:
+-           return _g_delegatee( name )
+-           #print _g_delegatee
+-        return _g_delegatee( name, *optargs )
++        return _g_delegatee( name, globals, locals, fromlist, level )
+     except ImportError:
+-        if len(optargs) != 3 or not optargs[2]:
+-           raise
+-    globals = optargs[0]
+-    locals = optargs[1]
+-    fromlist = optargs[2]
++        if not fromlist:
++            raise
+     modnames = name.split( "." )
+     mod = None
+     d = sys.modules
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]