GNOME.org
 

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

Author: pmladek
Date: Fri Feb 27 20:00:52 2009
New Revision: 15427
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15427&view=rev

Log:
2009-02-27  Petr Mladek  <pmladek suse cz>

	* bin/sloppypatch.pl, patches/apply.pl.in: udpate to allow diffs
	  against files in the topdir

	* patches/dev300/piece-reportdesign.diff:
	* patches/dev300/piece-swext.diff:
	* patches/dev300/piece-helpcontent2.diff:
	* patches/dev300/piece-build.diff:
	* patches/dev300/apply: update for ooo310-m2

	* patches/dev300/piece-postprocess.diff:
	* patches/dev300/apply: bin; already included in ooo310-m2

	* patches/dev300/apply: temporary disable piece-reportbuilder.diff;
	  still not available in DEV300/OOO310 :-(

	* src/setup_native_packinfo-ooo310-m2.tar.bz2: added
	* src/setup_native_packinfo-ooo300-m4.tar.bz2: bin obsolete
	* bin/unpack: update setup_native_packinfo version

	* bin/piece/sys-setup.in: define VERSION variable
	* bin/piece/file-list-postprocess:
	* bin/piece/file-list-l10n: use $VERSION instead of hardcoded



Added:
   trunk/src/setup_native_packinfo-ooo310-m2.tar.bz2   (contents, props changed)
Removed:
   trunk/patches/dev300/piece-postprocess.diff
   trunk/src/setup_native_packinfo-ooo300-m4.tar.bz2
Modified:
   trunk/ChangeLog
   trunk/bin/piece/file-list-l10n
   trunk/bin/piece/file-list-postprocess
   trunk/bin/piece/sys-setup.in
   trunk/bin/sloppypatch.pl
   trunk/bin/unpack
   trunk/patches/apply.pl.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-build.diff
   trunk/patches/dev300/piece-helpcontent2.diff
   trunk/patches/dev300/piece-reportdesign.diff
   trunk/patches/dev300/piece-swext.diff
   trunk/src/Makefile.am

Modified: trunk/bin/piece/file-list-l10n
==============================================================================
--- trunk/bin/piece/file-list-l10n	(original)
+++ trunk/bin/piece/file-list-l10n	Fri Feb 27 20:00:52 2009
@@ -18,7 +18,7 @@
     # because of missing services.rdb, ... Therefore we need to use a prebuilt
     # version
     echo "Adding Novell specific Draft.jpg to Backgrounds gallery..."
-    GAL_DIR=$OO_INSTDIR/basis3.0/share/gallery
+    GAL_DIR=$OO_INSTDIR/basis$VERSION/share/gallery
     if test `du --block-size=1 --apparent-size $DESTDIR$GAL_DIR/sg3.sdg | cut -f1` -eq 270058 ; then
 	cp "$OO_TOOLSDIR/../src/Draft.jpg" "$DESTDIR$GAL_DIR/www-back/" || exit 1;
 	chmod 644 $DESTDIR$GAL_DIR/www-back/Draft.jpg || exit 1;

Modified: trunk/bin/piece/file-list-postprocess
==============================================================================
--- trunk/bin/piece/file-list-postprocess	(original)
+++ trunk/bin/piece/file-list-postprocess	Fri Feb 27 20:00:52 2009
@@ -27,10 +27,10 @@
 $OO_TOOLSDIR/generate-bash-completion --binsuffix="$BINSUFFIX" $OO_TOOLSDIR/bash-completion.in $DESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh || exit 1;
 echo /etc/bash_completion.d/ooffice${BINSUFFIX}.sh >>files-$piece.txt
 
-echo "Installing $OO_INSTDIR/basis3.0/program/java-set-classpath"
-sed -e "s|@OOINSTBASE@|$OO_INSTDIR|g" $OO_TOOLSDIR/java-set-classpath.in >$DESTDIR$OO_INSTDIR/basis3.0/program/java-set-classpath || exit 1;
-chmod 755 $DESTDIR$OO_INSTDIR/basis3.0/program/java-set-classpath
-echo "$OO_INSTDIR/basis3.0/program/java-set-classpath" >>files-$piece.txt
+echo "Installing $OO_INSTDIR/basis$VERSION/program/java-set-classpath"
+sed -e "s|@OOINSTBASE@|$OO_INSTDIR|g" $OO_TOOLSDIR/java-set-classpath.in >$DESTDIR$OO_INSTDIR/basis$VERSION/program/java-set-classpath || exit 1;
+chmod 755 $DESTDIR$OO_INSTDIR/basis$VERSION/program/java-set-classpath
+echo "$OO_INSTDIR/basis$VERSION/program/java-set-classpath" >>files-$piece.txt
 
 # FIXME: about, intro are not isntalled by the installer
 if test "$OOO_BUILD_NOARCH" = 'YES' ; then

Modified: trunk/bin/piece/sys-setup.in
==============================================================================
--- trunk/bin/piece/sys-setup.in	(original)
+++ trunk/bin/piece/sys-setup.in	Fri Feb 27 20:00:52 2009
@@ -3,6 +3,7 @@
 # stuff from configure
 export DISTRO='@DISTRO@'
 export VENDORNAME='@VENDORNAME@'
+export VERSION='@OOO_VERSION@'
 export OO_INSTDIR= libdir@/@OOOINSTALLDIRNAME@
 export OO_PREFIX= prefix@
 export OO_MANDIR= mandir@

Modified: trunk/bin/sloppypatch.pl
==============================================================================
--- trunk/bin/sloppypatch.pl	(original)
+++ trunk/bin/sloppypatch.pl	Fri Feb 27 20:00:52 2009
@@ -17,89 +17,174 @@
     }
 }
 
