GNOME.org
 

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

Author: rengelhard
Date: Wed Jul 16 23:30:02 2008
New Revision: 13256
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13256&view=rev

Log:
2008-07-17  Rene Engelhard  <rene debian org>

        * patches/dev300/scp2-3layer-nicer-paths-m24.diff,
          patches/dev300/scp2-3layer-nicer-paths.diff: add sdkoo blurb for
          >= m25
        * bin/ooinstall: install the SDK to $path instead of $path/sdk. Works
          from m25 onwards.
        * patches/dev300/sdk-gid-module-name-m24.diff,
          patches/dev300/sdk-gid-module-name.diff,
          patches/dev300/apply: sdk-gid-module-name.diff apparently still
          needed for m25, gid_Module_Optional_Sdkoo seems to be unused.
          Update for dev300-m25 then.
        * bin/package-ooo: s,$OOINSTDIR/sdk,$OOINSTDIR/basis$VERSION/sdk,g and
          s,$OOINSTBASE/sdk,$OOINSTBASE/basis$VERSION/sdk,g
        * patches/dev300/apply: cmcfixes47 will be in dev300-m26


Added:
   trunk/patches/dev300/scp2-3layer-nicer-paths-m24.diff   (props changed)
      - copied unchanged from r13253, /trunk/patches/dev300/scp2-3layer-nicer-paths.diff
   trunk/patches/dev300/sdk-gid-module-name-m24.diff
      - copied unchanged from r13253, /trunk/patches/dev300/sdk-gid-module-name.diff
Modified:
   trunk/ChangeLog
   trunk/bin/ooinstall
   trunk/bin/package-ooo
   trunk/patches/dev300/apply
   trunk/patches/dev300/scp2-3layer-nicer-paths.diff
   trunk/patches/dev300/sdk-gid-module-name.diff

Modified: trunk/bin/ooinstall
==============================================================================
--- trunk/bin/ooinstall	(original)
+++ trunk/bin/ooinstall	Wed Jul 16 23:30:02 2008
@@ -164,7 +164,7 @@
 	"perl -w $configure_vars{SOLARENV}/bin/make_installer.pl " .
 	"-f openoffice.lst -l en-US -p OpenOffice_SDK " .
 	"-buildid $BUILD $destdir $strip " .
-	"-simple $path/sdk") && die "Failed to install: $!";
+	"-simple $path") && die "Failed to install: $!";
 }
 print "Installer finished\n";
 

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Wed Jul 16 23:30:02 2008
@@ -358,50 +358,42 @@
     done
 fi
 
-if test -d $OOINSTDIR/sdk ; then
+if test -d $OOINSTDIR/basis$VERSION/sdk ; then
     # bin potential .orig files
-    find $OOINSTDIR/sdk -name "*.orig" -exec rm -f {} \;
+    find $OOINSTDIR/basis$VERSION/sdk -name "*.orig" -exec rm -f {} \;
 
     # move some SDK directories to the right place according to FHS
-    # note that examples must stay in $OOINSTDIR/sdk because there are used
-    # relative paths to $OOINSTDIR/sdk/setting and it does not work via
+    # note that examples must stay in $OOINSTDIR/basis$VERSION/sdk because there are used
+    # relative paths to $OOINSTDIR/basis$VERSION/sdk/setting and it does not work via
     # a symlink
     mkdir -p $PREFIX/include
     mkdir -p $DATADIR/idl
     mkdir -p $DATADIR/$OOOINSTALLDIRNAME/sdk
     mkdir -p $DOCDIR/sdk
-    mv $OOINSTDIR/sdk/include      $PREFIX/include/$OOOINSTALLDIRNAME
-    if [ -d $OOINSTDIR/sdk/classes ]; then
-        mv $OOINSTDIR/sdk/classes      $DATADIR/$OOOINSTALLDIRNAME/sdk/classes
+    mv $OOINSTDIR/basis$VERSION/sdk/include      $PREFIX/include/$OOOINSTALLDIRNAME
+    if [ -d $OOINSTDIR/basis$VERSION/sdk/classes ]; then
+        mv $OOINSTDIR/basis$VERSION/sdk/classes      $DATADIR/$OOOINSTALLDIRNAME/sdk/classes
     fi
