ooo-build r13268 - in trunk: . bin/piece patches/dev300

From: michael svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13268 - in trunk: . bin/piece patches/dev300
Date: Thu, 17 Jul 2008 10:23:22 +0000 (UTC)
Author: michael
Date: Thu Jul 17 10:23:22 2008
New Revision: 13268
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13268&view=rev

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

        * patches/dev300/piece-remotebridges.diff,
        * patches/dev300/piece-cppuhelper.diff,
        * patches/dev300/piece-cpputools.diff,
        * patches/dev300/piece-bridges.diff,
        * patches/dev300/piece-unoil.diff,
        * patches/dev300/piece-stoc.diff,
        * patches/dev300/apply,
        * bin/piece/sys-setup: add solaridlinc, more ure .rdb
        path cleans.



Added:
   trunk/patches/dev300/piece-bridges.diff
   trunk/patches/dev300/piece-cppuhelper.diff
   trunk/patches/dev300/piece-cpputools.diff
   trunk/patches/dev300/piece-helpcontent2.diff
   trunk/patches/dev300/piece-io.diff
   trunk/patches/dev300/piece-javaunohelper.diff
   trunk/patches/dev300/piece-remotebridges.diff
   trunk/patches/dev300/piece-stoc.diff
   trunk/patches/dev300/piece-unoil.diff
Modified:
   trunk/ChangeLog
   trunk/bin/piece/sys-setup
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-offapi.diff
   trunk/patches/dev300/piece-offuh.diff
   trunk/patches/dev300/piece-target.diff

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Thu Jul 17 10:23:22 2008
@@ -40,7 +40,7 @@
 export STAR_SSCOMMON="$SOLARENV/config/ssolar.cmn"
 export STAR_SSOLARINI="$SOLARENV/config/ssolar.ini"
 export DMAKEROOT="$SOLARENVINC/startup"
-export UNOINCLUDES="$DEV_DIR/inc/offuh"
+export UNOINCLUDES="-I$DEV_DIR/inc/offuh -I$SOLARPIECE/$INPATH/inc/offuh"
 
 export LD_LIBRARY_PATH=".:$DEV_DIR/lib:$URE_DIR/lib:$INSTALL_DIR:$SOLARPIECE/$INPATH/lib:$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/lib:/opt/OpenOffice/HEAD/build/lib:/opt/mozilla/lib:"
 export PATH="$SOLARPIECE/$INPATH/bin:$URE_DIR/bin:$JAVA_HOME/bin:.:$SOLARVER/bin:$SOLARENV/$OUTPATH/bin:$SOLARENV/bin:$PRESERVE_PATH"
@@ -51,4 +51,5 @@
 SOLARLIB="$SOLARLIB -L$URE_DIR/lib -L$INSTALL_DIR -L$SOLARPIECE/$INPATH/lib"
 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"
 export SOLARLIB SOLARINC
+export SOLARIDLINC="-I$SOLARVERSION/$INPATH/idl$EXT_UPDMINOR -I$SOLARPIECE/$INPATH/idl$EXT_UPDMINOR"
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul 17 10:23:22 2008
@@ -2586,6 +2586,13 @@
 piece-ridljar.diff
 piece-offapi.diff
 piece-offuh.diff
+piece-cppuhelper.diff
+piece-bridges.diff
+piece-stoc.diff
+piece-unoil.diff
+piece-javaunohelper.diff
+piece-io.diff
+piece-remotebridges.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Added: trunk/patches/dev300/piece-bridges.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-bridges.diff	Thu Jul 17 10:23:22 2008
@@ -0,0 +1,13 @@
+--- bridges/unotypes/makefile.mk
++++ bridges/unotypes/makefile.mk
+@@ -40,8 +40,8 @@
+ #-------------------------------------------------------------------
+ 
+ CPPUMAKERFLAGS += -C
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb 
++UNOUCRDEP=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
++UNOUCRRDB=$(UNOUCRDEP)
+ UNOUCROUT=$(OUT)$/inc
+ 
+ UNOTYPES = \

