GNOME.org
 

ooo-build r12600 - in trunk: . bin patches/dev300

Author: rengelhard
Date: Mon May 19 20:36:51 2008
New Revision: 12600
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12600&view=rev

Log:
2008-05-19  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/win32-hyphen-h.diff:
          add dev300-m13 buildfix
        * bin/ooinstall,
          bin/install-mono,
          bin/package-ooo: fix install - partially only for Debian and without
          the SDK yet. Install new gids also for != Debian (untested, but it
          can't make it worse...)


Added:
   trunk/patches/dev300/win32-hyphen-h.diff
Modified:
   trunk/ChangeLog
   trunk/bin/install-mono
   trunk/bin/ooinstall
   trunk/bin/package-ooo
   trunk/patches/dev300/apply

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Mon May 19 20:36:51 2008
@@ -11,7 +11,7 @@
 test -n "$1" && OOINSTDIR="$1"
 
 # continue only when mono has been built
-test -f $OOINSTDIR/program/cli_basetypes.dll || exit 0;
+test -f $OOINSTDIR/basis$VERSION/program/cli_basetypes.dll || exit 0;
 
 
 echo "Finishing the mono installation..."
@@ -38,10 +38,10 @@
 for dll in cli_cppuhelper.dll cli_uno_bridge.dll ; do
     sed -e "s|@LIBDIRBASE@|$LIBDIRBASE|g" \
 	-e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
-	$SRCDIR/$dll.config.in >$OOINSTDIR/program/$dll.config
+	$SRCDIR/$dll.config.in >$OOINSTDIR/basis$VERSION/program/$dll.config
     if test -n "$OODESTDIR" ; then
-	file_list=`grep "^$OOINSTBASE/program/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
-	echo "$OOINSTBASE/program/$dll.config" >>$file_list
+	file_list=`grep "^$OOINSTBASE/basis$VERSION/program/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
+	echo "$OOINSTBASE/basis$VERSION/program/$dll.config" >>$file_list
     fi
 done
 

Modified: trunk/bin/ooinstall
==============================================================================
--- trunk/bin/ooinstall	(original)
+++ trunk/bin/ooinstall	Mon May 19 20:36:51 2008
@@ -168,6 +168,30 @@
 }
 print "Installer finished\n";
 