-my $tmpfile, $fh;
+my $tmpfile;
+my $fh;
 ($fh,$tmpfile) = mkstemp("/tmp/sloopypatch-XXXXXX");
 
-sub analyze_path($)
+sub path_exists($)
 {
-    my $pf = shift;
+    my $path = shift;
     my $topdir = undef;
     my $subpath = undef;
+
+#    print "Checking path: $path\n";
     
-#    print "analyzing path: $pf\n";
-    $pf =~ s|\.\/+||;
-    if ( $pf =~ m/^([^\/]+)([^ \t]+)/ ) {
+    # skip initial ./ is needed
+    $path =~ s|\.\/+||;
+
+    if ( $path =~ m/^([^\/]+)([^ \t]+)/ ) {
 	$topdir = "$1";
 	$subpath = "$2";
 	chomp $subpath;
     }
     
-    return $topdir, $subpath;
+    # the relative paths starting with ".." must be invalid because we use
+    # the -p0 patches and the upper direcotry name is different with every milestone
+    if ( (defined $topdir && "$topdir" ne ".." && -d "$applydir/$topdir" ) || ( -f "$applydir/$path") ) {
+#	print "   passed $topdir,$path\n";
+	return $path;
+    } else {
+#	print "   not passed\n";
+	return undef;
+    }
 }
 
-my $applying = 0;
-my $firstline = undef;
-my $firstline_topdir = undef;
-my $firstline_subpath = undef;
+my $applying = undef;
 my $sections = 0;
+my $path1 = undef;
+my $path2 = undef;
+my @header_lines = ();
+my $header_unified = 0;
+my $header_found = 0;
+my $line_matched = 0;
 while (<STDIN>) {
     my $line = $_;
 
-    # unified context patches:
-    # 	first line:  --- path
-    #	second line: +++ path
-    # copied context patches:
-    # 	first line:  *** path
-    #	second line: --- path
-    # IMPORTANT: we need extra reqular expression for --- and *** to do not match lines like -**
-    if  ( ( ! defined $firstline ) &&
-          ( ( $line =~ m/^\*\*\* [ \t]*([^\s]+)/ ) ||
-	    ( $line =~ m/^--- [ \t]*([^\s]+)/ ) ) ) {
-	# found first line that defines the path of the patched file
-	($firstline_topdir, $firstline_subpath) = analyze_path("$1");
-	$firstline = $line;
-	next;
-    }
-
-    # there are diffs with just the +++ line => the first line is missing in this cases
-    if ( ( ( defined $firstline ) && ( $line =~ m/^--- [ \t]*([^\s]+)/ ) ) ||
-         ( $line =~ m/^\+\+\+ [ \t]*([^\s]+)/ ) ) {
-	# found second line that defines the path of the patched file
-	($topdir, $subpath) = analyze_path("$1");
-
-	# need to check all ***, +++, --- paths; any of them might be correct
-	# the other path might be invalid, e.g. absolute path
-	# the relative paths starting with ".." must be invalid because we use
-	# the -p0 patches and the upper direcotry name is different with every milestone
-	if ( defined $topdir && "$topdir" ne ".." && -d "$applydir/$topdir" ) {
-#	    print "topdir: $topdir\n";
-	    $applying = 1;
-	} elsif ( defined $firstline_topdir && "$firstline_topdir" ne ".." && -d "$applydir/$firstline_topdir" ) {
-#	    print "firstline_topdir: $firstline_topdir\n";
-	    $applying = 1;
-	    $topdir = $firstline_topdir;
-	    $subpath = $firstline_subpath;
+    # same of unified context patch header:
+    # --- file.old	2009-02-26 20:04:16.000000000 +0100 
+    # +++ file		2009-02-26 20:04:41.000000000 +0100 
+    # @@ -1,26 +1,28 @@ 
+
+    # sample of copied context patch header:
+    # *** file.old 2009-02-26 20:04:16.000000000 +0100 
+    # --- file     2009-02-26 20:04:41.000000000 +0100 
+    # *************** 
+    # *** 1,26 **** 
+    
+    $line_matched = 0;
+    
+    if (! @header_lines) {
+	if ( $line =~ m/^--- [\s]*([^\s]+)/ ) {
+	    $path1 = "$1";
+	    $header_unified = 1;
+	    $line_matched = 1;
+	}
+	if ( $line =~ m/^\*\*\* [\s]*([^\s]+)/ ) {
+	    $path1 = "$1";
+	    $header_unified = 0;
+	    $line_matched = 1;
+	}	    
+	# hack to support unified diffs where the --- line is missing
+	if ( $line =~ m/^\+\+\+ [\s]*([^\s]+)/ ) {
+	    # only line 2
+	    $path2 = "$1";
+	    $header_unified = 1;
+	    $line_matched = 1;
+	    # fake line 1
+	    $path1 = $path2;
+	    push @header_lines, "";
+	}
+    } elsif (@header_lines == 1) {
+	if ($header_unified) {
+	    if ( $line =~ m/^\+\+\+ [\s]*([^\s]+)/ ) {
+		$path2 = "$1";
+		$line_matched = 1;
+	    }
 	} else {
-	    $applying = 0;
+	    if ( $line =~ m/^--- [\s]*([^\s]+)/ ) {
+		$path2 = "$1";
+		$line_matched = 1;
+	    }
 	}
-
-	if ($applying) {
-	    $sections++;
-	    print STDERR "+ apply fragment for $topdir$subpath\n";
+    } elsif (@header_lines == 2) {
+	if ($header_unified) {
+	    if ( $line =~ m/^\ \@ -(\d+),(\d+) \s*\+\d+,\d+ \s*\ \@/ ) {
+		# new file looks like: @@ -0,0 +1,23 @@ 
+		$new_file=1 if  (($1 == 0) && ($2 == 0));
+		$line_matched = 1;
+		$header_found = 1;
+#		print "Unified header found\n";
+	    }
+	} else {
+	    if ( $line =~ m/^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*/ ) {
+		$line_matched = 1;
+	    }
+	}
+    } elsif (@header_lines == 3) {
+	if (! $header_unified) {
+	    if ( $line =~ m/^\*\*\* \s*(\d+)(,\d+)? \s*\*\*\*\*/ ) {
+		# new file looks like: *** 0 ****
+		$new_file = 1 if ( ( $1 == 0 ) && ( ! defined $2 ) );
+		$line_matched = 1;
+		$header_found = 1;
+#		print "Context header found\n";
+	    }
 	}
-    
     }
-
-    if (defined $firstline) {
-	# either it is the real first line that defines the file path
-	# or it might be the hunk definition in the copied context patches
-	# we should print it in both cases
-	$line = $firstline . $line;
-	$firstline = undef;
+    
+    if (@header_lines && ! $line_matched ) {
+	# looked like header but it is not header in the end
+	if ( $applying ) {
+	    # print the saved lines if applying this piece
+	    foreach (@header_lines) {
+		print $fh $_;
+	    }
+	}
+	@header_lines = ();
+	# FIXME: should check the previous lines again???
+	#        or at least the last one; might be there extra ---, +++ lines without real hunk?
+	#        something like?
+	#        --- fileA
+	#        +++ fileA
+	# 	 --- fileB
+	# 	 +++ fileB
+	#        @@ -10,6 +10,7 @@
+	# well this will ve coverted by the hack for missing --- line, see above;
     }
-
-    if ($applying) {
-	print $fh $line;
+    
+    if ( $header_found ) {
+	# accept new path without the "path_exists" check only in topdir
+	$applying = undef;
+	$applying = $path2 if ( $new_file && ( ! $path2 =~ m/^(\.\/+)?[^\/]+\/[^\/]+/ ) );
+	# need to check all ***, +++, --- paths; any of them might be correct
+	# the other path might be invalid, e.g. absolute path
+	$applying = path_exists( $path2 ) if ( ! $applying );
+	$applying = path_exists( $path1 ) if ( ! $applying );
+	
+	if ( $applying ) {
+	    $sections++;
+	    print STDERR "+ apply fragment for $applying\n";
+	    # print the saved header lines
+	    foreach (@header_lines) {
+		print $fh $_;
+	    }
+	}
+	@header_lines = ();
+	$new_file = 0;
+	$header_found = 0;
+	$line_matched = 0;
+    }	    
+
+    if ($line_matched) {
+	# save the header line
+	push @header_lines, $line;
+	$line_matched = 0;
+#	print "Matched header line $#header_lines\n";
+    } else {
+	# no header line => print it if applying this piece
+	if ( $applying ) {
+	    print $fh $line;
+	}
     }
 }
 $fh->close;

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Fri Feb 27 20:00:52 2009
@@ -207,7 +207,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-ooo300-m4.tar.bz2 | $GNUTAR xpf - ) || exit
+		($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-ooo310-m2.tar.bz2 | $GNUTAR xpf - ) || exit
 	fi
 fi
 

Modified: trunk/patches/apply.pl.in
==============================================================================
--- trunk/patches/apply.pl.in	(original)
+++ trunk/patches/apply.pl.in	Fri Feb 27 20:00:52 2009
@@ -49,11 +49,13 @@
 	next if ($pf =~ m/^\//);	# skip absolute paths; they might come from the unused +++ or --- line
 	next if ($pf =~ m/^\.\./);	# skip paths starting with ../; they comes from the unused +++ or --- line
 	next if ($pf =~ m/^\d+,\d+$/);	# skip paths that look like "number,number", e.g 74,7; they comes from the hunk definition from the patches with "copied context"
-	$pf =~ m/^([^\/]+)\// || die "malformed path $pf";
-	my $topdir = "$dest_dir/$1";
-#	print "\tcheck directory $topdir\n";
-	-d $topdir && return 0;
-#	print "\tno directory $topdir\n";
+
+	my $topdir = undef;
+	if ($pf =~ m/^([^\/]+)\//) {
+	    $topdir = "$dest_dir/$1";
+	}
+	# return 0 if the patched file is right in the $dest_dir or if the topdir exists on the system
+	return 0 if (! defined $topdir || -d $topdir );
     }
     return 1;
 }

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Feb 27 20:00:52 2009
@@ -2781,11 +2781,10 @@
 piece-jvmfwk.diff
 piece-forms.diff
 piece-apache-commons.diff
-piece-reportbuilder.diff
+#piece-reportbuilder.diff
 piece-reportdesign.diff
 piece-sc.diff
 piece-xmerge.diff
-piece-postprocess.diff
 piece-packimages.diff
 piece-automation.diff
 piece-cli_ure.diff

Modified: trunk/patches/dev300/piece-build.diff
==============================================================================
--- trunk/patches/dev300/piece-build.diff	(original)
+++ trunk/patches/dev300/piece-build.diff	Fri Feb 27 20:00:52 2009
@@ -25,9 +25,9 @@
          store_weights(\%global_deps_hash);
          prepare_build_from(\%global_deps_hash) if ($build_from);
 @@ -893,6 +928,9 @@
+ 	} else {
+ 		$StandDir = cwd();
      };
-     my $StandDir;
-     $StandDir = getcwd();
 +    if ($build_all_dirs) {
 +	return "$StandDir/";
 +    }
@@ -49,7 +49,7 @@
      my $old_fh = select(STDOUT);
 -    
 +
-     # First try to get global depencies from solver's build.lst if such exists
+     # Try to get global depencies from solver's build.lst if such exists
 +    my @search_dirs;
      my $solver_inc_dir = "$ENV{SOLARVER}/common";
      $solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT});
@@ -82,5 +82,5 @@
 +	    };
 +	}
      }
