ooo-build r11984 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Fri Mar 21 21:01:14 2008
New Revision: 11984
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11984&view=rev

Log:
        * patches/dev300/buildfix-no-UPD-in-library-names.diff,
          patches/dev300/scs-scp2.diff,
          patches/dev300/apply: A step closer to be actually able to install
          the dev300.


Added:
   trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff
   trunk/patches/dev300/scs-scp2.diff   (contents, props changed)
      - copied, changed from r11980, /trunk/patches/scsolver/scs-scp2.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Mar 21 21:01:14 2008
@@ -2009,9 +2009,9 @@
 # FIXME: apply at the end because there are some conflicts
 
 # split binfilter from core
-split-binfilter-filter.diff, i#79800
-split-binfilter-setup_native.diff, i#79800
-split-binfilter-scp2.diff, i#79800
+#FIXME dev300: split-binfilter-filter.diff, i#79800
+#FIXME dev300: split-binfilter-setup_native.diff, i#79800
+#FIXME dev300: split-binfilter-scp2.diff, i#79800
 
 
 [ Win32Only ]
@@ -2054,3 +2054,8 @@
 internal-mesa-headers-config_office.diff, fridrich
 internal-mesa-headers-slideshow.diff, fridrich
 internal-mesa-headers-mesa.diff, fridrich
+
+[ TemporaryHacks ]
+# build our stuff
+# FIXME: should be in the respective patches
+buildfix-no-UPD-in-library-names.diff, jholesov

