GNOME.org
 

ooo-build r13365 - in trunk: . bin/piece doc patches/dev300 scratch/split

Author: michael
Date: Wed Jul 23 14:37:52 2008
New Revision: 13365
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13365&view=rev

Log:
2008-07-23  Michael Meeks  <michael meeks novell com>

        * bin/piece/sys-setup: get libs in the right order - to avoid
        linking static libraries in error, system solver comes last.

        * bin/piece/copyexcept: fix file attributes on installed files.



Modified:
   trunk/ChangeLog
   trunk/bin/piece/copyexcept
   trunk/bin/piece/sys-setup
   trunk/doc/split.txt
   trunk/patches/dev300/piece-target.diff
   trunk/scratch/split/ooo3_artwork.spec
   trunk/scratch/split/ooo3_libs_core.spec
   trunk/scratch/split/ooo3_libs_extern.spec
   trunk/scratch/split/ooo3_libs_gui.spec

Modified: trunk/bin/piece/copyexcept
==============================================================================
--- trunk/bin/piece/copyexcept	(original)
+++ trunk/bin/piece/copyexcept	Wed Jul 23 14:37:52 2008
@@ -34,7 +34,9 @@
 	closedir ($dir);
     } elsif (-f $src) {
 	print "syscopy $src -> $dest\n";
-	File::Copy::syscopy ($src, $dest) || die "Failed to copy $src -> $dest: $!";
+	File::Copy::copy ($src, $dest) || die "Failed to copy $src -> $dest: $!";
+	my $perm = (stat $src)[2];
+	chmod ($perm, $dest);
     } else {
 	print "skipping link $src\n";
     }

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Wed Jul 23 14:37:52 2008
@@ -14,6 +14,11 @@
 INSTALL_DIR=$OO_INSTDIR/basis3.0/program
 DEV_DIR=$OO_SOLVERDIR
 
+# dmake can't cope with '_' in env. var names (interestingly)
+export SPLITUREDIR=$URE_DIR
+export SPLITINSTALLDIR=$INSTALL_DIR
+export SPLITDEVDIR=$DEV_DIR
+
 PRESERVE_PATH=$PATH
 PATH=
 
@@ -47,8 +52,10 @@
 SOLARINC=" -I. -I$SOLARVER/inc/stl -I$SOLARVER/inc/external -I$SOLARVER/inc -I$SOLARENV/$OUTPATH/inc -I$DEV_DIR/inc -I$SOLARENV/inc -I$SRC_ROOT/res -I$SOLARENV/inc/Xp31"
 SOLARINC="$SOLARINC -I$SOLARPIECE/$INPATH/inc/stl -I$SOLARPIECE/$INPATH/inc/external -I$SOLARPIECE/$INPATH/inc -I$SOLARPIECE/$OUTPATH/inc"
 SOLARINC="$SOLARINC -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/native_threads/include -I/usr/include"
-SOLARLIB=" -L../lib -L$SOLARENV/$OUTPATH/lib -L$SOLARVER/lib -L$SOLARENV/$OUTPATH/lib"
-SOLARLIB="$SOLARLIB -L$URE_DIR/lib -L$INSTALL_DIR -L$SOLARPIECE/$INPATH/lib"
+
+SOLARLIB=" -L../lib -L$SOLARPIECE/$INPATH/lib -L$SOLARENV/$OUTPATH/lib -L$SOLARENV/$OUTPATH/lib"
+SOLARLIB="$SOLARLIB -L$URE_DIR/lib -L$INSTALL_DIR "
 SOLARLIB="$SOLARLIB -L$JAVA_HOME/lib -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/native_threads -L/usr/lib -L/usr/lib/xulrunner-1.9"
+SOLARLIB="$SOLARLIB -L$SOLARVER/lib" # NB. at the end - it has static libraries in there we don't prefer.
 export SOLARLIB SOLARINC
 export SOLARIDLINC="-I$SOLARVERSION/$INPATH/idl$EXT_UPDMINOR -I$SOLARPIECE/$INPATH/idl$EXT_UPDMINOR"

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Wed Jul 23 14:37:52 2008
@@ -66,6 +66,12 @@
 	+ sample .spec files are in scratch/split/ooo3_*.spec
 
 TODO:
+	+ FIXME: the all_filelist.txt we use in copyexcept should
+	  list both source & dest files, and handle links, by adding
+	  symlinks to the system-installed library for lib symlinks
+	  eg. solver/lib/libfoo.so -> ../../program/libfoo.so.1.2.3 etc.
+		+ this should shrink the -devel packages substantially.
+
 	+ we install all the artwork into the system:
 		+ yet really it would be far better to install just
 		the .zip archives, and work from them