-    mv $OOINSTDIR/sdk/idl          $DATADIR/idl/$OOOINSTALLDIRNAME
-    mv $OOINSTDIR/sdk/docs         $DOCDIR/sdk
-    mv $OOINSTDIR/sdk/share/readme $DOCDIR/sdk
-    mv $OOINSTDIR/sdk/LICENSE*     $DOCDIR/sdk
-    mv $OOINSTDIR/sdk/README*      $DOCDIR/sdk
-    mv $OOINSTDIR/sdk/index.html   $DOCDIR/sdk
-
-    # bin empty directories
-    rmdir $OOINSTDIR/sdk/share/
+    mv $OOINSTDIR/basis$VERSION/sdk/idl          $DATADIR/idl/$OOOINSTALLDIRNAME
+    mv $OOINSTDIR/basis$VERSION/sdk/docs         $DOCDIR/sdk
+    mv $OOINSTDIR/basis$VERSION/sdk/index.html   $DOCDIR/sdk
 
     # compat symlinks
-    ln -sf $PREFIXBASE/include/$OOOINSTALLDIRNAME      $OOINSTDIR/sdk/include
-    ln -sf $DATADIRBASE/$OOOINSTALLDIRNAME/sdk/classes $OOINSTDIR/sdk/classes
-    ln -sf $DATADIRBASE/idl/$OOOINSTALLDIRNAME         $OOINSTDIR/sdk/idl
-    ln -sf $DOCDIRBASE/sdk/docs                        $OOINSTDIR/sdk/
-    ln -sf $DOCDIRBASE/sdk/index.html                  $OOINSTDIR/sdk/index.html
-    ln -sf $OOINSTBASE/sdk/examples                    $DOCDIR/sdk/examples
+    ln -sf $PREFIXBASE/include/$OOOINSTALLDIRNAME      $OOINSTDIR/basis$VERSION/sdk/include
+    ln -sf $DATADIRBASE/$OOOINSTALLDIRNAME/sdk/classes $OOINSTDIR/basis$VERSION/sdk/classes
+    ln -sf $DATADIRBASE/idl/$OOOINSTALLDIRNAME         $OOINSTDIR/basis$VERSION/sdk/idl
+    ln -sf $DOCDIRBASE/sdk/docs                        $OOINSTDIR/basis$VERSION/sdk/
+    ln -sf $DOCDIRBASE/sdk/index.html                  $OOINSTDIR/basis$VERSION/sdk/index.html
+    ln -sf $OOINSTBASE/basis$VERSION/sdk/examples                    $DOCDIR/sdk/examples
 
     # fix file list
