CVS: crater/x11-apps/openoffice-src unxlngi3.mk, NONE, 1.1 unxlngi4.mk, NONE, 1.1 BUILD, 1.9, 1.10 DEPENDS, 1.2, 1.3 DETAILS, 1.8, 1.9 PRE_BUILD, 1.4, 1.5 build-ooo, 1.5, 1.6

nhudson at lunar-linux.org nhudson at lunar-linux.org
Mon Aug 18 03:02:24 GMT 2003


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

Modified Files:
	BUILD DEPENDS DETAILS PRE_BUILD build-ooo 
Added Files:
	unxlngi3.mk unxlngi4.mk 
Log Message:

Adding some changes for this 


--- NEW FILE: unxlngi3.mk ---
#*************************************************************************
#
#   $RCSfile: unxlngi3.mk,v $
#
#   $Revision: 1.1 $
#
#   last change: $Author: nhudson $ $Date: 2003/08/18 03:02:21 $
#
#   The Contents of this file are made available subject to the terms of
#   either of the following licenses
#
#          - GNU Lesser General Public License Version 2.1
#          - Sun Industry Standards Source License Version 1.1
#
#   Sun Microsystems Inc., October, 2000
#
#   GNU Lesser General Public License Version 2.1
#   =============================================
#   Copyright 2000 by Sun Microsystems, Inc.
#   901 San Antonio Road, Palo Alto, CA 94303, USA
#
#   This library is free software; you can redistribute it and/or
#   modify it under the terms of the GNU Lesser General Public
#   License version 2.1, as published by the Free Software Foundation.
#
#   This library is distributed in the hope that it will be useful,
#   but WITHOUT ANY WARRANTY; without even the implied warranty of
#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
#   Lesser General Public License for more details.
#
#   You should have received a copy of the GNU Lesser General Public
#   License along with this library; if not, write to the Free Software
#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
#   MA  02111-1307  USA
#
#
#   Sun Industry Standards Source License Version 1.1
#   =================================================
#   The contents of this file are subject to the Sun Industry Standards
#   Source License Version 1.1 (the "License"); You may not use this file
#   except in compliance with the License. You may obtain a copy of the
#   License at http://www.openoffice.org/license.html.
#
#   Software provided under this License is provided on an "AS IS" basis,
#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
#   See the License for the specific provisions governing your rights and
#   obligations concerning the Software.
#
#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
#
#   Copyright: 2000 by Sun Microsystems, Inc.
#
#   All Rights Reserved.
#
#   Contributor(s): _______________________________________
#
#
#
#*************************************************************************

# mk file for unxlngi3
ASM=
AFLAGS=

SOLAR_JAVA=TRUE
JAVAFLAGSDEBUG=-g

# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"

# _PTHREADS is needed for the stl
CDEFS+=-DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400

# this is a platform with JAVA support
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
JAVA_RUNTIME=-ljava
.ELSE
JAVA_RUNTIME=-ljava_g
.ENDIF
.ENDIF 

# name of C++ Compiler
CXX*=g++
# name of C Compiler
CC*=gcc
# flags for C and C++ Compiler
CFLAGS+=-c $(INCLUDE)
# flags for the C++ Compiler
CFLAGSCC= -pipe -mi686
# Flags for enabling exception handling
CFLAGSEXCEPTIONS=-fexceptions
# Flags for disabling exception handling
CFLAGS_NO_EXCEPTIONS=-fno-exceptions

# -fpermissive should be removed as soon as possible
CFLAGSCXX= -pipe -mi686 -fno-for-scope -fpermissive

# Compiler flags for compiling static object in single threaded environment with graphical user interface
CFLAGSOBJGUIST=
# Compiler flags for compiling static object in single threaded environment with character user interface
CFLAGSOBJCUIST=
# Compiler flags for compiling static object in multi threaded environment with graphical user interface
CFLAGSOBJGUIMT=
# Compiler flags for compiling static object in multi threaded environment with character user interface
CFLAGSOBJCUIMT=
# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
CFLAGSSLOGUIMT=-fpic
# Compiler flags for compiling shared object in multi threaded environment with character user interface
CFLAGSSLOCUIMT=-fpic
# Compiler flags for profiling
CFLAGSPROF=
# Compiler flags for debugging
CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
# Compiler flags for enabling optimazations
CFLAGSOPT=-O2
# Compiler flags for disabling optimazations
CFLAGSNOOPT=-O
# Compiler flags for discibing the output path
CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall
# Set default warn level
CFLAGSDFLTWARN=

# switches for dynamic and static linking
STATIC		= -Wl,-Bstatic
DYNAMIC		= -Wl,-Bdynamic

# name of linker
LINK*=gcc
# default linker flags
LINKFLAGS=

# linker flags for linking applications
LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec

# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
LINKFLAGSSHLCUI= -shared