Added: trunk/patches/dev300/piece-cppuhelper.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-cppuhelper.diff	Thu Jul 17 10:23:22 2008
@@ -0,0 +1,33 @@
+--- cppuhelper/unotypes/makefile.mk	2008-07-17 10:47:46.000000000 +0100
++++ cppuhelper/unotypes/makefile.mk	2008-07-17 10:47:46.000000000 +0100
+@@ -40,7 +40,7 @@
+ UNOUCRDEP = $(UNOUCRRDB)
+ UNOUCROUT = $(OUT)$/inc$/private
+ 
+-CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb
++CPPUMAKERFLAGS += -C -X$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb
+ 
+ UNOTYPES = \
+ 	cppuhelper.detail.XExceptionThrower
+@@ -50,7 +50,7 @@
+ 
+ .INCLUDE : target.mk
+ 
+-$(UNOUCRRDB) : $(ALLIDLFILES) $(SOLARBINDIR)$/types.rdb
+-	$(IDLC) -I. -I$(SOLARIDLDIR) -O$(UCR) $(ALLIDLFILES)
++$(UNOUCRRDB) : $(ALLIDLFILES) $(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
++	$(IDLC) -I. $(SOLARIDLINC) -O$(UCR) $(ALLIDLFILES)
+ 	$(REGMERGE) $@ /UCR $(UCR)$/{$(?:f:s/.idl/.urd/)}
+ 	touch $@
+
+--- cppuhelper/source/makefile.mk
++++ cppuhelper/source/makefile.mk
+@@ -51,7 +51,7 @@
+ 
+ # --- Files --------------------------------------------------------
+ 
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
+ UNOUCRDEP=$(UNOUCRRDB)
+ UNOUCROUT=$(OUT)$/inc$/$(TARGET)
+ INCPRE+=$(OUT)$/inc$/$(TARGET) $(OUT)$/inc$/private

Added: trunk/patches/dev300/piece-cpputools.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-cpputools.diff	Thu Jul 17 10:23:22 2008
@@ -0,0 +1,41 @@
+--- cpputools/source/registercomponent/makefile.mk
++++ cpputools/source/registercomponent/makefile.mk
+@@ -39,8 +39,8 @@
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  settings.mk
+ 
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
++UNOUCRDEP=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
++UNOUCRRDB=$(UNOUCRDEP)
+ 
+ NO_OFFUH=TRUE
+ CPPUMAKERFLAGS += -C
+
+--- cpputools/source/regsingleton/makefile.mk
++++ cpputools/source/regsingleton/makefile.mk
+@@ -39,8 +39,8 @@
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  settings.mk
+ 
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
++UNOUCRDEP=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
++UNOUCRRDB=$(UNOUCRDEP)
+ 
+ NO_OFFUH=TRUE
+ CPPUMAKERFLAGS += -C
+
+--- cpputools/source/unoexe/makefile.mk
++++ cpputools/source/unoexe/makefile.mk
+@@ -39,8 +39,8 @@
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  settings.mk
+ 
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
++UNOUCRDEP=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
++UNOUCRRDB=$(UNOUCRDEP)
+ 
+ NO_OFFUH=TRUE
+ CPPUMAKERFLAGS += -C

Added: trunk/patches/dev300/piece-helpcontent2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-helpcontent2.diff	Thu Jul 17 10:23:22 2008
@@ -0,0 +1,11 @@
+--- helpcontent2/source/auxiliary/makefile.mk
++++ helpcontent2/source/auxiliary/makefile.mk
+@@ -75,7 +75,7 @@
+ 
+ $(COMMONBIN)$/helpimg.ilst .PHONY:
+ 	-$(RM) $@
+-	$(PERL) $(PRJ)$/helpers$/create_ilst.pl -dir=$(SOLARSRC)/default_images/res/helpimg > $  $(INPATH)
++	$(PERL) $(PRJ)$/helpers$/create_ilst.pl -dir=$(SOLARVER)/default_images/res/helpimg > $  $(INPATH)
+ 	$(RENAME) $  $(INPATH) $@
+ 	
+ 

Added: trunk/patches/dev300/piece-io.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-io.diff	Thu Jul 17 10:23:22 2008
@@ -0,0 +1,68 @@
+diff -u -r io/source/acceptor/makefile.mk io/source/acceptor/makefile.mk
+--- io/source/acceptor/makefile.mk	2008-04-11 12:43:42.000000000 +0100
++++ io/source/acceptor/makefile.mk	2008-07-17 11:16:04.000000000 +0100
+@@ -36,15 +36,15 @@
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC=TRUE
+ COMP1TYPELIST = acceptor
+-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
++COMPRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
+ 
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  settings.mk
+ DLLPRE =
+ # ------------------------------------------------------------------
+ 
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
++UNOUCRDEP=$(COMPRDB)
++UNOUCRRDB=$(COMPRDB)
+ UNOUCROUT=$(OUT)$/inc$/acceptor
+ INCPRE+= $(UNOUCROUT)
+ 
+Only in io/source/acceptor: makefile.mk~
+diff -u -r io/source/connector/makefile.mk io/source/connector/makefile.mk
+--- io/source/connector/makefile.mk	2008-04-11 12:45:15.000000000 +0100
++++ io/source/connector/makefile.mk	2008-07-17 11:15:19.000000000 +0100
+@@ -36,15 +36,15 @@
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC=TRUE
+ COMP1TYPELIST = connectr
+-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
++COMPRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
+ 
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  settings.mk
+ DLLPRE =
+ # ------------------------------------------------------------------
+ 
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
++UNOUCRDEP=$(COMPRDB)
++UNOUCRRDB=$(COMPRDB)
+ UNOUCROUT=$(OUT)$/inc$/connector
+ INCPRE+= $(UNOUCROUT)
+ 
+Only in io/source/connector: makefile.mk~
+diff -u -r io/source/stm/makefile.mk io/source/stm/makefile.mk
+--- io/source/stm/makefile.mk	2008-04-11 12:46:07.000000000 +0100
++++ io/source/stm/makefile.mk	2008-07-17 11:16:32.000000000 +0100
+@@ -35,14 +35,14 @@
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC=TRUE
+ COMP1TYPELIST = stm
+-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
++COMPRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
+ 
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  settings.mk
+ DLLPRE =
+ # --- Files --------------------------------------------------------
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
++UNOUCRDEP=$(COMPRDB)
++UNOUCRRDB=$(COMPRDB)
+ UNOUCROUT=$(OUT)$/inc$/stm
+ INCPRE+= $(UNOUCROUT)
+ 
+Only in io/source/stm: makefile.mk~

Added: trunk/patches/dev300/piece-javaunohelper.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-javaunohelper.diff	Thu Jul 17 10:23:22 2008
@@ -0,0 +1,13 @@
+--- javaunohelper/source/makefile.mk	2008-07-17 11:12:47.000000000 +0100
++++ javaunohelper/source/makefile.mk	2008-07-17 11:12:47.000000000 +0100
+@@ -48,8 +48,8 @@
+ 
+ # ------------------------------------------------------------------
+ 
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
++UNOUCRDEP=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
++UNOUCRRDB=$(UNOUCRDEP)
+ 
+ UNOUCROUT=$(OUT)$/inc$/comprehensive
+ INCPRE+=$(OUT)$/inc$/comprehensive

Modified: trunk/patches/dev300/piece-offapi.diff
==============================================================================
--- trunk/patches/dev300/piece-offapi.diff	(original)
+++ trunk/patches/dev300/piece-offapi.diff	Thu Jul 17 10:23:22 2008
@@ -1,5 +1,5 @@
---- /tmp/makefile.mk	2008-07-17 10:24:20.000000000 +0100
-+++ /usr/src/packages/BUILD/dev300-m21-ure/offapi/util/makefile.mk	2008-07-17 10:25:46.000000000 +0100
+--- offapi/util/makefile.mk	2008-07-17 10:25:46.000000000 +0100
++++ offapi/util/makefile.mk	2008-07-17 10:25:46.000000000 +0100
 @@ -158,15 +158,16 @@
         $(REGISTRYCHECKFLAG) \
         $(UNOTYPE_STATISTICS)

Modified: trunk/patches/dev300/piece-offuh.diff
==============================================================================
--- trunk/patches/dev300/piece-offuh.diff	(original)
+++ trunk/patches/dev300/piece-offuh.diff	Thu Jul 17 10:23:22 2008
@@ -1,5 +1,5 @@
---- /tmp/makefile.mk	2008-07-17 10:16:39.000000000 +0100
-+++ /usr/src/packages/BUILD/dev300-m21-ure/offuh/source/makefile.mk	2008-07-17 10:29:04.000000000 +0100
+--- offuh/source/makefile.mk	2008-07-17 10:29:04.000000000 +0100
++++ offuh/source/makefile.mk	2008-07-17 10:29:04.000000000 +0100
 @@ -39,6 +39,7 @@
  
  # ------------------------------------------------------------------

Added: trunk/patches/dev300/piece-remotebridges.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-remotebridges.diff	Thu Jul 17 10:23:22 2008
@@ -0,0 +1,10 @@
+--- remotebridges/source/bridge/makefile.mk	2008-07-17 11:18:05.000000000 +0100
++++ remotebridges/source/bridge/makefile.mk	2008-07-17 11:18:05.000000000 +0100
+@@ -35,6 +35,7 @@
+ TARGET = remotebridge.uno
+ ENABLE_EXCEPTIONS=TRUE
+ COMP1TYPELIST = remotebridge
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  settings.mk

Added: trunk/patches/dev300/piece-stoc.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-stoc.diff	Thu Jul 17 10:23:22 2008
@@ -0,0 +1,120 @@
+diff -u -r stoc/source/bootstrap/makefile.mk stoc/source/bootstrap/makefile.mk
+--- stoc/source/bootstrap/makefile.mk	2008-04-11 12:30:30.000000000 +0100
++++ stoc/source/bootstrap/makefile.mk	2008-07-17 11:07:27.000000000 +0100
+@@ -35,6 +35,7 @@
+ ENABLE_EXCEPTIONS=TRUE
+ BOOTSTRAP_SERVICE=TRUE
+ COMP1TYPELIST = bootstrap
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ # --- openoffice.org.orig/Settings -----------------------------------------------------
+ 
+Only in stoc/source/bootstrap: makefile.mk~
+diff -u -r stoc/source/corereflection/makefile.mk stoc/source/corereflection/makefile.mk
+--- stoc/source/corereflection/makefile.mk	2008-04-11 12:34:34.000000000 +0100
++++ stoc/source/corereflection/makefile.mk	2008-07-17 11:07:55.000000000 +0100
+@@ -34,6 +34,7 @@
+ TARGET = reflection.uno
+ ENABLE_EXCEPTIONS=TRUE
+ COMP1TYPELIST = corefl
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ # --- Settings -----------------------------------------------------
+ 
+Only in stoc/source/corereflection: makefile.mk~
+diff -u -r stoc/source/inspect/makefile.mk stoc/source/inspect/makefile.mk
+--- stoc/source/inspect/makefile.mk	2008-04-11 12:37:14.000000000 +0100
++++ stoc/source/inspect/makefile.mk	2008-07-17 11:07:57.000000000 +0100
+@@ -34,6 +34,7 @@
+ TARGET = introspection.uno
+ ENABLE_EXCEPTIONS=TRUE
+ COMP1TYPELIST = insp
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ # --- Settings -----------------------------------------------------
+ 
+Only in stoc/source/inspect: makefile.mk~
+diff -u -r stoc/source/invocation/makefile.mk stoc/source/invocation/makefile.mk
+--- stoc/source/invocation/makefile.mk	2008-04-11 12:37:52.000000000 +0100
++++ stoc/source/invocation/makefile.mk	2008-07-17 11:07:58.000000000 +0100
+@@ -34,6 +34,7 @@
+ TARGET = invocation.uno
+ ENABLE_EXCEPTIONS=TRUE
+ COMP1TYPELIST = inv
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ # --- Settings -----------------------------------------------------
+ 
+Only in stoc/source/invocation: makefile.mk~
+diff -u -r stoc/source/invocation_adapterfactory/makefile.mk stoc/source/invocation_adapterfactory/makefile.mk
+--- stoc/source/invocation_adapterfactory/makefile.mk	2008-04-11 12:38:31.000000000 +0100
++++ stoc/source/invocation_adapterfactory/makefile.mk	2008-07-17 11:07:59.000000000 +0100
+@@ -34,6 +34,7 @@
+ TARGET = invocadapt.uno
+ ENABLE_EXCEPTIONS=TRUE
+ COMP1TYPELIST = invadp
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ # --- Settings -----------------------------------------------------
+ 
+Only in stoc/source/invocation_adapterfactory: makefile.mk~
+diff -u -r stoc/source/javaloader/makefile.mk stoc/source/javaloader/makefile.mk
+--- stoc/source/javaloader/makefile.mk	2008-04-11 12:39:07.000000000 +0100
++++ stoc/source/javaloader/makefile.mk	2008-07-17 11:08:00.000000000 +0100
+@@ -35,6 +35,7 @@
+ TARGET = javaloader.uno
+ ENABLE_EXCEPTIONS=TRUE
+ COMP1TYPELIST = javaloader
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ .IF "$(SOLAR_JAVA)" == "TRUE"
+ # --- Settings -----------------------------------------------------
+Only in stoc/source/javaloader: makefile.mk~
+diff -u -r stoc/source/javavm/makefile.mk stoc/source/javavm/makefile.mk
+--- stoc/source/javavm/makefile.mk	2008-04-11 12:41:33.000000000 +0100
++++ stoc/source/javavm/makefile.mk	2008-07-17 11:08:02.000000000 +0100
+@@ -34,6 +34,7 @@
+ TARGET = javavm.uno
+ ENABLE_EXCEPTIONS=TRUE
+ COMP1TYPELIST = jen
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ .IF "$(SOLAR_JAVA)" == "TRUE"
+ # --- Settings -----------------------------------------------------
+Only in stoc/source/javavm: makefile.mk~
+diff -u -r stoc/source/namingservice/makefile.mk stoc/source/namingservice/makefile.mk
+--- stoc/source/namingservice/makefile.mk	2008-04-11 12:42:27.000000000 +0100
++++ stoc/source/namingservice/makefile.mk	2008-07-17 11:08:05.000000000 +0100
+@@ -34,6 +34,7 @@
+ TARGET = namingservice.uno
+ ENABLE_EXCEPTIONS=TRUE
+ COMP1TYPELIST = namingservice
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ # --- Settings -----------------------------------------------------
+ 
+Only in stoc/source/namingservice: makefile.mk~
+diff -u -r stoc/source/proxy_factory/makefile.mk stoc/source/proxy_factory/makefile.mk
+--- stoc/source/proxy_factory/makefile.mk	2008-04-11 12:43:05.000000000 +0100
++++ stoc/source/proxy_factory/makefile.mk	2008-07-17 11:08:07.000000000 +0100
+@@ -35,6 +35,7 @@
+ TARGET = proxyfac.uno
+ ENABLE_EXCEPTIONS=TRUE
+ COMP1TYPELIST = proxyfac
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ # --- Settings -----------------------------------------------------
+ 
+Only in stoc/source/proxy_factory: makefile.mk~
+diff -u -r stoc/source/stocservices/makefile.mk stoc/source/stocservices/makefile.mk
+--- stoc/source/stocservices/makefile.mk	2008-04-11 12:54:10.000000000 +0100
++++ stoc/source/stocservices/makefile.mk	2008-07-17 11:08:08.000000000 +0100
+@@ -34,6 +34,7 @@
+ TARGET = stocservices
+ ENABLE_EXCEPTIONS=TRUE
+ COMP1TYPELIST = stocserv
++UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
+ 
+ # --- openoffice.org.orig/Settings -----------------------------------------------------
+ 
+Only in stoc/source/stocservices: makefile.mk~

Modified: trunk/patches/dev300/piece-target.diff
==============================================================================
--- trunk/patches/dev300/piece-target.diff	(original)
+++ trunk/patches/dev300/piece-target.diff	Thu Jul 17 10:23:22 2008
@@ -5,15 +5,26 @@
 diff -u -p -r1.209 target.mk
 --- solenv/inc/target.mk	6 Jun 2008 12:00:28 -0000	1.209
 +++ solenv/inc/target.mk	4 Jul 2008 15:25:03 -0000
-@@ -48,7 +48,7 @@ INCPOST*=.
+@@ -48,16 +48,16 @@
  ENVINCPRE+=-I$(PRE)$/inc
  .ENDIF			# "$(PRE)"!=""
  .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
--UNOINCLUDES=$(SOLARINCDIR)$/offuh
-+UNOINCLUDES*=$(SOLARINCDIR)$/offuh
+-UNOINCLUDES*=$(SOLARINCDIR)$/offuh
++UNOINCLUDES*=-I$(SOLARINCDIR)$/offuh
  .ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
  SOLARINC+=$(JDKINCS)
  # make sure INCLUDE isn't set
+ INCLUDE:=
+ .EXPORT : INCLUDE
+ .IF "$(PRJINC)"!=""
+-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
++INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
+ .ELSE		# "$(PRJINC)"!=""
+-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
++INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
+ .ENDIF		# "$(PRJINC)"!=""
+ INCLUDE_C=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
+ .EXPORT : LIB
 @@ -218,6 +218,7 @@
  LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)$/$i)
  NEWCLASS:=$(LOCALJARS)
