ooo-build r12995 - in trunk: . bin bin/piece doc

From: michael svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12995 - in trunk: . bin bin/piece doc
Date: Mon, 30 Jun 2008 17:02:36 +0000 (UTC)
Author: michael
Date: Mon Jun 30 17:02:36 2008
New Revision: 12995
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12995&view=rev

Log:
2008-06-30  Michael Meeks  <michael meeks novell com>

        * bin/package_ooo: add piece capability.

        * configure.in, bin/Makefile.am, bin/piece/Makefile.am,
        * bin/piece/build-bootstrap, build-install, build-ure: add.

        * Makefile.shared (artwork.install): make more directories if
        they are not there (build in pieces), and don't convert if
        introabout not present.



Added:
   trunk/bin/piece/
   trunk/bin/piece/Makefile.am
   trunk/bin/piece/build-bootstrap   (contents, props changed)
   trunk/bin/piece/build-ure   (contents, props changed)
   trunk/bin/piece/install-bootstrap   (contents, props changed)
   trunk/bin/piece/install-ure   (contents, props changed)
   trunk/bin/piece/sys-setup
Modified:
   trunk/ChangeLog
   trunk/Makefile.shared
   trunk/bin/Makefile.am
   trunk/bin/build-ooo
   trunk/bin/package-ooo
   trunk/configure.in
   trunk/doc/split.txt