Added: trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff	Fri Mar 21 21:01:14 2008
@@ -0,0 +1,173 @@
+diff --git cppu/source/except/makefile.mk cppu/source/except/makefile.mk
+index 795f365..66e6328 100644
+--- cppu/source/except/makefile.mk
++++ cppu/source/except/makefile.mk
+@@ -11,7 +11,7 @@ ENABLE_EXCEPTIONS=TRUE
+ LIB1TARGET= $(SLB)$/$(TARGET).lib
+ LIB1OBJFILES= $(SLO)$/except.obj
+ 
+-SHL1TARGET=exlink$(UPD)$(DLLPOSTFIX)
++SHL1TARGET=exlink$(DLLPOSTFIX)
+ SHL1LIBS=$(LIB1TARGET)
+ SHL1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CPPULIB)
+ 
+diff --git desktop/source/pagein/makefile.mk desktop/source/pagein/makefile.mk
+index d904eeb..c0d81bd 100644
+--- desktop/source/pagein/makefile.mk
++++ desktop/source/pagein/makefile.mk
+@@ -143,8 +143,8 @@ $(MISC)$/$(TARGET)-common : makefile.mk
+ 	@-echo soffice.bin                 >> $@
+ # urgh ...
+ 	@-echo oovbaapi.rdb                                         >> $@
+-	@-echo deployment$(UPD)$(DLLPOSTFIX)$(UNODLLPOST)           >> $@
+-	@-echo $(DLLPRE)deploymentmisc$(UPD)$(DLLPOSTFIX)$(DLLPOST) >> $@
++	@-echo deployment$(DLLPOSTFIX)$(UNODLLPOST)           >> $@
++	@-echo $(DLLPRE)deploymentmisc$(DLLPOSTFIX)$(DLLPOST) >> $@
+ # omitted pieces (from writer startup ...) hopefully common
+ 	@-echo $(DLLPRE)ucb1$(DLLPOST)               >> $@
+ 	@-echo $(DLLPRE)xstor$(DLLPOST)              >> $@
+diff --git desktop/unx/splash/makefile.mk desktop/unx/splash/makefile.mk
+index 4bbe6dd..874b81b 100644
+--- desktop/unx/splash/makefile.mk
++++ desktop/unx/splash/makefile.mk
+@@ -54,7 +54,7 @@ SHL1DEPN=   makefile.mk
+ SHL1OBJS=   $(SLOFILES)
+ 
+ 
+-SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
++SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+ SHL1IMPLIB=i$(TARGET)
+ 
+ SHL1VERSIONMAP=exports.map
+diff --git lotuswordpro/util/makefile.mk lotuswordpro/util/makefile.mk
+index c0905fd..c04dd29 100644
+--- lotuswordpro/util/makefile.mk
++++ lotuswordpro/util/makefile.mk
+@@ -18,7 +18,7 @@ SHL1STDLIBS+= \
+ 	$(SALLIB) \
+ 	$(XMLOFFLIB)
+ 
+-SHL1TARGET = $(TARGET)$(UPD)$(DLLPOSTFIX)
++SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
+ SHL1IMPLIB = i$(SHL1TARGET)
+ SHL1LIBS = $(LIB1TARGET)
+ SHL1VERSIONMAP=$(TARGET).map
+diff --git oox/util/makefile.mk oox/util/makefile.mk
+index 3c69e95..159afa2 100644
+--- oox/util/makefile.mk
++++ oox/util/makefile.mk
+@@ -62,7 +62,7 @@ LIB1FILES=	\
+ 
+ # --- Shared-Library -----------------------------------------------
+ 
+-SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
++SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+ SHL1IMPLIB= i$(SHL1TARGET)
+ SHL1USE_EXPORTS=ordinal
+ 
+diff --git scp2/source/layout/layout.scp scp2/source/layout/layout.scp
+index 7e5db60..4c5f7b6 100644
+--- scp2/source/layout/layout.scp
++++ scp2/source/layout/layout.scp
+@@ -41,9 +41,9 @@ File gid_File_Lib_Layout
+     RegistryID = gid_Starregistry_Services_Rdb;
+     Dir = gid_Dir_Program;
+   #ifdef UNX
+-    Name = STRING(CONCAT4(libtklayout,OFFICEUPD,DLLPOSTFIX,UNXSUFFIX));
++    Name = STRING(CONCAT3(libtklayout,DLLPOSTFIX,UNXSUFFIX));
+   #else
+-    Name = STRING(CONCAT4(tklayout,OFFICEUPD,DLLPOSTFIX,.dll));
++    Name = STRING(CONCAT3(tklayout,DLLPOSTFIX,.dll));
+   #endif
+ End
+ 
+diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
+index 87cba44..7c18c29 100644
+--- scp2/source/ooo/file_library_ooo.scp
++++ scp2/source/ooo/file_library_ooo.scp
+@@ -90,9 +90,9 @@ File gid_File_Lib_Vbaevent
+     RegistryID = gid_Starregistry_Services_Rdb;
+     Dir = gid_Dir_Program;
+   #ifdef UNX
+-    Name = STRING(CONCAT5(vbaevents,OFFICEUPD,DLLPOSTFIX,.uno,UNXSUFFIX));
++    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
+   #else
+-    Name = STRING(CONCAT5(vbaevents,OFFICEUPD,DLLPOSTFIX,.uno,.dll));
++    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
+   #endif
+ End
+ #endif // ENABLE_VBA
+diff --git scripting/source/vbaevents/makefile.mk scripting/source/vbaevents/makefile.mk
+index cbf4f55..eabb67e 100644
+--- scripting/source/vbaevents/makefile.mk
++++ scripting/source/vbaevents/makefile.mk
+@@ -34,7 +34,7 @@ SLOFILES= \
+ 		$(SLO)$/service.obj \
+ 		$(SLO)$/eventhelper.obj
+ 
+-SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX).uno
++SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
+ SHL1IMPLIB=     i$(TARGET)
+ 
+ SHL1VERSIONMAP=$(TARGET).map
+diff --git svx/util/makefile.mk svx/util/makefile.mk
+index f9b458f..bb13745 100644
+--- svx/util/makefile.mk
++++ svx/util/makefile.mk
+@@ -190,7 +190,7 @@ SHL2STDLIBS+= \
+ 
+ .IF "$(ENABLE_LAYOUT)" == "TRUE"
+ LINKFLAGS+= -L../$(PRJ)/layout/$(INPATH)/lib
+-SHL2STDLIBS += -ltklayout$(UPD)$(DLLPOSTFIX)
++SHL2STDLIBS += -ltklayout$(DLLPOSTFIX)
+ .ENDIF # ENABLE_LAYOUT == TRUE
+ 
+ # ------------------------------------------------------------------------------
+diff --git sw/util/makefile.mk sw/util/makefile.mk
+index 3873028..97ce603 100644
+--- sw/util/makefile.mk
++++ sw/util/makefile.mk
+@@ -201,7 +201,7 @@ SHL3STDLIBS= \
+ 
+ .IF "$(ENABLE_LAYOUT)" == "TRUE"
+ LINKFLAGS+= -L../$(PRJ)/layout/$(INPATH)/lib
+-SHL3STDLIBS += -ltklayout$(UPD)$(DLLPOSTFIX)
++SHL3STDLIBS += -ltklayout$(DLLPOSTFIX)
+ .ENDIF # ENABLE_LAYOUT == TRUE
+ 
+ SHL3LIBS=   $(SLB)$/swui.lib
+diff --git writerfilter/util/makefile.mk writerfilter/util/makefile.mk
+index 52476e7..9e47fff 100644
+--- writerfilter/util/makefile.mk
++++ writerfilter/util/makefile.mk
+@@ -56,7 +56,7 @@ LIB1FILES=  \
+ SHL1LIBS=$(SLB)$/$(TARGET).lib
+ 
+ 
+-SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
++SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+ SHL1STDLIBS=\
+     $(I18NISOLANGLIB) \
+     $(SOTLIB) \
+diff --git writerperfect/util/makefile.mk writerperfect/util/makefile.mk
+index 451e4b1..ed089be 100644
+--- writerperfect/util/makefile.mk
++++ writerperfect/util/makefile.mk
+@@ -83,7 +83,7 @@ SHL2STDLIBS+= \
+ 	$(LIBWPS) \
+ 	$(LIBWPD)
+ 
+-SHL2TARGET = msworks$(UPD)$(DLLPOSTFIX)
++SHL2TARGET = msworks$(DLLPOSTFIX)
+ SHL2IMPLIB = i$(SHL2TARGET)
+ SHL2LIBS = $(LIB2TARGET)
+ SHL2VERSIONMAP=msworks.map
+@@ -111,7 +111,7 @@ SHL3STDLIBS+= \
+ 	$(LIBWPD) \
+ 	$(LIBWPG)
+ 
+-SHL3TARGET = wpgimport$(UPD)$(DLLPOSTFIX)
++SHL3TARGET = wpgimport$(DLLPOSTFIX)
+ SHL3IMPLIB = i$(SHL3TARGET)
+ SHL3LIBS = $(LIB3TARGET)
+ SHL3VERSIONMAP=wpgimport.map