+print "Fixing permissions...\n";
+system("cd $setup_vars{OOINSTDIR}; find . -exec chmod u+w \{\} \\;");
+
+print "Merging layers and move to $setup_vars{OOINSTBASE}...\n";
+system("cd $setup_vars{OOINSTDIR} && cp -ra openoffice.org/* .");
+system("cd $setup_vars{OOINSTDIR} && cp -ra openoffice.org3/* .");
+system("cd $setup_vars{OOINSTDIR} && rm -rf openoffice.org openoffice.org3");
+system("cd $setup_vars{OOINSTDIR} && ln -sf basis$setup_vars{VERSION} basis-link");
+chdir("$setup_vars{OODESTDIR}");
+foreach my $f ( <gid_*> ) {
+       open(F, "$f");
+       open(FN, ">$f.new");
+       my @new;
+       while (<F>) {
+               $_ =~ s,$setup_vars{OOINSTBASE}/openoffice.org3,$setup_vars{OOINSTBASE},g;
+               $_ =~ s,$setup_vars{OOINSTBASE}/openoffice.org,$setup_vars{OOINSTBASE},g;
+               push @new, $_;
+       }
+       close(F);
+       foreach my $l (@new) { print FN "$l"; }
+       close (FN);
+       rename("$f.new", "$f");
+}
+
 # FIXME: needs a way to package extensions - this here is dev
 # build-only
 if ( !defined $setup_vars{OODESTDIR} || $setup_vars{OODESTDIR} eq "") {

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Mon May 19 20:36:51 2008
@@ -115,7 +115,7 @@
 		>| "$MANDIR/man1/unopkg$BINSUFFIX.1" || exit 1;
 fi
 
-mkdir -p $OOINSTDIR/program
+mkdir -p $OOINSTDIR/basis$VERSION/program
 
 echo "Building $OOINSTDIR/install-dict";
 sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/install-dict.in >| "$OOBUILDDIR/install-dict" || exit 1;
@@ -123,19 +123,19 @@
 
 echo "Building $OOINSTDIR/program/java-set-classpath";
 sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/java-set-classpath.in >| "$OOBUILDDIR/java-set-classpath" || exit 1;
-install_script $OOBUILDDIR/java-set-classpath $OOINSTDIR/program/java-set-classpath
+install_script $OOBUILDDIR/java-set-classpath $OOINSTDIR/basis$VERSION/program/java-set-classpath
 
 if test "`uname -i`" = "i386" ; then
     echo "Building $OOINSTDIR/program/pyunorc-update64";
     sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/pyunorc-update64.in >| "$OOBUILDDIR/pyunorc-update64" || exit 1;
-    install_script $OOBUILDDIR/pyunorc-update64 $OOINSTDIR/program/pyunorc-update64
+    install_script $OOBUILDDIR/pyunorc-update64 $OOINSTDIR/basis$VERSION/program/pyunorc-update64
 fi
 
 echo "Installing extra en-US templates ..."
-mkdir -p $OOINSTDIR/share/template/en-US/forms
-cp $TOOLSDIR/templates/resume.ott $OOINSTDIR/share/template/en-US/forms
-mkdir -p $OOINSTDIR/share/template/en-US/officorr
-cp $TOOLSDIR/templates/project-proposal.ott $OOINSTDIR/share/template/en-US/officorr
+mkdir -p $OOINSTDIR/basis$VERSION/share/template/en-US/forms
+cp $TOOLSDIR/templates/resume.ott $OOINSTDIR/basis$VERSION/share/template/en-US/forms
+mkdir -p $OOINSTDIR/basis$VERSION/share/template/en-US/officorr
+cp $TOOLSDIR/templates/project-proposal.ott $OOINSTDIR/basis$VERSION/share/template/en-US/officorr
 
 echo "Installing system files ...";
 case $VENDORNAME in
@@ -522,8 +522,10 @@
 		echo $OOINSTBASE/program/pyunorc-update64 >> gid_Module_Pyuno_Hack
 
 	rm -f common_list.txt
-	for module in gid_Module_Root gid_Module_Root_Files_[0-9] \
-	              gid_Module_Root_Hack $BUILDDIR/dictionaries ; do
+	for module in gid_Module_Root gid_Module_Root_Brand \
+		gid_Module_Root_Files_Images gid_Module_Oo_Lingustic \
+		gid_Module_Root_Files_[0-9] gid_Module_Root_Hack \
+		$BUILDDIR/dictionaries ; do
 	    merge_flists $module $BUILDDIR/common_list.txt
 	done
 	
@@ -531,12 +533,18 @@
 		rm -f $BUILDDIR/base_list.txt $BUILDDIR/calc_list.txt \
 		      $BUILDDIR/draw_list.txt $BUILDDIR/math_list.txt \
 		      $BUILDDIR/impress_list.txt $BUILDDIR/writer_list.txt
-		merge_flists gid_Module_Prg_Base 	$BUILDDIR/base_list.txt
-		merge_flists gid_Module_Prg_Calc 	$BUILDDIR/calc_list.txt
-		merge_flists gid_Module_Prg_Draw 	$BUILDDIR/draw_list.txt
-		merge_flists gid_Module_Prg_Math 	$BUILDDIR/math_list.txt
-		merge_flists gid_Module_Prg_Impress	$BUILDDIR/impress_list.txt
-		merge_flists gid_Module_Prg_Wrt		$BUILDDIR/writer_list.txt
+		merge_flists gid_Module_Prg_Base_Bin 	$BUILDDIR/base_list.txt
+		merge_flists gid_Module_Prg_Calc_Bin 	$BUILDDIR/calc_list.txt
+		merge_flists gid_Module_Prg_Draw_Bin 	$BUILDDIR/draw_list.txt
+		merge_flists gid_Module_Prg_Math_Bin 	$BUILDDIR/math_list.txt
+		merge_flists gid_Module_Prg_Impress_Bin	$BUILDDIR/impress_list.txt
+		merge_flists gid_Module_Prg_Wrt_bin		$BUILDDIR/writer_list.txt
+		merge_flists gid_Module_Brand_Prg_Base 	$BUILDDIR/base_list.txt
+		merge_flists gid_Module_Brand_Prg_Calc 	$BUILDDIR/calc_list.txt
+		merge_flists gid_Module_Brand_Prg_Draw 	$BUILDDIR/draw_list.txt
+		merge_flists gid_Module_Brand_Prg_Math 	$BUILDDIR/math_list.txt
+		merge_flists gid_Module_Brand_Prg_Impress $BUILDDIR/impress_list.txt
+		merge_flists gid_Module_Brand_Prg_Wrt	$BUILDDIR/writer_list.txt
 		# FIXME: shold be fixed in scp2
 		mv_file_between_flists $BUILDDIR/calc_list.txt $BUILDDIR/common_list.txt $OOINSTBASE/program/libvbaobj.*\.uno.so
 	else
@@ -554,6 +562,7 @@
 		if test "z$VENDORNAME" = "zMandriva" ; then
 			rm -f $BUILDDIR/filter-binfilter_list.txt
 			merge_flists gid_Module_Optional_Binfilter		$BUILDDIR/filter-binfilter_list.txt
+			merge_flists gid_Module_Langpack_Binfilter_en_US
 			merge_flists gid_Module_Optional_Grfflt			$BUILDDIR/draw_list.txt
 			merge_flists gid_Module_Optional_Headless		$BUILDDIR/common_list.txt
 			merge_flists gid_Module_Optional_Javafilter		$BUILDDIR/common_list.txt
@@ -577,6 +586,7 @@
 		fi
 	else
 		merge_flists gid_Module_Optional_Binfilter		$BUILDDIR/common_list.txt
+		merge_flists gid_Module_Langpack_Binfilter		$BUILDDIR/common_list.txt
 		merge_flists gid_Module_Optional_Grfflt			$BUILDDIR/common_list.txt
 		merge_flists gid_Module_Optional_Headless		$BUILDDIR/common_list.txt
 		merge_flists gid_Module_Optional_Javafilter		$BUILDDIR/common_list.txt
@@ -592,17 +602,33 @@
 		cat $BUILDDIR/novell-gallery-addon >> $BUILDDIR/common_list.txt
 	fi
 	
-	for lang in $OOO_LANGS_LIST ; do
+	for lang in `echo $OOO_LANGS_LIST | sed -e s/-/_/g`; do
 		lang_lists=
 		if test "$VENDORNAME" = "Mandriva"; then
-			test -f gid_Module_Root.$lang           	&& lang_lists="gid_Module_Root.$lang" || :
-			test -f gid_Module_Langpack_Resource.$lang	&& lang_lists="$lang_lists gid_Module_Langpack_Resource.$lang" || :
+			test -f gid_Module_Langpack_Basis_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Basis_$lang" || :
+			test -f gid_Module_Langpack_Brand_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Brand_$lang" || :
+			test -f gid_Module_Langpack_Resource_$lang  && lang_lists="$lang_lists  gid_Module_Langpack_Resource_$lang" || :
+			test -f gid_Module_Langpack_Impress_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Impress_$lang" || :
+			test -f gid_Module_Langpack_Draw_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Draw_$lang" || :
+			test -f gid_Module_Langpack_Math_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Math_$lang" || :
+			test -f gid_Module_Langpack_Calc_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Calc_$lang" || :
+			test -f gid_Module_Langpack_Base_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Base_$lang" || :
+			test -f gid_Module_Langpack_Writer_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Writer_$lang" || :
+			test -f gid_Module_Langpack_Binfilter_$lang -a "$lang" != "en-US" && lang_lists="$lang_lists  gid_Module_Langpack_Writer_$lang" || :
 			# Place helps on dedicated packages.
-			test -f gid_Module_Langpack_Help.$lang  	&& sort -u gid_Module_Langpack_Help.$lang > $BUILDDIR/help_${lang}_list.txt || :
+			test -f gid_Module_Langpack_Help_$lang  	&& sort -u gid_Module_Langpack_Help.$lang > $BUILDDIR/help_${lang}_list.txt || :
 		else
-			test -f gid_Module_Root.$lang           	&& lang_lists="gid_Module_Root.$lang" || :
-			test -f gid_Module_Langpack_Help.$lang  	&& lang_lists="$lang_lists gid_Module_Langpack_Help.$lang" || :
-			test -f gid_Module_Langpack_Resource.$lang	&& lang_lists="$lang_lists gid_Module_Langpack_Resource.$lang" || :
+			test -f gid_Module_Langpack_Basis_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Basis_$lang" || :
+			test -f gid_Module_Langpack_Brand_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Brand_$lang" || :
+			test -f gid_Module_Langpack_Resource_$lang  && lang_lists="$lang_lists  gid_Module_Langpack_Resource_$lang" || :
+			test -f gid_Module_Langpack_Impress_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Impress_$lang" || :
+			test -f gid_Module_Langpack_Draw_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Draw_$lang" || :
+			test -f gid_Module_Langpack_Math_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Math_$lang" || :
+			test -f gid_Module_Langpack_Calc_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Calc_$lang" || :
+			test -f gid_Module_Langpack_Base_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Base_$lang" || :
+			test -f gid_Module_Langpack_Writer_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Writer_$lang" || :
+			test -f gid_Module_Langpack_Binfilter_$lang -a "$lang" != "en-US"    && lang_lists="$lang_lists  gid_Module_Langpack_Writer_$lang" || :
+			test -f gid_Module_Langpack_Help_$lang  	&& lang_lists="$lang_lists gid_Module_Langpack_Help.$lang" || :
 		fi
 		test -n "$lang_lists" && cat $lang_lists | sort -u >$BUILDDIR/lang_${lang}_list.txt || :
 
@@ -822,20 +848,13 @@
         create_package_directory gid_Module_Optional_Kde                pkg/openoffice.org-kde
 	create_package_directory gid_Module_Optional_Headless		pkg/openoffice.org-headless
 
-        if [ -f gid_Module_Optional_Mailcap ]; then
-            # pre m76
-            create_package_directory gid_Module_Optional_Mailcap            pkg/openoffice.org-common
-        else
-            create_package_directory gid_Module_Root_Files_2                pkg/openoffice.org-common
-            create_package_directory gid_Module_Root_Files_3                pkg/openoffice.org-common
-            create_package_directory gid_Module_Root_Files_4                pkg/openoffice.org-common
-            create_package_directory gid_Module_Root_Files_5                pkg/openoffice.org-common
-            create_package_directory gid_Module_Root_Files_6                pkg/openoffice.org-common
-            create_package_directory gid_Module_Root_Files_7                pkg/openoffice.org-common
-            #create_package_directory gid_Module_Root_Files_8                pkg/openoffice.org-common
-#            create_package_directory gid_Module_Optional_Oo_English         pkg/openoffice.org-common
-            create_package_directory gid_Module_Optional_Testtool           pkg/openoffice.org-common
-        fi            
+        create_package_directory gid_Module_Root_Files_2                pkg/openoffice.org-common
+        create_package_directory gid_Module_Root_Files_3                pkg/openoffice.org-common
+        create_package_directory gid_Module_Root_Files_4                pkg/openoffice.org-common
+        create_package_directory gid_Module_Root_Files_5                pkg/openoffice.org-common
+        create_package_directory gid_Module_Root_Files_6                pkg/openoffice.org-common
+        create_package_directory gid_Module_Root_Files_7                pkg/openoffice.org-common
+        create_package_directory gid_Module_Optional_Testtool           pkg/openoffice.org-common
 
 	create_package_directory gid_Module_Root_SDK                    pkg/openoffice.org-dev
 
@@ -847,6 +866,14 @@
 		create_package_directory gid_Module_Langpack_Brand_`echo $l | sed -e s/-/_/g`	pkg/openoffice.org-l10n-$l
 		create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g`        pkg/openoffice.org-l10n-$l
 		create_package_directory gid_Module_Langpack_Help_`echo $l | sed -e s/-/_/g`    pkg/openoffice.org-help-$l
+		if [ -f gid_Module_Optional_Binfilter ]; then
+			echo $l
+			if [ "$l" = "en-US" ]; then
+				create_package_directory gid_Module_Langpack_Binfilter_en_US    pkg/openoffice.org-filter-binfilter
+			else
+				create_package_directory gid_Module_Langpack_Binfilter_`echo $l | sed -e s/-/_/g`    pkg/openoffice.org-l10n-$l
+			fi
+		fi
 	done
 
 	# move_wrappers <directory_name> <name> [...]
@@ -868,27 +895,17 @@
 	move_wrappers pkg/openoffice.org-math oomath
 	move_wrappers pkg/openoffice.org-draw oodraw
 	
-	# Core package contains arch dependent files
-	#mkdir -m755 -p pkg/openoffice.org-core/$OOINSTBASE/program/filter
-	#mv pkg/openoffice.org-common/$OOINSTBASE/program/filter/* pkg/openoffice.org-core/$OOINSTBASE/program/filter
-	
-	# Move pyuno into seperate package
-	#mkdir -m755 -p pkg/python-uno/$OOINSTBASE/program
-	#( cd pkg/openoffice.org-common/$OOINSTBASE/program
-	#  find -type f -maxdepth 1 \
-	#       -regex '\./\(.*\.py\|.*pyuno.*\|python.*\)' \
-	#	   -exec mv {} $OODESTDIR/pkg/python-uno/$OOINSTBASE/program \;
-	#)
-
 	# Move all libraries, binaries, *.rdb from -common to -core
-	if [ ! -d $OODESTDIR/pkg/openoffice.org-core/$OOINSTBASE/program ]; then \
-	  mkdir -p $OODESTDIR/pkg/openoffice.org-core/$OOINSTBASE/program; \
-	fi &&
-	( cd pkg/openoffice.org-common/$OOINSTBASE/program
-	  find -maxdepth 1 -type f \
+	for d in $OOINSTBASE/basis$VERSION/program $OOINSTBASE/program; do \
+	  if [ ! -d $OODESTDIR/pkg/openoffice.org-core/$d ]; then \
+	  mkdir -p $OODESTDIR/pkg/openoffice.org-core/$d; \
+	  fi &&
+	  ( cd pkg/openoffice.org-common/$d
+	    find -maxdepth 1 -type f \
 	       -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
-		   -exec mv {} $OODESTDIR/pkg/openoffice.org-core/$OOINSTBASE/program \;
-	)
+		   -exec mv {} $OODESTDIR/pkg/openoffice.org-core/$d \;
+	  ); \
+	done
 
 	# install additional ooo-build scripts & misc stuff
 	mkdir -p pkg/openoffice.org-common/usr/share/man/man1
@@ -897,17 +914,13 @@
 	mkdir -p pkg/openoffice.org-common/etc/bash_completion.d
 	mv etc/bash_completion.d/ooffice$BINSUFFIX.sh \
 		pkg/openoffice.org-common/etc/bash_completion.d
-	mv .$OOINSTBASE/program/java-set-classpath \
+	mv .$OOINSTBASE/basis$VERSION/program/java-set-classpath \
 		pkg/openoffice.org-common/$OOINSTBASE/program
-	if [ -e .$OOINSTBASE/program/kdebe1.uno.so ]; then \
-		mv .$OOINSTBASE/program/kdebe*.uno.so \
-			pkg/openoffice.org-core/$OOINSTBASE/program; \
-	fi
 	if echo $OOO_LANGS_LIST | grep -q en-US; then
 		for i in forms/resume.ott officorr/project-proposal.ott; do \
-			mkdir -p pkg/openoffice.org-common/$OOINSTBASE/share/template/en-US/`dirname $i`; \
-			mv .$OOINSTBASE/share/template/en-US/$i \
-				pkg/openoffice.org-common/$OOINSTBASE/share/template/en-US/$i; \
+			mkdir -p pkg/openoffice.org-common/$OOINSTBASE/basis$VERSION/share/template/en-US/`dirname $i`; \
+			mv .$OOINSTBASE/basis$VERSION/share/template/en-US/$i \
+				pkg/openoffice.org-common/$OOINSTBASE/basis$VERSION/share/template/en-US/$i; \
 		done; \
 	fi
 	# Warn for any remaining files

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon May 19 20:36:51 2008
@@ -955,6 +955,10 @@
 # even when it is built with JDK 1.5
 #FIXME dev300-m10: build-java-target.diff, pmladek
 
+[ BuildBits == dev300-m13 ]
+# deliver hyphen.h also on Windows
+win32-hyphen-h.diff
+
 [ BuildBits < dev300-m11 ]
 buildfix-xmlhelp-system-expat.diff, i#86979
 buildfix-disable-pdfimport.diff, i#88375

Added: trunk/patches/dev300/win32-hyphen-h.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/win32-hyphen-h.diff	Mon May 19 20:36:51 2008
@@ -0,0 +1,11 @@
+diff -u -u -r1.6 makefile.mk
+--- hyphen/makefile.mk	15 May 2008 09:31:08 -0000	1.6
++++ hyphen/makefile.mk	19 May 2008 13:02:58 -0000
+@@ -69,6 +69,7 @@
+ 
+ .IF "$(GUI)"=="WNT"
+ BUILD_ACTION=dmake
++OUT2INC += hyphen.h 
+ .ENDIF # "$(GUI)"=="WNT"
+ 
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]