@@ -37,6 +48,14 @@
 
 --- solenv/inc/settings.mk
 +++ solenv/inc/settings.mk
+@@ -764,6 +764,7 @@
+ .ELSE
+ SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(EXT_UPDMINOR)
+ .ENDIF
++SOLARIDLINC*=-I$(SOLARIDLDIR)
+ 
+ .IF "$(UPDMINOR)" != ""
+ EXT_UPDMINOR=.$(UPDMINOR)
 @@ -1088,10 +1082,6 @@
  LOCAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS)
  LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON

Added: trunk/patches/dev300/piece-unoil.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-unoil.diff	Thu Jul 17 10:23:22 2008
@@ -0,0 +1,14 @@
+--- unoil/javamaker/makefile.mk	2008-07-17 11:10:33.000000000 +0100
++++ unoil/javamaker/makefile.mk	2008-07-17 11:10:33.000000000 +0100
+@@ -35,8 +35,9 @@
+ 
+ .INCLUDE: settings.mk
+ 
+-RDB = $(SOLARBINDIR)$/offapi.rdb
+-EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
++RDBDIR=$(SOLARPIECE)$/$(INPATH)$/bin
++RDB = $(RDBDIR)$/offapi.rdb
++EXTRA_RDB = $(RDBDIR)$/udkapi.rdb
+ 
+ .INCLUDE: target.mk
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]