Modified: trunk/Makefile.shared
==============================================================================
--- trunk/Makefile.shared	(original)
+++ trunk/Makefile.shared	Mon Jun 30 17:02:36 2008
@@ -46,20 +46,29 @@
 			      $(STAMP_DIR)/prebuild \
 			      $(wildcard $(top_srcdir)/src/*.png) \
 			      $(wildcard $(top_srcdir)/src/*.bmp)
-	mkdir -p $(OOBUILDDIR)/svx/res
+	mkdir -p $(OOBUILDDIR)/setup_native/source/win32/nsis
 	cp $(top_srcdir)/src/ooobitmap_*.bmp $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no nsis installer images to copy"
 	cp $(top_srcdir)/src/ooobanner_*.bmp $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no nsis banner images to copy"
 	cp $(top_srcdir)/src/ooosetup_*.ico $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no installer icon to copy"
+	mkdir -p $(OOBUILDDIR)/instsetoo_native/res
 	cp $(top_srcdir)/src/nologoinstall_*.bmp $(OOBUILDDIR)/instsetoo_native/res/ || echo "no installer sidebar images to copy"
 	cp $(top_srcdir)/src/banner_*.bmp $(OOBUILDDIR)/instsetoo_native/res/ || echo "no installer banner images to copy"
+	mkdir -p $(OOBUILDDIR)/svx/res
 	cp $(top_srcdir)/src/open*_*.bmp $(OOBUILDDIR)/svx/res/ || echo "no intro images to copy"
+	mkdir -p $(OOBUILDDIR)/default_images/svx/res
+	mkdir -p $(OOBUILDDIR)/default_images/sw/res
 	cp $(top_srcdir)/src/open*_*.png $(OOBUILDDIR)/default_images/svx/res/ || echo "no about images to copy"
 	cp $(top_srcdir)/src/*-team.png $(OOBUILDDIR)/default_images/sw/res/ || echo "no team images to copy"
 # Ignore convert.exe in windows/system32
-	case "`which convert`" in \
-		*32/convert) ;; \
-		/*) mv $(OOBUILDDIR)/default_images/introabout/intro.bmp $(OOBUILDDIR)/default_images/introabout/intro-save.bmp && convert $(OOBUILDDIR)/default_images/introabout/intro-save.bmp -depth 24 -type TrueColor $(OOBUILDDIR)/default_images/introabout/intro.bmp ;; \
-	esac
+	if test -d $(OOBUILDDIR)/default_images/introabout; then \
+		case "`which convert`" in \
+			*32/convert) ;; \
+			/*) mv $(OOBUILDDIR)/default_images/introabout/intro.bmp $(OOBUILDDIR)/default_images/introabout/intro-save.bmp && convert $(OOBUILDDIR)/default_images/introabout/intro-save.bmp -depth 24 -type TrueColor $(OOBUILDDIR)/default_images/introabout/intro.bmp ;; \
+		esac \
+	fi
+	mkdir -p $(OOBUILDDIR)/default_images/res/commandimagelist
+	mkdir -p $(OOBUILDDIR)/ooo_custom_images/industrial/res/commandimagelist
+	mkdir -p $(OOBUILDDIR)/ooo_custom_images/tango/res/commandimagelist
 	cp $(top_srcdir)/src/layout/*.png $(OOBUILDDIR)/default_images/res/commandimagelist
 	cp $(top_srcdir)/src/layout/*.png $(OOBUILDDIR)/ooo_custom_images/industrial/res/commandimagelist
 	cp $(top_srcdir)/src/layout/*.png $(OOBUILDDIR)/ooo_custom_images/tango/res/commandimagelist

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	(original)
+++ trunk/bin/Makefile.am	Mon Jun 30 17:02:36 2008
@@ -1,3 +1,5 @@
+SUBDIRS=piece
+
 script_files = \
 	a2az.pl \
 	bash-completion.in \

Modified: trunk/bin/build-ooo
==============================================================================
--- trunk/bin/build-ooo	(original)
+++ trunk/bin/build-ooo	Mon Jun 30 17:02:36 2008
@@ -123,6 +123,13 @@
     mkdir -p $OOBUILDDIR/external/msvcp90
 fi
 
+
+if test "z$PIECE" != "z"; then
+	echo "Build $PIECE"
+	. $TOOLSDIR/bin/piece/build-$PIECE
+
+else
+
 # update localizations from external sources
 # FIXME temporary hack to merge the GSI files
 cd $TOOLSDIR/bin
@@ -135,6 +142,7 @@
 cd $OOBUILDDIR/instsetoo_native || exit 1;
 perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
 OOO_REBUILD_NEEDED="no"
+fi # !PIECE
 
 echo "Build succeeded ...!"
 

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Mon Jun 30 17:02:36 2008
@@ -11,6 +11,20 @@
 
 export LC_ALL='C';
 
+if test "z$PIECE" != "z"; then
+    echo "install $PIECE"
+    SRCDIR="$OOBUILDDIR/solver/$UPD/$INPATH"
+    DEST=$OOINSTDIR/solver
+    mkdir -p $DEST
+    cp -R $SRCDIR/* $DEST
+
+    if test -f "$TOOLSDIR/bin/piece/install-$PIECE"; then
+	echo "$PIECE specific install"
+	. $TOOLSDIR/bin/piece/install-$PIECE
+    fi
+    exit 0;
+fi
+
 echo "Cleaning $OOINSTDIR";
 rm -Rf $OOINSTDIR;
 set -e

Added: trunk/bin/piece/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/bin/piece/Makefile.am	Mon Jun 30 17:02:36 2008
@@ -0,0 +1,7 @@
+piece_files = \
+	${wildcard unpack-*} \
+	${wildcard build-*} \
+	${wildcard install-*}
+
+EXTRA_DIST = \
+	$(piece_files)

Added: trunk/bin/piece/build-bootstrap
==============================================================================
--- (empty file)
+++ trunk/bin/piece/build-bootstrap	Mon Jun 30 17:02:36 2008
@@ -0,0 +1,5 @@
+# build bash script - invoked from build-ooo
+
+cd $OOBUILDDIR/soltools || exit 1;
+perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+perl $SOLARENV/bin/build.pl --deliver $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;

Added: trunk/bin/piece/build-ure
==============================================================================
--- (empty file)
+++ trunk/bin/piece/build-ure	Mon Jun 30 17:02:36 2008
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# build script - invoked from a spec file to build the project
+
+for a in *; do
+	cd $a || exit 1;
+	perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+	perl $SOLARENV/bin/build.pl --deliver $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+	cd ..
+done

Added: trunk/bin/piece/install-bootstrap
==============================================================================
--- (empty file)
+++ trunk/bin/piece/install-bootstrap	Mon Jun 30 17:02:36 2008
@@ -0,0 +1,10 @@
+# install bash script - invoked from package-ooo
+
+cp -R $OOBUILDDIR/*.[sS]et.sh $DEST
+
+mkdir -p $OOINSTDIR/ooo-build/bin
+mkdir -p $OOINSTDIR/ooo-build/patches
+cp -R $TOOLSDIR/bin/* $OOINSTDIR/ooo-build/bin
+cp -R $TOOLSDIR/patches/* $OOINSTDIR/ooo-build/patches
+
+

Added: trunk/bin/piece/install-ure
==============================================================================
--- (empty file)
+++ trunk/bin/piece/install-ure	Mon Jun 30 17:02:36 2008
@@ -0,0 +1,5 @@
+SRCDIR="$OOBUILDDIR/solver/$UPD/$INPATH"
+DEST=$OOINSTDIR/solver
+mkdir -p $DEST
+cp -R $SRCDIR/* $DEST
+ln -s . $DEST/$INPATH

Added: trunk/bin/piece/sys-setup
==============================================================================
--- (empty file)
+++ trunk/bin/piece/sys-setup	Mon Jun 30 17:02:36 2008
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# installed system libraries
+URE_DIR=$OO_INSTDIR/ure
+INSTALL_DIR=$OO_INSTDIR/basis3.0/program
+DEV_DIR=$OO_SOLVERDIR
+
+PRESERVE_PATH=$PATH
+PATH=
+
+# include all the main configured settings by default
+. $DEV_DIR/*.[sS]et.sh
+
+# override / extend ones we need to adapt
+SRC_ROOT=`pwd`
+
+export SOLARVER="$DEV_DIR"
+export SOLARVERSION="$SOLARVER"
+export SOLARENV="/home/opt/OpenOffice/HEAD/build/dev300-m19/solenv"
+export SOLARENVINC="$SOLARENV/inc"
+export LOCALINI="$SOLARENV/config"
+export STAR_INIROOT="$SOLARENV/config"
+export STAR_INIROOTOLD="$SOLARENV/config"
+export STAR_STANDLST="$SOLARENV/config/stand.lst"
+export STAR_SSCOMMON="$SOLARENV/config/ssolar.cmn"
+export STAR_SSOLARINI="$SOLARENV/config/ssolar.ini"
+export DMAKEROOT="$SOLARENVINC/startup"
+
+export LD_LIBRARY_PATH=".:$URE_DIR/lib:$INSTALL_DIR:$SOLARENV/$INPATH/lib:$JAVA_HOME/jre/lib/i386:$JAVA_HOME/jre/lib/i386/xawt:$JAVA_HOME/jre/lib/i386/client:$JAVA_HOME/jre/lib/i386/native_threads:../lib:$SOLARVER/$INPATH/lib:/opt/OpenOffice/HEAD/build/lib:/opt/mozilla/lib:"
+export PATH="$DEV_DIR/bin:$URE_DIR/bin:$JAVA_HOME/bin:.:$SOLARVER/$INPATH/bin:$SOLARENV/$OUTPATH/bin:$SOLARENV/bin:$PRESERVE_PATH"
+export SOLARINC=" -I. -I$SOLARVER/$INPATH/inc/stl -I$SOLARVER/$INPATH/inc/external -I$SOLARVER/$INPATH/inc -I$SOLARENV/$OUTPATH/inc -I$SOLARENV/inc -I$SRC_ROOT/res -I/home/opt/OpenOffice/HEAD/build/dev300-m19/solver/300/unxlngi6.pro/inc/stl -I$SOLARENV/inc/Xp31 -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/$INPATH/lib -L$SOLARENV/$OUTPATH/lib -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$URE_DIR/lib -L$INSTALL_DIR -L$DEV_DIR/lib"
+export SOLARLIB
+

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jun 30 17:02:36 2008
@@ -1174,6 +1174,7 @@
 Makefile
 bin/setup
 bin/Makefile
+bin/piece/Makefile
 desktop/Makefile
 desktop/16x16/Makefile
 desktop/22x22/Makefile

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Mon Jun 30 17:02:36 2008
@@ -220,3 +220,15 @@
 		+ can we create a set of scripts: one per piece,
 		  and just run them in sequence ?
 
+
+** FIXME:
+	+ move 'scp2' and 'instsetoo_native' from 'bootstrap'
+	  -> postprocess ...
+
+
+** FIXME:
+	+ just install the whole solver into /usr/lib/... ?
+		+ use that as the -devel RPM ?
+		+ delete junk out of it ?
+			+ remove duplicates (somehow)
+			+ install earlier ?
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]