CVS: crater/x11-apps/openoffice-src BUILD, 1.7, 1.8 PRE_BUILD, 1.3, 1.4 build-ooo, 1.4, 1.5

[nhudson at lunar-linux.org]

Update of /var/cvs/lunar/crater/x11-apps/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv8836

Modified Files:
	BUILD PRE_BUILD build-ooo 
Log Message:

Ok finally I swear this one compiles just using lin -c openoffice-src, just make sure you have bison cvs or bison 1.875a installed 


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/BUILD,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- BUILD	10 Aug 2003 15:35:26 -0000	1.7
+++ BUILD	13 Aug 2003 01:55:16 -0000	1.8
@@ -7,7 +7,7 @@
 		$OPTS &&
 
   echo "applying patches"         &&
-  cd src/RC3_030729               &&
+  cd build/RC3_030729               &&
   ../../patches/apply.pl ../../patches/RC3_030729/ . &&
 
   cd solenv/inc    &&
@@ -19,7 +19,7 @@
   sed -e "s:^CFLAGSOPT=.*:CFLAGSOPT=$CFLAGS:g" \
   unxlngi4.mk.orig > unxlngi4.mk
 
-  cd $SOURCE_DIRECTORY/src/RC030729/extras/source/symbols &&
+  cd $SOURCE_DIRECTORY/build/RC030729/extras/source/symbols &&
   rm -fr *bmp
 
   cp $SCRIPT_DIRECTORY/build-ooo $SOURCE_DIRECTORY/bin &&

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/PRE_BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PRE_BUILD	10 Aug 2003 15:35:26 -0000	1.3
+++ PRE_BUILD	13 Aug 2003 01:55:16 -0000	1.4
@@ -7,6 +7,7 @@
   cp $SOURCE_CACHE/$SOURCE3 src/ &&
   cp $SOURCE_CACHE/$SOURCE4 src/ &&
   cp $SOURCE_CACHE/$SOURCE5 src/ &&
-  cd src/                        &&
+  mkdir build                    &&
+  cd build/                      &&
   unpack $SOURCE2               
 )

Index: build-ooo
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/build-ooo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build-ooo	12 Aug 2003 04:21:29 -0000	1.4
+++ build-ooo	13 Aug 2003 01:55:16 -0000	1.5
@@ -25,7 +25,6 @@
 mkdir -p $BUILDDIR/lib
 mkdir -p $BUILDDIR/man
 mkdir -p $BUILDDIR/man/man1
-mkdir -p $OOBUILDDIR
 
 # Versions
 GCC_VER=gcc-3.2.2
@@ -157,7 +156,7 @@
 	touch $OOBUILDDIR/$STAMP;
 
 # configure
-cd /usr/src/openoffice/src/RC3_030729/config_office
+cd /usr/src/openoffice/build/RC3_030729/config_office
 rm -f config.cache
 echo "configuring ...";
 /usr/bin/autoconf || exit 1;
@@ -165,7 +164,7 @@
 ./configure $CONFIGURE_OPTIONS || exit 1;
 
 echo "Starting tsch source builds"
-cat > /usr/src/openoffice/src/RC3_030729/build-ooo-tcsh <<"EOF"
+cat > /usr/src/openoffice/build/RC3_030729/build-ooo-tcsh <<"EOF"
 #!/usr/bin/tcsh
 # Warning - do not edit, this is a temporary file, see build-ooo
 # Many Java files have 8bit char-set comments, javac barfs on them in utf8 locales
@@ -174,13 +173,11 @@
 setenv LD_ASSUME_KERNEL "2.2.5";
 # Embedded python dies without Home set
 setenv HOME "";
-cd /usr/src/openoffice/src/RC3_030729
-source /usr/src/openoffice/src/RC3_030729/*.Set || exit 1;
+cd /usr/src/openoffice/build/RC3_030729
+source /usr/src/openoffice/build/RC3_030729/*.Set || exit 1;
 echo "Copying libraries to $SOLARVER/$UPD/$INPATH/lib";
 mkdir -p $SOLARVER/$UPD/$INPATH/lib || exit 1;
-cp -avf $BUILDDIR/lib/libgcc* $BUILDDIR/lib/libstdc* $SOLARVER/$UPD/$INPATH/lib || exit 1;
-# cp -vf $BUILDDIR/lib/libstdc++.so.3 $SOLARVER/$UPD/$INPATH/lib/libstdc++.so.3.0.1 || exit 1;
-cp -vf $BUILDDIR/lib/libstdc++* $SOLARVER/$UPD/$INPATH/lib/ || exit 1;
+cp -R /usr/src/openoffice/build/lib $SOLARVER/$UPD/$INPATH || exit 1;
 echo 'Verifying environment'
 echo "Path:  '\$PATH'";
 echo "Shell: '\$SHELL'"
@@ -192,12 +189,12 @@
 $SOLARENV/$OUTPATH/bin/dmake || $SOLARENV/$OUTPATH/bin/dmake || $SOLARENV/$OUTPATH/bin/dmake || exit 1;
 EOF
 
-chmod 755 /usr/src/openoffice/src/RC3_030729/build-ooo-tcsh
+chmod 755 /usr/src/openoffice/build/RC3_030729/build-ooo-tcsh
 # tcsh sucks great rocks, and refuses to re-direct it's output otherwise
 export TERM=
-/usr/src/openoffice/src/RC3_030729/build-ooo-tcsh || exit 1;
+/usr/src/openoffice/build/RC3_030729/build-ooo-tcsh || exit 1;
 
-touch /usr/src/openoffice/src/RC3_030729/$STAMP || exit 1;
+touch /usr/src/openoffice/build/RC3_030729/$STAMP || exit 1;
 
 echo "Build succeeded ...!"
 exit 0;