-     print " failed...\n";
-     print "Fetching from CVS... ";
+     print " failed\n";
+ 

Modified: trunk/patches/dev300/piece-helpcontent2.diff
==============================================================================
--- trunk/patches/dev300/piece-helpcontent2.diff	(original)
+++ trunk/patches/dev300/piece-helpcontent2.diff	Fri Feb 27 20:00:52 2009
@@ -16,13 +16,13 @@
 @@ -1,10 +1,10 @@
  .INCLUDE : $(INCCOM)$/aux_langs.mk
  
--my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$
-+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/unoil.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/ridl.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/jurt.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/LuceneHelpWrapper.jar$
+-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$
++my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/unoil.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/ridl.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/LuceneHelpWrapper.jar$
  .IF "$(SYSTEM_LUCENE)" == "YES"
- my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
+ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
  .ELSE
--my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
-+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/lucene-core-2.3.jar
+-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
++my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/lucene-analyzers-2.3.jar
  .ENDIF
   
  .IF "$(SYSTEM_DB)" != "YES"

Modified: trunk/patches/dev300/piece-reportdesign.diff
==============================================================================
--- trunk/patches/dev300/piece-reportdesign.diff	(original)
+++ trunk/patches/dev300/piece-reportdesign.diff	Fri Feb 27 20:00:52 2009
@@ -1,12 +1,15 @@
 --- reportdesign/util/makefile.pmk	2008-08-11 14:49:42.000000000 +0100
 +++ reportdesign/util/makefile.pmk	2008-08-11 14:49:42.000000000 +0100