Copied: trunk/patches/dev300/scs-scp2.diff (from r11980, /trunk/patches/scsolver/scs-scp2.diff)
==============================================================================
--- /trunk/patches/scsolver/scs-scp2.diff	(original)
+++ trunk/patches/dev300/scs-scp2.diff	Fri Mar 21 21:01:14 2008
@@ -66,3 +66,32 @@
  STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Analysis, analysis)
  
  STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
+diff --git scp2/source/ooo/makefile.mk scp2/source/ooo/makefile.mk
+index 0e3094e..6cd84e3 100644
+--- scp2/source/ooo/makefile.mk
++++ scp2/source/ooo/makefile.mk
+@@ -55,6 +55,10 @@ SCPDEFS+=-DENABLE_CRASHDUMP
+ SCPDEFS+=-DBUILD_SPECIAL
+ .ENDIF
+ 
++.IF "$(BUILD_SCSOLVER)" == "YES"
++SCPDEFS+=-DBUILD_SCSOLVER
++.ENDIF
++
+ .IF "$(JAVANUMVER)" >= "000100040000"
+ SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE
+ .ENDIF
+diff --git scp2/source/ooo/module_lang_template.scp scp2/source/ooo/module_lang_template.scp
+index 860aa9e..15562a0 100755
+--- scp2/source/ooo/module_lang_template.scp
++++ scp2/source/ooo/module_lang_template.scp
+@@ -141,6 +141,9 @@ Module gid_Module_Langpack_Calc_Template
+              gid_File_Res_Bf_Sc,
+              gid_File_Res_Date,
+              gid_File_Res_Sc,
++#ifdef BUILD_SCSOLVER
++             gid_File_Res_ScSolver,
++#endif
+              gid_File_Res_Solver);
+ End
+