LINKFLAGSTACK=
LINKFLAGSPROF=
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=

.IF "$(NO_BSYMBOLIC)"==""
.IF "$(PRJNAME)" != "envtest"
LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
.ENDIF
.ENDIF				# "$(NO_BSYMBOLIC)"==""

LINKVERSIONMAPFLAG=-Wl,--version-script

SONAME_SWITCH=-Wl,-h

# Sequence of libs does matter !

STDLIBCPP=-lstdc++

# default objectfilenames to link
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
STDSLOCUI=

# libraries for linking applications
STDLIBCUIST=-ldl -lm
STDLIBGUIMT=-lX11 -ldl -lpthread -lm
STDLIBCUIMT=-ldl -lpthread -lm
STDLIBGUIST=-lX11 -ldl -lm
# libraries for linking shared libraries
STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
STDSHLCUIMT=-ldl -lpthread -lm

LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)


# name of library manager
LIBMGR=ar
LIBFLAGS=-r

# tool for generating import libraries
IMPLIB=
IMPLIBFLAGS=

MAPSYM=
MAPSYMFLAGS=

RC=irc
RCFLAGS=-fo$@ $(RCFILES)
RCLINK=
RCLINKFLAGS=
RCSETVERSION=

# platform specific identifier for shared libs
DLLPOSTFIX=li
DLLPRE=lib
DLLPOST=.so


--- NEW FILE: unxlngi4.mk ---
#*************************************************************************
#
#   $RCSfile: unxlngi4.mk,v $
#
#   $Revision: 1.1 $
#
#   last change: $Author: nhudson $ $Date: 2003/08/18 03:02:21 $
#
#   The Contents of this file are made available subject to the terms of
#   either of the following licenses
#
#          - GNU Lesser General Public License Version 2.1
#          - Sun Industry Standards Source License Version 1.1
#
#   Sun Microsystems Inc., October, 2000
#
#   GNU Lesser General Public License Version 2.1
#   =============================================
#   Copyright 2000 by Sun Microsystems, Inc.
#   901 San Antonio Road, Palo Alto, CA 94303, USA
#
#   This library is free software; you can redistribute it and/or
#   modify it under the terms of the GNU Lesser General Public
#   License version 2.1, as published by the Free Software Foundation.
#
#   This library is distributed in the hope that it will be useful,
#   but WITHOUT ANY WARRANTY; without even the implied warranty of
#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
#   Lesser General Public License for more details.
#
#   You should have received a copy of the GNU Lesser General Public
#   License along with this library; if not, write to the Free Software
#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
#   MA  02111-1307  USA
#
#
#   Sun Industry Standards Source License Version 1.1
#   =================================================
#   The contents of this file are subject to the Sun Industry Standards
#   Source License Version 1.1 (the "License"); You may not use this file
#   except in compliance with the License. You may obtain a copy of the
#   License at http://www.openoffice.org/license.html.
#
#   Software provided under this License is provided on an "AS IS" basis,
#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
#   See the License for the specific provisions governing your rights and
#   obligations concerning the Software.
#
#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
#
#   Copyright: 2000 by Sun Microsystems, Inc.
#
#   All Rights Reserved.
#
#   Contributor(s): _______________________________________
#
#
#
#*************************************************************************

# mk file for unxlngi4
ASM=
AFLAGS=

SOLAR_JAVA=TRUE
JAVAFLAGSDEBUG=-g

# filter for supressing verbose messages from linker
#not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"

# _PTHREADS is needed for the stl
CDEFS+=-DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400

# this is a platform with JAVA support
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
.IF "$(debug)"==""
JAVA_RUNTIME=-ljava
.ELSE
JAVA_RUNTIME=-ljava_g
.ENDIF
.ENDIF 

# name of C++ Compiler
CXX*=g++
# name of C Compiler
CC*=gcc
# flags for C and C++ Compiler
CFLAGS+=-fmessage-length=0 -c $(INCLUDE)

# flags required for crashdump feature
CFLAGSCRASHDUMP=-g

# flags for the C++ Compiler
CFLAGSCC= -pipe -mcpu=i686
# Flags for enabling exception handling
CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
# Flags for disabling exception handling
CFLAGS_NO_EXCEPTIONS=-fno-exceptions

# -fpermissive should be removed as soon as possible
CFLAGSCXX= -pipe -mcpu=i686 -fno-for-scope -fpermissive -fno-rtti

# HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers
.IF "$(BUILD_SPECIAL)"==""
CFLAGSCXX+=-include preinclude.h
.ENDIF