-@@ -29,10 +29,10 @@
+@@ -29,13 +29,10 @@
  #
  #*************************************************************************
  
 -XSLDIR=$(SOLARXMLDIR)$/processing
--XCSROOT=$(SOLARXMLDIR)
--ABSXCSROOT=$(SOLARXMLDIR)
+-ABSXCSROOT=$(PWD)$/$(MISC)$/$(EXTNAME)
+-# ABSXCSROOT=$(MISC)$/$(EXTNAME)
+-XCSROOT=..
+-# XCSROOT=$(SOLARXMLDIR)
+-# ABSXCSROOT=$(SOLARXMLDIR)
 -DTDDIR=$(SOLARXMLDIR)
 +XCSROOT=$(SPLITINSTALLDIR)$/../share
 +XSLDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)$/processing

Modified: trunk/patches/dev300/piece-swext.diff
==============================================================================
--- trunk/patches/dev300/piece-swext.diff	(original)
+++ trunk/patches/dev300/piece-swext.diff	Fri Feb 27 20:00:52 2009
@@ -29,23 +29,21 @@
 +COMMONS_LANG_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-lang-2.3.jar
 +COMMONS_HTTPCLIENT_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-httpclient-3.1.jar
 +COMMONS_LOGGING_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-logging-1.1.1.jar