-    sed -e "s|^\(%dir \)\?$OOINSTBASE/sdk/include|\1$PREFIXBASE/include/$OOOINSTALLDIRNAME|" \
-	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/classes|\1$DATADIRBASE/$OOOINSTALLDIRNAME/sdk/classes|" \
-	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/idl|\1$DATADIRBASE/idl/$OOOINSTALLDIRNAME|" \
-	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/docs|\1$DOCDIRBASE/sdk/docs|" \
-	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/share/readme|\1$DOCDIRBASE/sdk/readme|" \
-	-e "s|^$OOINSTBASE/sdk/LICENSE\(.*\)$|$DOCDIRBASE/sdk/LICENSE\1|" \
-	-e "s|^$OOINSTBASE/sdk/README\(.*\)$|$DOCDIRBASE/sdk/README\1|" \
-	-e "s|^$OOINSTBASE/sdk/index.html$|$DOCDIRBASE/sdk/index.html|" \
-	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/share.*$||" \
+    sed -e "s|^\(%dir \)\?$OOINSTBASE/basis$VERSION/sdk/include|\1$PREFIXBASE/include/$OOOINSTALLDIRNAME|" \
+	-e "s|^\(%dir \)\?$OOINSTBASE/basis$VERSION/sdk/classes|\1$DATADIRBASE/$OOOINSTALLDIRNAME/sdk/classes|" \
+	-e "s|^\(%dir \)\?$OOINSTBASE/basis$VERSION/sdk/idl|\1$DATADIRBASE/idl/$OOOINSTALLDIRNAME|" \
+	-e "s|^\(%dir \)\?$OOINSTBASE/basis$VERSION/sdk/docs|\1$DOCDIRBASE/sdk/docs|" \
+	-e "s|^\(%dir \)\?$OOINSTBASE/basis$VERSION/sdk/share/readme|\1$DOCDIRBASE/sdk/readme|" \
+	-e "s|^$OOINSTBASE/basis$VERSION/sdk/index.html$|$DOCDIRBASE/sdk/index.html|" \
+	-e "s|^\(%dir \)\?$OOINSTBASE/basis$VERSION/sdk/share.*$||" \
 	-e "/\.orig$/D" \
 	-e "/^$/D" \
 	$OODESTDIR/gid_Module_Root_SDK | sort -u \
@@ -414,17 +406,17 @@
     echo "%dir $DOCDIRBASE/sdk/docs"                   >>$OODESTDIR/gid_Module_Root_SDK
     echo "%dir $DOCDIRBASE/sdk"                        >>$OODESTDIR/gid_Module_Root_SDK
     echo "%dir $DOCDIRBASE"                            >>$OODESTDIR/gid_Module_Root_SDK
-    echo "$OOINSTBASE/sdk/include"     >>$OODESTDIR/gid_Module_Root_SDK
-    echo "$OOINSTBASE/sdk/classes"     >>$OODESTDIR/gid_Module_Root_SDK
-    echo "$OOINSTBASE/sdk/idl"         >>$OODESTDIR/gid_Module_Root_SDK
-    echo "$OOINSTBASE/sdk/docs"        >>$OODESTDIR/gid_Module_Root_SDK
-    echo "$OOINSTBASE/sdk/index.html"  >>$OODESTDIR/gid_Module_Root_SDK
+    echo "$OOINSTBASE/basis$VERSION/sdk/include"     >>$OODESTDIR/gid_Module_Root_SDK
+    echo "$OOINSTBASE/basis$VERSION/sdk/classes"     >>$OODESTDIR/gid_Module_Root_SDK
+    echo "$OOINSTBASE/basis$VERSION/sdk/idl"         >>$OODESTDIR/gid_Module_Root_SDK
+    echo "$OOINSTBASE/basis$VERSION/sdk/docs"        >>$OODESTDIR/gid_Module_Root_SDK
+    echo "$OOINSTBASE/basis$VERSION/sdk/index.html"  >>$OODESTDIR/gid_Module_Root_SDK
     echo "$DOCDIRBASE/sdk/examples"    >>$OODESTDIR/gid_Module_Root_SDK
 
     # generate default profiles
     for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
         sed -e "s,@OO_SDK_NAME@,OpenOffice.org2.0_SDK," \
-	    -e "s,@OO_SDK_HOME@,$OOINSTBASE/sdk," \
+	    -e "s,@OO_SDK_HOME@,$OOINSTBASE/basis$VERSION/sdk," \
 	    -e "s,@OFFICE_HOME@,$OOINSTBASE," \
 	    -e "s,@OO_SDK_URE_HOME@,," \
 	    -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
@@ -434,14 +426,14 @@
 	    -e "s,@OO_SDK_JAVA_HOME@,$JAVA_HOME," \
 	    -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
 	    -e "s,@SDK_AUTO_DEPLOYMENT@,NO," \