Modified: trunk/patches/dev300/piece-target.diff
==============================================================================
--- trunk/patches/dev300/piece-target.diff	(original)
+++ trunk/patches/dev300/piece-target.diff	Wed Jul 23 14:37:52 2008
@@ -25,12 +25,14 @@
  .ENDIF		# "$(PRJINC)"!=""
  INCLUDE_C=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
  .EXPORT : LIB
-@@ -218,6 +218,7 @@
+@@ -218,6 +218,9 @@
  LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)$/$i)
  NEWCLASS:=$(LOCALJARS)
  NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)$/$i $(NULL)))
 +NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARPIECE)$/$(INPATH)$/bin/$i $(NULL)))
- .ENDIF			# "$(JARFILES)"!=""
++NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SPLITINSTALLDIR)$/classes/$i $(NULL)))
++NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SPLITUREDIR)$/share$/java/$i $(NULL)))
+ .ENDIF                 # "$(JARFILES)"!=""
  .IF "$(EXTRAJARFILES)"!=""
  NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)$/$i)
 

Modified: trunk/scratch/split/ooo3_artwork.spec
==============================================================================
--- trunk/scratch/split/ooo3_artwork.spec	(original)
+++ trunk/scratch/split/ooo3_artwork.spec	Wed Jul 23 14:37:52 2008
@@ -20,7 +20,7 @@
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        6
+Release:        7
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/

Modified: trunk/scratch/split/ooo3_libs_core.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_core.spec	(original)
+++ trunk/scratch/split/ooo3_libs_core.spec	Wed Jul 23 14:37:52 2008
@@ -21,7 +21,7 @@
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        6
+Release:        7
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -60,6 +60,10 @@
 export DESTDIR=$RPM_BUILD_ROOT
 
 $OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
+# prune redundant files the scp2 likes to make for us
+rm -Rf \
+    "$DESTDIR/$OO_INSTDIR/basis-link" \
+    "$DESTDIR/$OO_INSTDIR/ure"
 
 %clean
 %post
@@ -67,9 +71,12 @@
 
 %files
 %defattr(-,root,root)
-# FIXME - should have the actual files in it ! ;-)
-# except we have ~none here - just a devel package (?)
-# is there anything we absolutely need here ?
+%dir %ooo_prefix/%ooo_home/basis3.0
+%dir %ooo_prefix/%ooo_home/program
+%dir %ooo_prefix/%ooo_home/share
+%ooo_prefix/%ooo_home/basis3.0/*
+%ooo_prefix/%ooo_home/program/*
+%ooo_prefix/%ooo_home/share/*
 
 %files devel
 %defattr(-,root,root)

Modified: trunk/scratch/split/ooo3_libs_extern.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_extern.spec	(original)
+++ trunk/scratch/split/ooo3_libs_extern.spec	Wed Jul 23 14:37:52 2008
@@ -22,7 +22,7 @@
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        6
+Release:        7
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -62,15 +62,23 @@
 
 $OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
 
+# prune redundant files the scp2 likes to make for us
+rm -Rf \
+    "$DESTDIR/$OO_INSTDIR/basis-link" \
+    "$DESTDIR/$OO_INSTDIR/ure"
+
 %clean
 %post
 %post devel
 
 %files
 %defattr(-,root,root)
-# FIXME - should have the actual files in it ! ;-)
-# except we have ~none here - just a devel package (?)
-# is there anything we absolutely need here ?
+%dir %ooo_prefix/%ooo_home/basis3.0
+%dir %ooo_prefix/%ooo_home/program
+%dir %ooo_prefix/%ooo_home/share
+%ooo_prefix/%ooo_home/basis3.0/*
+%ooo_prefix/%ooo_home/program/*
+%ooo_prefix/%ooo_home/share/*
 
 %files devel
 %defattr(-,root,root)

Modified: trunk/scratch/split/ooo3_libs_gui.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_gui.spec	(original)
+++ trunk/scratch/split/ooo3_libs_gui.spec	Wed Jul 23 14:37:52 2008
@@ -21,7 +21,7 @@
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        6
+Release:        7
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -60,6 +60,10 @@
 export DESTDIR=$RPM_BUILD_ROOT
 
 $OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
+# prune redundant files the scp2 likes to make for us
+rm -Rf \
+    "$DESTDIR/$OO_INSTDIR/basis-link" \
+    "$DESTDIR/$OO_INSTDIR/ure"
 
 %clean
 %post
@@ -67,9 +71,12 @@
 
 %files
 %defattr(-,root,root)
-# FIXME - should have the actual files in it ! ;-)
-# except we have ~none here - just a devel package (?)
-# is there anything we absolutely need here ?
+%dir %ooo_prefix/%ooo_home/basis3.0
+%dir %ooo_prefix/%ooo_home/program
+%dir %ooo_prefix/%ooo_home/share
+%ooo_prefix/%ooo_home/basis3.0/*
+%ooo_prefix/%ooo_home/program/*
+%ooo_prefix/%ooo_home/share/*
 
 %files devel
 %defattr(-,root,root)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]