# Compiler flags for compiling static object in single threaded environment with graphical user interface
CFLAGSOBJGUIST=
# Compiler flags for compiling static object in single threaded environment with character user interface
CFLAGSOBJCUIST=
# Compiler flags for compiling static object in multi threaded environment with graphical user interface
CFLAGSOBJGUIMT=
# Compiler flags for compiling static object in multi threaded environment with character user interface
CFLAGSOBJCUIMT=
# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
CFLAGSSLOGUIMT=-fpic
# Compiler flags for compiling shared object in multi threaded environment with character user interface
CFLAGSSLOCUIMT=-fpic
# Compiler flags for profiling
CFLAGSPROF=
# Compiler flags for debugging
CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
# Compiler flags for enabling optimazations
# CFLAGSOPT=-O2
# reduce to -O1 to avoid optimisation problems
CFLAGSOPT=-O1
# Compiler flags for disabling optimazations
CFLAGSNOOPT=-O0
# Compiler flags for discibing the output path
CFLAGSOUTOBJ=-o
# Enable all warnings
CFLAGSWALL=-Wall -Wfloat-equal -Weffc++ -Wold-style-cast -Woverloaded-virtual -Wshadow -Wpointer-arith -Wcast-align -Wsign-compare -Winline
# Set default warn level
CFLAGSDFLTWARN=

# switches for dynamic and static linking
STATIC		= -Wl,-Bstatic
DYNAMIC		= -Wl,-Bdynamic

# name of linker
LINK*=$(CC)

# default linker flags
LINKFLAGSDEFS*=-z defs
LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
LINKFLAGS=-O2 -Bsymbolic -z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)

# linker flags for linking applications
LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec

# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
LINKFLAGSSHLCUI= -shared

LINKFLAGSTACK=
LINKFLAGSPROF=
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=

# linker flags for optimization (symbol hashtable)
# for now, applied to symbol scoped libraries, only
LINKFLAGSOPTIMIZE*=-Wl,-O1
LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script

SONAME_SWITCH=-Wl,-h

# Sequence of libs does matter !

STDLIBCPP=-lstdc++

# default objectfilenames to link
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
STDSLOCUI=

# libraries for linking applications
STDLIBCUIST=-ldl -lm
STDLIBGUIMT=-lX11 -ldl -lpthread -lm
STDLIBCUIMT=-ldl -lpthread -lm
STDLIBGUIST=-lX11 -ldl -lm
# libraries for linking shared libraries
STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
STDSHLCUIMT=-ldl -lpthread -lm
STDSHLGUIST=-lX11 -lXext -ldl -lm
STDSHLCUIST=-ldl -lm

LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive

LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)

#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)

# name of library manager
LIBMGR=ar
LIBFLAGS=-r

# tool for generating import libraries
IMPLIB=
IMPLIBFLAGS=

MAPSYM=
MAPSYMFLAGS=

RC=irc
RCFLAGS=-fo$@ $(RCFILES)
RCLINK=
RCLINKFLAGS=
RCSETVERSION=