-            $OOINSTDIR/sdk/$file.in \
-	    > $OOINSTDIR/sdk/$file
-	chmod 755 $OOINSTDIR/sdk/$file
-	echo $OOINSTBASE/sdk/$file >>$OODESTDIR/gid_Module_Root_SDK
+            $OOINSTDIR/basis$VERSION/sdk/$file.in \
+	    > $OOINSTDIR/basis$VERSION/sdk/$file
+	chmod 755 $OOINSTDIR/basis$VERSION/sdk/$file
+	echo $OOINSTBASE/basis$VERSION/sdk/$file >>$OODESTDIR/gid_Module_Root_SDK
     done
     
     # FIXME: I rather set this file to be non-world-writttable for now, i#64812
-    chmod go-w $OOINSTDIR/sdk/settings/component.uno.map
+    chmod go-w $OOINSTDIR/basis$VERSION/sdk/settings/component.uno.map
 fi
 
 if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then
@@ -722,10 +714,10 @@
 		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$DOCDIRBASE/sdk/docs.*"
 		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$DOCDIRBASE/sdk/examples"
 		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$DOCDIRBASE/sdk/index.html"
-		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "%dir $OOINSTBASE/sdk/examples.*"
-		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$OOINSTBASE/sdk/docs"
-		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$OOINSTBASE/sdk/examples.*"
-		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$OOINSTBASE/sdk/index.html"
+		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "%dir $OOINSTBASE/basis$VERSION/sdk/examples.*"
+		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$OOINSTBASE/basis$VERSION/sdk/docs"
+		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$OOINSTBASE/basis$VERSION/sdk/examples.*"
+		mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$OOINSTBASE/basis$VERSION/sdk/index.html"
 		add_used_directories sdk_doc_list.txt sdk_list.txt
 	fi	    
 
@@ -902,7 +894,6 @@
 		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
@@ -1008,7 +999,7 @@
 fi
 
 echo "Fixing permissions..."
