CVS: crater/x11-apps/openoffice-src BUILD, 1.12, 1.13 DETAILS, 1.9,
1.10 PRE_BUILD, 1.6, 1.7 build-ooo, 1.7, 1.8
nhudson at lunar-linux.org
nhudson at lunar-linux.org
Sun Aug 24 07:00:36 GMT 2003
Update of /var/cvs/lunar/crater/x11-apps/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv20947
Modified Files:
BUILD DETAILS PRE_BUILD build-ooo
Log Message:
Updating again using system java and system gcc now
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/BUILD,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- BUILD 20 Aug 2003 03:10:50 -0000 1.12
+++ BUILD 24 Aug 2003 07:00:33 -0000 1.13
@@ -1,10 +1,10 @@
(
cd $SOURCE_DIRECTORY &&
- ./configure --prefix=/usr \
+ ./autogen.sh --prefix=/usr \
--sysconfdir=/etc \
- --enable-devel \
- $OPTS &&
+ --system-gcc \
+ $OPTS &&
echo "applying patches" &&
cd $SOURCE_DIRECTORY/build/RC3_030729 &&
@@ -23,6 +23,6 @@
cp $SCRIPT_DIRECTORY/scale-icons $SOURCE_DIRECTORY/bin &&
cd $SOURCE_DIRECTORY &&
- default_build
+ default_make
) > $C_FIFO 2>&1
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DETAILS,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- DETAILS 18 Aug 2003 03:02:21 -0000 1.9
+++ DETAILS 24 Aug 2003 07:00:33 -0000 1.10
@@ -1,16 +1,12 @@
MODULE=openoffice-src
VERSION=1.1rc3
- SOURCE=ooo-build-1.1.35.tar.gz
+ SOURCE=$MODULE-$VERSION.tar.gz
SOURCE2=RC3_030729.tar.bz2
- SOURCE3=gcc-3.2.2.tar.bz2
- SOURCE4=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
- SOURCE5=ooo-icons-RC3-2.tar.gz
- SOURCE_URL=http://ooo.ximian.com/packages/RC3_030729/$SOURCE
+ SOURCE3=ooo-icons-RC3-3.tar.gz
+ SOURCE_URL=cvs://:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome:openoffice
SOURCE2_URL=http://ooo.ximian.com/packages/RC3_030729/$SOURCE2
- SOURCE3_URL=http://ooo.ximian.com/packages/support/$SOURCE3
- SOURCE4_URL=http://ooo.ximian.com/packages/support/$SOURCE4
- SOURCE5_URL=http://ooo.ximian.com/packages/$SOURCE6
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ooo-build-1.1.35
+ SOURCE3_URL=http://ooo.ximian.com/packages/$SOURCE6
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice
MAINTAINER=nhudson at lunar-linux.org
WEB_SITE=http://ooo.ximian.com
ENTERED=20030805
Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/PRE_BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PRE_BUILD 18 Aug 2003 03:10:45 -0000 1.6
+++ PRE_BUILD 24 Aug 2003 07:00:33 -0000 1.7
@@ -4,8 +4,6 @@
mkdir -p src
cp $SOURCE_CACHE/$SOURCE2 src/ &&
cp $SOURCE_CACHE/$SOURCE3 src/ &&
- cp $SOURCE_CACHE/$SOURCE4 src/ &&
- cp $SOURCE_CACHE/$SOURCE5 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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- build-ooo 20 Aug 2003 03:07:08 -0000 1.7
+++ build-ooo 24 Aug 2003 07:00:33 -0000 1.8
@@ -27,24 +27,24 @@
mkdir -p $BUILDDIR/man/man1
# Versions
-GCC_VER=gcc-3.2.2
-GCC_TARBALL=gcc-3.2.2.tar.bz2
-GCC_UNTAR_OPTIONS=jxf
+#GCC_VER=gcc-3.2.2
+#GCC_TARBALL=gcc-3.2.2.tar.bz2
+#GCC_UNTAR_OPTIONS=jxf
# Versions
-if test ${CVSTAG:0:3} == 'OOO'; then
- JDK_VER=j2sdk1.3.1
- JDK_TARBALL=j2sdk-1.3.1-FCS-linux-i386.tar.bz2
- JDK_UNTAR_OPTIONS=jxf
+#if test ${CVSTAG:0:3} == 'OOO'; then
+# JDK_VER=j2sdk1.3.1
+# JDK_TARBALL=j2sdk-1.3.1-FCS-linux-i386.tar.bz2
+# JDK_UNTAR_OPTIONS=jxf
- OOO_ICONS_VER=ooo-icons-OOO_1_0_3-1
-else
- JDK_VER=j2sdk1.4.1
- JDK_TARBALL=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
- JDK_UNTAR_OPTIONS=jxf
+# OOO_ICONS_VER=ooo-icons-OOO_1_0_3-1
+#else
+# JDK_VER=j2sdk1.4.1
+# JDK_TARBALL=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
+# JDK_UNTAR_OPTIONS=jxf
- OOO_ICONS_VER=ooo-icons-RC3-2
-fi
+OOO_ICONS_VER=ooo-icons-RC3-3
+#fi
OOO_ICONS_TARBALL=$OOO_ICONS_VER.tar.gz
OOO_ICONS_UNTAR_OPTIONS=xzf
@@ -82,21 +82,21 @@
cd $BUILDDIR
## unpack the Jdk
-PKG_VER=$JDK_VER
+#PKG_VER=$JDK_VER
-if test -f $BUILDDIR/$PKG_VER/$STAMP; then
- echo "Skipping $PKG_VER";
- ln -sfn $PKG_VER $BUILDDIR/jdk
-else
- echo "Unpacking $PKG_VER";
- cd $BUILDDIR
- if test "z$WITH_SRC" = "z"; then
- tar $JDK_UNTAR_OPTIONS $SRCDIR/$JDK_TARBALL || exit 1;
- fi
- Link it into where we expect it in the path
- ln -sfn $PKG_VER $BUILDDIR/jdk
- touch $BUILDDIR/$PKG_VER/$STAMP || exit 1;
-fi
+#if test -f $BUILDDIR/$PKG_VER/$STAMP; then
+# echo "Skipping $PKG_VER";
+# ln -sfn $PKG_VER $BUILDDIR/jdk
+#else
+# echo "Unpacking $PKG_VER";
+# cd $BUILDDIR
+# if test "z$WITH_SRC" = "z"; then
+# tar $JDK_UNTAR_OPTIONS $SRCDIR/$JDK_TARBALL || exit 1;
+# fi
+# Link it into where we expect it in the path
+# ln -sfn $PKG_VER $BUILDDIR/jdk
+# touch $BUILDDIR/$PKG_VER/$STAMP || exit 1;
+#fi
PKG_VER=$OOO_ICONS_VER
@@ -113,22 +113,22 @@
fi
# build gcc
-PKG_VER=$GCC_VER
+#PKG_VER=$GCC_VER
# -- evil cut --
-if test -f $BUILDDIR/$PKG_VER/$STAMP; then
- echo "Skipping $PKG_VER";
-else
- echo "Building $PKG_VER";
- cd $BUILDDIR
- if test "z$WITH_SRC" = "z"; then
- tar $GCC_UNTAR_OPTIONS $SRCDIR/$GCC_TARBALL || exit 1;
- fi
- cd $PKG_VER
- ./configure --prefix=$BUILDDIR --enable-static --disable-shared --enable-languages=c++ || exit 1;
- make && make install || exit 1;
- touch $BUILDDIR/$PKG_VER/$STAMP
-fi
+#if test -f $BUILDDIR/$PKG_VER/$STAMP; then
+# echo "Skipping $PKG_VER";
+#else
+# echo "Building $PKG_VER";
+# cd $BUILDDIR
+# if test "z$WITH_SRC" = "z"; then
+# tar $GCC_UNTAR_OPTIONS $SRCDIR/$GCC_TARBALL || exit 1;
+# fi
+# cd $PKG_VER
+# ./configure --prefix=$BUILDDIR --enable-static --disable-shared --enable-languages=c++ || exit 1;
+# make && make install || exit 1;
+# touch $BUILDDIR/$PKG_VER/$STAMP
+#fi
# -- cut --
echo "Removing custom icons";
@@ -154,7 +154,7 @@
touch $OOBUILDDIR/$STAMP;
# configure
-cd /usr/src/ooo-build-1.1.35/build/RC3_030729/config_office
+cd /usr/src/openoffice/build/RC3_030729/config_office
rm -f config.cache
echo "configuring ...";
/usr/bin/autoconf || exit 1;
@@ -162,7 +162,7 @@
./configure $CONFIGURE_OPTIONS || exit 1;
echo "Starting tsch source builds"
-cat > /usr/src/ooo-build-1.1.35/build/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
@@ -171,11 +171,11 @@
setenv LD_ASSUME_KERNEL "2.2.5";
# Embedded python dies without Home set
setenv HOME "";
-cd /usr/src/ooo-build-1.1.35/build/RC3_030729
-source /usr/src/ooo-build-1.1.35/build/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 -R /usr/src/ooo-build-1.1.35/build/lib $SOLARVER/$UPD/$INPATH || exit 1;
+cp -R /usr/src/openoffice/build/lib $SOLARVER/$UPD/$INPATH || exit 1;
echo 'Verifying environment'
echo "Path: '\$PATH'";
echo "Shell: '\$SHELL'"
@@ -187,12 +187,12 @@
$SOLARENV/$OUTPATH/bin/dmake || $SOLARENV/$OUTPATH/bin/dmake || $SOLARENV/$OUTPATH/bin/dmake || exit 1;
EOF
-chmod 755 /usr/src/ooo-build-1.1.35/build/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/ooo-build-1.1.35/build/RC3_030729/build-ooo-tcsh || exit 1;
+/usr/src/openoffice/build/RC3_030729/build-ooo-tcsh || exit 1;
-touch /usr/src/ooo-build-1.1.35/build/RC3_030729/$STAMP || exit 1;
+touch /usr/src/openoffice/build/RC3_030729/$STAMP || exit 1;
echo "Build succeeded ...!"
exit 0;
More information about the Lunar-commits
mailing list