+ .ELSE
+ COMP=fix_system_commons
  .ENDIF
- 
- ANT_FLAGS+=-Dcommons-codec-jar=$(COMMONS_CODEC_JAR) -Dcommons-lang-jar=$(COMMONS_LANG_JAR) -Dcommons-httpclient-jar=$(COMMONS_HTTPCLIENT_JAR) -Dcommons-logging-jar=$(COMMONS_LOGGING_JAR)
 --- swext/mediawiki/build.xml.old	2008-09-26 15:42:00.000000000 +0200
 +++ swext/mediawiki/build.xml	2008-09-26 15:59:01.000000000 +0200
-@@ -61,11 +61,11 @@
+@@ -61,10 +61,10 @@
          
          <!-- build classpath -->
          <path id="classpath">        
 -            <pathelement location="${officeclasses}/juh.jar"/>
 -            <pathelement location="${officeclasses}/jurt.jar"/>
--            <pathelement location="${officeclasses}/jut.jar"/>
 -            <pathelement location="${officeclasses}/ridl.jar"/>
 -            <pathelement location="${officeclasses}/unoil.jar"/>            
 +            <pathelement location="${split.ure}/share/java/juh.jar"/>
 +            <pathelement location="${split.ure}/share/java/jurt.jar"/>
-+            <pathelement location="${split.install}/classes/jut.jar"/>
 +            <pathelement location="${split.ure}/share/java/ridl.jar"/>
 +            <pathelement location="${split.install}/classes/unoil.jar"/>            
              <!-- 3rd party libs -->

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Feb 27 20:00:52 2009
@@ -1,6 +1,7 @@
 SUBDIRS=layout sdf icons
 
 EXTRA_DIST=\
+	${wildcard setup_native_packinfo*.tar.bz2} \
 	Draft.jpg \
 	Novell.dic \
 	Ubuntu.dic \

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