# platform specific identifier for shared libs
DLLPOSTFIX=li
DLLPRE=lib
DLLPOST=.so


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/BUILD,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- BUILD	13 Aug 2003 02:52:51 -0000	1.9
+++ BUILD	18 Aug 2003 03:02:21 -0000	1.10
@@ -1,24 +1,22 @@
 (
   cd $SOURCE_DIRECTORY &&
 
-  ./autogen.sh	--prefix=/usr \
+  ./configure	--prefix=/usr \
 		--sysconfdir=/etc \
                 --enable-devel    \
 		$OPTS &&
 
   echo "applying patches"         &&
-  cd build/RC3_030729               &&
+  cd $SOURCE_DIRECTORY/build/RC3_030729               &&
   ../../patches/apply.pl ../../patches/RC3_030729/ . &&
 
-  cd solenv/inc    &&
-
-  sed -e "s:^CFLAGSCC=.*:CFLAGSCC=$CFLAGS:g" unxlngi3.mk   &&
-  sed -e "s:^CFLAGSCXX=.*:CFLAGSCXX=$CFLAGS:g" unxlngi3.mk &&
-  sed -e "s:^CFLAGSCC=.*:CFLAGSCC=$CFLAGS:g" unxlngi4.mk   &&
-  sed -e "s:^CFLAGSCXX=.*:CFLAGSCXX=$CFLAGS:g" unxlngi4.mk &&
+  cd $SOURCE_DIRECTORY/build/RC3_030729/solenv/inc    &&
+                                                                                
+  cp $SCRIPT_DIRECTORY/unxlngi3.mk . &&
+  cp $SCRIPT_DIRECTORY/unxlngi4.mk . &&
 
-  cd $SOURCE_DIRECTORY/build/RC030729/extras/source/symbols &&
-  rm -fr *bmp                                               &&
+  cd $SOURCE_DIRECTORY/build/RC3_030729/extras/source/symbols &&
+  rm -fr *bmp                                                 &&
 
   cp $SCRIPT_DIRECTORY/build-ooo $SOURCE_DIRECTORY/bin &&
   cp $SCRIPT_DIRECTORY/package-ooo $SOURCE_DIRECTORY/bin &&

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DEPENDS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEPENDS	10 Aug 2003 04:45:06 -0000	1.2
+++ DEPENDS	18 Aug 2003 03:02:21 -0000	1.3
@@ -8,4 +8,5 @@
 depends ImageMagick  &&
 depends tcsh         &&
 depends Python       &&
-depends XML-Twig 
+depends XML-Twig     &&
+depends j2sdk 

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DETAILS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- DETAILS	10 Aug 2003 15:35:26 -0000	1.8
+++ DETAILS	18 Aug 2003 03:02:21 -0000	1.9
@@ -1,16 +1,16 @@
           MODULE=openoffice-src
          VERSION=1.1rc3
-          SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=RC3_030729.tar.bz2
+          SOURCE=ooo-build-1.1.35.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=cvs://:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome:openoffice
+      SOURCE_URL=http://ooo.ximian.com/packages/RC3_030729/$SOURCE
      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/openoffice
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ooo-build-1.1.35
       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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PRE_BUILD	13 Aug 2003 01:55:16 -0000	1.4
+++ PRE_BUILD	18 Aug 2003 03:02:21 -0000	1.5
@@ -3,6 +3,7 @@
   cd $BUILD_DIRECTORY &&
   unpack $SOURCE      &&
   cd $SOURCE_DIRECTORY &&
+  mkdir -p src
   cp $SOURCE_CACHE/$SOURCE2 src/ &&
   cp $SOURCE_CACHE/$SOURCE3 src/ &&
   cp $SOURCE_CACHE/$SOURCE4 src/ &&

Index: build-ooo
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/build-ooo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- build-ooo	13 Aug 2003 01:55:16 -0000	1.5
+++ build-ooo	18 Aug 2003 03:02:21 -0000	1.6
@@ -81,7 +81,7 @@
 
 cd $BUILDDIR
 
-# unpack the Jdk
+## unpack the Jdk
 PKG_VER=$JDK_VER
 
 if test -f $BUILDDIR/$PKG_VER/$STAMP; then
@@ -93,13 +93,11 @@
 	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
+ 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
 
 # -- evil cut --
@@ -156,7 +154,7 @@
 	touch $OOBUILDDIR/$STAMP;
 
 # configure
-cd /usr/src/openoffice/build/RC3_030729/config_office
+cd /usr/src/ooo-build-1.1.35/build/RC3_030729/config_office
 rm -f config.cache
 echo "configuring ...";
 /usr/bin/autoconf || exit 1;
@@ -164,7 +162,7 @@
 ./configure $CONFIGURE_OPTIONS || exit 1;
 
 echo "Starting tsch source builds"
-cat > /usr/src/openoffice/build/RC3_030729/build-ooo-tcsh <<"EOF"
+cat > /usr/src/ooo-build-1.1.35/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
@@ -173,11 +171,11 @@
 setenv LD_ASSUME_KERNEL "2.2.5";
 # Embedded python dies without Home set
 setenv HOME "";
-cd /usr/src/openoffice/build/RC3_030729
-source /usr/src/openoffice/build/RC3_030729/*.Set || exit 1;
+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;
 echo "Copying libraries to $SOLARVER/$UPD/$INPATH/lib";
 mkdir -p $SOLARVER/$UPD/$INPATH/lib || exit 1;
-cp -R /usr/src/openoffice/build/lib $SOLARVER/$UPD/$INPATH || exit 1;
+cp -R /usr/src/ooo-build-1.1.35/build/lib $SOLARVER/$UPD/$INPATH || exit 1;
 echo 'Verifying environment'
 echo "Path:  '\$PATH'";
 echo "Shell: '\$SHELL'"
@@ -189,12 +187,12 @@
 $SOLARENV/$OUTPATH/bin/dmake || $SOLARENV/$OUTPATH/bin/dmake || $SOLARENV/$OUTPATH/bin/dmake || exit 1;
 EOF
 
-chmod 755 /usr/src/openoffice/build/RC3_030729/build-ooo-tcsh
+chmod 755 /usr/src/ooo-build-1.1.35/build/RC3_030729/build-ooo-tcsh
 # tcsh sucks great rocks, and refuses to re-direct it's output otherwise
 export TERM=
-/usr/src/openoffice/build/RC3_030729/build-ooo-tcsh || exit 1;
+/usr/src/ooo-build-1.1.35/build/RC3_030729/build-ooo-tcsh || exit 1;
 
-touch /usr/src/openoffice/build/RC3_030729/$STAMP || exit 1;
+touch /usr/src/ooo-build-1.1.35/build/RC3_030729/$STAMP || exit 1;
 
 echo "Build succeeded ...!"
 exit 0;




More information about the Lunar-commits mailing list