-for dir in $DOCDIR $OOINSTDIR/sdk/examples ; do
+for dir in $DOCDIR $OOINSTDIR/basis$VERSION/sdk/examples ; do
     if test -d $dir -a -w $dir ; then
 	find "$dir" -type f \( -name "*.txt" -o -name "*.java" -o -name "*.xml"    -o \
 			       -name "*.xcu" -o -name "*.xcs"  -o -name "*.html"   -o \

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul 16 23:30:02 2008
@@ -247,6 +247,10 @@
 # don't lstat() that much while creating absolute URLs
 speed-sal-fewer-lstats.diff, i#89730, jholesov
 
+[ TemporaryHacks < dev300-m25 ]
+# flatten the structure of the 3 layer OOo a bit
+scp2-3layer-nicer-paths-m24.diff, i#90430, jholesov
+[ TemporaryHacks >= dev300-m25 ]
 # flatten the structure of the 3 layer OOo a bit
 scp2-3layer-nicer-paths.diff, i#90430, jholesov
 
@@ -301,7 +305,7 @@
 cws-webdavandgvfslocking1-sc.diff
 cws-webdavandgvfslocking1-sfx2.diff
 cws-webdavandgvfslocking1-tools.diff
-cws-webdavandgvfslocking1-ucb.diff
+#cws-webdavandgvfslocking1-ucb.diff
 cws-webdavandgvfslocking1-unotools.diff
 # don't lock for infinite, instead set timeout to 3 minutes, and refresh 30
 # sec before expiration
@@ -326,6 +330,7 @@
 # the -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.diff
 
+[ CWSBackports < dev300-m26 ]
 # fix mozilla plugin on 64bit
 cws-cmcfixes47-extensions.diff, i#82545
 
@@ -723,8 +728,8 @@
 # load, store and save the sheet protection options from and to an Excel file,
 # and use that information to constrain cell cursor movement when the sheet is
 # protected.  Also to support encryption on Excel file export.
-cws-scsheetprotection02-sc.diff,   i#60305, i#71468, i#84766, kohei  
-cws-scsheetprotection02-windowsfix.diff, noelp
+#cws-scsheetprotection02-sc.diff,   i#60305, i#71468, i#84766, kohei  
+#cws-scsheetprotection02-windowsfix.diff, noelp
 cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei  
 cws-scsheetprotection02-svx.diff,  i#60305, i#71468, i#84766, kohei   
 
@@ -1148,6 +1153,10 @@
 [ BuildBits < dev300-m25 ]
 # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
 # of files does not conflict with the main package, i#64802
+sdk-gid-module-name-m24.diff, pmladek, i#64802
+[ BuildBits >= dev300-m25 ]
+# changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
+# of files does not conflict with the main package, i#64802
 sdk-gid-module-name.diff, pmladek, i#64802
 
 # do not pack any potential .orig files with ppds
@@ -1621,11 +1630,11 @@
 # Add HPageBreaks object
 vba-pagebreak-object.diff, n#405312, Fong
 # Add Worksheet.EnableSelection
-vba-worksheet-enableselection.diff, n#405312, Fong
+#vba-worksheet-enableselection.diff, n#405312, Fong
 # Add to support Application.Union
 vba-application-union.diff, n#405313, Fong
 # Add to support Worksheet.Index, and fix for n#403974
-vba-worksheet-fix-n403974.diff, n#403974, Fong
+#vba-worksheet-fix-n403974.diff, n#403974, Fong
 
 [ VBAUntested ]
 SectionOwner => noelpwer

Modified: trunk/patches/dev300/scp2-3layer-nicer-paths.diff
==============================================================================
--- trunk/patches/dev300/scp2-3layer-nicer-paths.diff	(original)
+++ trunk/patches/dev300/scp2-3layer-nicer-paths.diff	Wed Jul 16 23:30:02 2008
@@ -37,3 +37,14 @@
    #endif
      Styles = (OFFICEDIRECTORY);
  End
+--- scp2/source/sdkoo/sdkoo.scp-old	2008-07-16 20:49:43.000000000 +0200
++++ scp2/source/sdkoo/sdkoo.scp	2008-07-16 20:50:36.000000000 +0200
+@@ -55,7 +55,7 @@
+   #ifdef WNT
+     HostName = "${BASISROOTNAME}";
+   #else
+-    HostName = "${UNIXBASISROOTNAME}";
++    HostName = ".";
+   #endif
+ End
+ #endif

Modified: trunk/patches/dev300/sdk-gid-module-name.diff
==============================================================================
--- trunk/patches/dev300/sdk-gid-module-name.diff	(original)
+++ trunk/patches/dev300/sdk-gid-module-name.diff	Wed Jul 16 23:30:02 2008
@@ -1,22 +1,22 @@
 --- setup_native/source/packinfo/packinfo_sdkoo.txt  6 Sep 2007 10:02:35 -0000       1.2
 +++ setup_native/source/packinfo/packinfo_sdkoo.txt  28 Nov 2007 11:46:14 -0000
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  #*************************************************************************
  
  Start
 -module = "gid_Module_Root"
 +module = "gid_Module_Root_SDK"
- solarispackagename = "OpenOfficeorg%WITHOUTDOTPRODUCTVERSIONSDK"
- packagename = "openoffice.org%PRODUCTVERSION-sdk"
- copyright = "2005-2007 by OpenOffice.org"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-sdk"
+ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
+ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-sdk"
 --- scp2/source/sdkoo/sdkoo.scp.old	2005-11-09 10:40:01.000000000 +0100
 +++ scp2/source/sdkoo/sdkoo.scp	2006-04-25 16:44:28.000000000 +0200
-@@ -60,7 +60,7 @@
-     DosName = "readme";
+@@ -117,7 +117,7 @@
  End
  
+ 
 -Module gid_Module_Root
 +Module gid_Module_Root_SDK
      Name = "sdkoo";
      Description = "sdkoo";
- End
+     PackageInfo = "packinfo_sdkoo.txt";
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]