ooo-build r15191 - in trunk: . patches/dev300 patches/mono

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r15191 - in trunk: . patches/dev300 patches/mono
Date: Wed, 28 Jan 2009 04:15:35 +0000 (UTC)
Author: kyoshida
Date: Wed Jan 28 04:15:34 2009
New Revision: 15191
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15191&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/mono/mono-build-m39.diff:
	* patches/mono/mono-build.diff:	
	* patches/mono/mono-climaker-config-m39.diff:
	* patches/mono/mono-climaker-config.diff:	
	* patches/dev300/apply: adjusted for dev300-m40.  Radek, please check 
	this.


Added:
   trunk/patches/mono/mono-build-m39.diff   (props changed)
      - copied unchanged from r15184, /trunk/patches/mono/mono-build.diff
   trunk/patches/mono/mono-climaker-config-m39.diff   (props changed)
      - copied unchanged from r15184, /trunk/patches/mono/mono-climaker-config.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/mono/mono-build.diff
   trunk/patches/mono/mono-climaker-config.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 04:15:34 2009
@@ -1855,7 +1855,14 @@
 
 cli_ure-source-bootstrap-makefile-mk.diff, rodo
 cli_ure-mono-bridge.diff, rodo
+
+[ Mono <= dev300-m39 ]
+mono-build-m39.diff, rodo
+
+[ Mono > dev300-m39 ]
 mono-build.diff, rodo
+
+[ Mono ]
 build-mono-link.diff, jholesov
 # sign the output assembly using the key pair; it is needed to install
 # the versioned assemblies into the system Global Assembly Cache  (GAC)
@@ -1871,7 +1878,13 @@
 cli_ure-prj-build-lst.diff
 
 # climaker rewritten in C#
+[ Mono <= dev300-m39 ]
+mono-climaker-config-m39.diff
+
+[ Mono > dev300-m39 ]
 mono-climaker-config.diff
+
+[ Mono ]
 mono-climaker-bridgetest.diff
 
 [ VBAObjects ]

Modified: trunk/patches/mono/mono-build.diff
==============================================================================
--- trunk/patches/mono/mono-build.diff	(original)
+++ trunk/patches/mono/mono-build.diff	Wed Jan 28 04:15:34 2009
@@ -1,18 +1,139 @@
-Index: config_office/configure.in
-===================================================================
---- config_office/configure.in.orig	2006-01-08 20:48:38.000000000 +0100
-+++ config_office/configure.in	2006-01-08 20:48:45.000000000 +0100
-@@ -29,6 +29,9 @@ AC_ARG_WITH(gpc,
- [  --without-gpc           Use the internal polygon clipping code instead of
-                           the external GPC polygon clipping library.
- ],,if test ! -e ../external/gpc/gpc.c && test ! -e ../external/gpc/gpc.h; then without_gpc=yes; fi)
+diff --git cli_ure/prj/build.lst cli_ure/prj/build.lst
+index e6c1d83..7008a9d 100644
+--- cli_ure/prj/build.lst
++++ cli_ure/prj/build.lst
+@@ -2,13 +2,13 @@ ure	cli_ure	:	cppu cppuhelper sal codemaker stoc udkapi tools NULL
+ ure	cli_ure						usr1	-	all	ure_mkout NULL
+ ure	cli_ure\inc					nmake   -   all   ure_inc NULL
+ ure	cli_ure\version				nmake   -   all   ure_source_version ure_inc NULL
+-ure	cli_ure\source				nmake   -   w,vc7   ure_source_source ure_inc NULL
+-ure	cli_ure\source\basetypes	nmake	-	w,vc7	ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
+-ure	cli_ure\source\climaker		nmake	-	w,vc7	ure_source_climaker ure_source_basetypes.w ure_inc NULL
+-ure	cli_ure\unotypes			nmake	-	w,vc7	ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
+-ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
+-ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
++ure	cli_ure\source					nmake   -		all		ure_source_source ure_inc NULL
++ure	cli_ure\source\basetypes        nmake   -       all     ure_source_basetypes ure_source_version ure_source_source ure_inc NULL
++ure	cli_ure\source\bootstrap        nmake   -       u       ure_source_bootstrap ure_source_source ure_source_basetypes ure_inc NULL
++ure	cli_ure\source\climaker         nmake   -       all     ure_source_climaker ure_source_basetypes ure_inc NULL
++ure	cli_ure\unotypes				nmake   -       all     ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
++ure	cli_ure\source\ure				nmake   -       all     ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
++ure	cli_ure\source\uno_bridge		nmake	-		w,vc7	ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
+ ure	cli_ure\source\mono_bridge      nmake   -       u       ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
+-ure	cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
+-
+-#ure	cli_ure\util			nmake	-	w,vc7	ure_util ure_source_ure.w ure_source_native.w NULL
++ure	cli_ure\source\native           nmake   -       w,vc7   ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
++#ure	cli_ure\util                    nmake   -       w,vc7   ure_util ure_source_ure ure_source_native NULL
+diff --git cli_ure/prj/d.lst cli_ure/prj/d.lst
+index 261bb2c..56eab2d 100644
+--- cli_ure/prj/d.lst
++++ cli_ure/prj/d.lst
+@@ -3,6 +3,7 @@
+ ..\%__SRC%\bin\climaker.exe.config %_DEST%\bin%_EXT%\climaker.exe.config
+ 
+ ..\%__SRC%\bin\cli_*.dll %_DEST%\bin%_EXT%\cli_*.dll
++..\%__SRC%\lib\libcli*.so %_DEST%\lib%_EXT%\libcli*.so
+ ..\%__SRC%\bin\cli_*.pdb %_DEST%\bin%_EXT%\cli_*.pdb
+ ..\%__SRC%\bin\cli_*.config %_DEST%\bin%_EXT%\cli_*.config
+ ..\%__SRC%\bin\policy*.dll %_DEST%\bin%_EXT%\policy*.dll
+diff --git cli_ure/source/basetypes/makefile.mk cli_ure/source/basetypes/makefile.mk
+index 77def87..194c1c2 100644
+--- cli_ure/source/basetypes/makefile.mk
++++ cli_ure/source/basetypes/makefile.mk
+@@ -99,7 +99,7 @@ $(BIN)$/cli_basetypes.dll : $(CSFILES) $(BIN)$/cliureversion.mk
+ 
+ #do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.
+ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_basetypes.config
+-	$(WRAPCMD) AL.exe -out:$@ \
++	$(WRAPCMD) $(AL) -out:$@ \
+ 			-version:$(CLI_BASETYPES_POLICY_VERSION) \
+ 			-keyfile:$(BIN)$/cliuno.snk \
+ 			-link:$(BIN)$/cli_basetypes.config
+diff --git cli_ure/source/native/makefile.mk cli_ure/source/native/makefile.mk
+index 2e367b4..686f286 100644
+--- cli_ure/source/native/makefile.mk
++++ cli_ure/source/native/makefile.mk
+@@ -171,7 +171,7 @@ $(SIGN): $(SHL1TARGETN)
+ # cli_cppuhelper.dll but the system cannot locate it. It possibly assumes that the
+ # assembly is also 'MSIL'  like its policy file.
+ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
+-	$(WRAPCMD) AL.exe -out:$@ \
++	$(WRAPCMD) $(AL) -out:$@ \
+ 			-version:$(CLI_CPPUHELPER_POLICY_VERSION) \
+ 			-keyfile:$(BIN)$/cliuno.snk \
+ 			-link:$(BIN)$/cli_cppuhelper.config \
+@@ -179,7 +179,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
+ .ELSE
+ #.NET 1.1: platform flag not needed
+ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
+-	$(WRAPCMD) AL.exe -out:$@ \
++	$(WRAPCMD) $(AL) -out:$@ \
+ 			-version:$(CLI_CPPUHELPER_POLICY_VERSION) \
+ 			-keyfile:$(BIN)$/cliuno.snk \
+ 			-link:$(BIN)$/cli_cppuhelper.config		
+diff --git cli_ure/source/ure/makefile.mk cli_ure/source/ure/makefile.mk
+index b4c13f6..3698866 100644
+--- cli_ure/source/ure/makefile.mk
++++ cli_ure/source/ure/makefile.mk
+@@ -47,6 +47,7 @@ ECHOQUOTE='
+ .ELSE
+ ECHOQUOTE=
+ .ENDIF
++# ' emacs is a fool
+ 
+ .IF "$(BUILD_FOR_CLI)" != ""
+ 
+@@ -97,7 +98,7 @@ $(BIN)$/cli_ure.dll : $(CSFILES) $(BIN)$/cli_uretypes.dll $(BIN)$/cliureversion.
+ 
+ #do not forget to deliver cli_ure.config. It is NOT embedded in the policy file.
+ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_ure.config
+-	$(WRAPCMD) AL.exe -out:$@ \
++	$(WRAPCMD) $(AL) -out:$@ \
+ 			-version:$(CLI_URE_POLICY_VERSION) \
+ 			-keyfile:$(BIN)$/cliuno.snk \
+ 			-link:$(BIN)$/cli_ure.config
+diff --git cli_ure/util/makefile.pmk cli_ure/util/makefile.pmk
+index 9127092..a88a211 100644
+--- cli_ure/util/makefile.pmk
++++ cli_ure/util/makefile.pmk
+@@ -31,7 +31,7 @@
+ 
+ # no translation here anyway
+ .IF "$(L10N_framework)"==""
+-.IF "$(COM)" == "MSC"
++.IF "$(COM)$(COMEX)" == "MSC11" || "$(COM)$(COMEX)"== "MSC10" || "$(ENABLE_MONO)" == "YES"
+ BUILD_FOR_CLI = "true"
+ CFLAGSENABLESYMBOLS:=-Z7
+ .ENDIF
+diff --git cli_ure/util/target.pmk cli_ure/util/target.pmk
+index ca5b362..97ef85c 100644
+--- cli_ure/util/target.pmk
++++ cli_ure/util/target.pmk
+@@ -38,7 +38,7 @@ CSCFLAGS = -warnaserror+ -noconfig
+ .IF "$(product)" == ""
+ CSCFLAGS += -checked+ -define:DEBUG -define:TRACE
+ .ELSE
+-CSCFLAGS += -o
++CSCFLAGS += -optimize
+ .ENDIF
+ 
+ .ELSE # debug
+diff --git configure.in configure.in
+index 8cca6e6..70df4eb 100644
+--- configure.in
++++ configure.in
+@@ -33,6 +33,9 @@ AC_ARG_ENABLE(ldap,
+ [  --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
+                           or OpenLDAP LDAP SDK
+ ],,)
 +AC_ARG_ENABLE(mono,
 +[  --enable-mono           Enables the compilation of the Mono bindings
 +],,)
- AC_ARG_ENABLE(ldap,
- [  --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
-                           or OpenLDAP LDAP SDK
-@@ -1728,7 +1728,6 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
+ AC_ARG_WITH(openldap,
+ [  --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead
+                           of the Netscape/Mozilla one
+@@ -1816,7 +1819,6 @@ AC_SUBST(USE_MINGW)
  dnl ===================================================================
  dnl  .NET needs special treatment
  dnl ===================================================================
@@ -20,7 +141,7 @@
  if test "$COMEX" -ge "10"; then
  	dnl Check midl.exe
  	AC_PATH_PROG(MIDL_PATH, midl.exe)
-@@ -1779,6 +1779,8 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
+@@ -1873,6 +1875,8 @@ if test "$COMEX" -ge "10"; then
  	# Convert to posix path with 8.3 filename restrictions ( No spaces )
  	CSC_PATH=`cygpath -d "$CSC_PATH"`
  	CSC_PATH=`cygpath -u "$CSC_PATH"`
@@ -29,14 +150,13 @@
  
      dnl Check mscoree.lib / .NET Frameworks dir
      dnl For VS2003/2005 $with_frame_home has to point to the directory with lib/mscoree.lib.
-@@ -1407,10 +1412,60 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
+@@ -1906,9 +1910,59 @@ if test "$COMEX" -ge "10"; then
  	FRAME_HOME=`cygpath -u "$FRAME_HOME"`
  fi
  AC_SUBST(MIDL_PATH)
 -AC_SUBST(CSC_PATH)
  AC_SUBST(FRAME_HOME)
--fi
- 
++
 +if test "$_os" = "Linux"; then
 +	AC_MSG_CHECKING([whether to enable Mono bindings])
 +	CSC_PATH=
@@ -81,48 +201,21 @@
 +	else
 +		AC_MSG_RESULT([no])
 +	fi
-+fi
+ fi
 +AC_SUBST(CSC_PATH)
 +AC_SUBST(CSC)
 +AC_SUBST(AL)
 +AC_SUBST(ENABLE_MONO)
 +AC_SUBST(MONO_CFLAGS)
 +AC_SUBST(MONO_LIBS)
-+
+ 
  dnl ===================================================================
  dnl Check if stdc headers are available excluding windows.
- dnl ===================================================================
-Index: cli_ure/util/target.pmk
-===================================================================
---- cli_ure/util/target.pmk.orig	2006-01-08 20:48:38.000000000 +0100
-+++ cli_ure/util/target.pmk	2006-01-08 20:48:40.000000000 +0100
-@@ -42,7 +42,7 @@ CSCFLAGS = -warnaserror+ -incremental- -
- .IF "$(product)" == ""
- CSCFLAGS += -checked+ -define:DEBUG -define:TRACE
- .ELSE
--CSCFLAGS += -o
-+CSCFLAGS += -optimize
- .ENDIF
- 
- .ELSE # debug
-Index: cli_ure/util/makefile.pmk
-===================================================================
---- cli_ure/util/makefile.pmk.orig	2006-01-08 20:48:38.000000000 +0100
-+++ cli_ure/util/makefile.pmk	2006-01-08 20:48:40.000000000 +0100
-@@ -35,7 +35,7 @@
- 
- # no translation here anyway
- .IF "$(L10N_framework)"==""
--.IF "$(COM)" == "MSC"
-+.IF "$(COM)$(COMEX)" == "MSC11" || "$(COM)$(COMEX)"== "MSC10" || "$(ENABLE_MONO)" == "YES"
- BUILD_FOR_CLI = "true"
- CFLAGSENABLESYMBOLS:=-Z7
- .ENDIF
-Index: config_office/set_soenv.in
-===================================================================
---- config_office/set_soenv.in.orig	2006-01-08 20:48:38.000000000 +0100
-+++ config_office/set_soenv.in	2006-01-08 20:48:53.000000000 +0100
-@@ -1600,6 +1600,12 @@ ToFile( "MKDEPENDSOLVER",    "TRUE",    
+diff --git set_soenv.in set_soenv.in
+index 2e45ac7..2d51001 100644
+--- set_soenv.in
++++ set_soenv.in
+@@ -1764,6 +1764,12 @@ ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
  # (c = comment, e = environment variable, a = alias )
  ToFile( "Platform dependent constant values.", $empty, "c" );
  ToFile( "SOLAR_JAVA",        $SOLAR_JAVA,        "e" );
@@ -135,96 +228,3 @@
  ToFile( "BIG_SVX",           $BIG_SVX,           "e" );
  ToFile( "COM",               $COM,               "e" );
  ToFile( "COMPATH",           $COMPATH,           "e" );
-Index: cli_ure/prj/build.lst
-===================================================================
---- cli_ure/prj/build.lst       9 May 2007 13:29:37 -0000       1.11
-+++ cli_ure/prj/build.lst       4 Jul 2007 16:37:10 -0000
-@@ -2,13 +2,13 @@
- ure	cli_ure						usr1	-	all	ure_mkout NULL
- ure	cli_ure\inc					nmake   -   all   ure_inc NULL
- ure	cli_ure\version				nmake   -   all   ure_source_version ure_inc NULL
--ure	cli_ure\source				nmake   -   w,vc7   ure_source_source ure_inc NULL
--ure	cli_ure\source\basetypes	nmake	-	w,vc7	ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
--ure	cli_ure\source\climaker		nmake	-	w,vc7	ure_source_climaker ure_source_basetypes.w ure_inc NULL
--ure	cli_ure\unotypes			nmake	-	w,vc7	ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
--ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
--ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
--ure	cli_ure\source\mono_bridge      nmake   -       u       ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
--ure	cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
--
--#ure	cli_ure\util					nmake	-		w,vc7	ure_util ure_source_ure.w ure_source_native.w NULL
-+ure	cli_ure\source					nmake   -		all		ure_source_source ure_inc NULL
-+ure	cli_ure\source\basetypes        nmake   -       all     ure_source_basetypes ure_source_version ure_source_source ure_inc NULL
-+ure	cli_ure\source\bootstrap        nmake   -       u       ure_source_bootstrap ure_source_source ure_source_basetypes ure_inc NULL
-+ure	cli_ure\source\climaker         nmake   -       all     ure_source_climaker ure_source_basetypes ure_inc NULL
-+ure	cli_ure\unotypes				nmake   -       all     ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
-+ure	cli_ure\source\ure				nmake   -       all     ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
-+ure	cli_ure\source\uno_bridge		nmake	-		w,vc7	ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
-+ure	cli_ure\source\mono_bridge      nmake   -       u       ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
-+ure	cli_ure\source\native           nmake   -       w,vc7   ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
-+#ure	cli_ure\util                    nmake   -       w,vc7   ure_util ure_source_ure ure_source_native NULL
-
-Index: cli_ure/prj/d.lst
-===================================================================
---- cli_ure/prj/d.lst.orig	2006-01-08 20:48:38.000000000 +0100
-+++ cli_ure/prj/d.lst	2006-01-08 20:48:40.000000000 +0100
-@@ -3,6 +3,7 @@
- ..\%__SRC%\bin\climaker.exe.config %_DEST%\bin%_EXT%\climaker.exe.config
- 
- ..\%__SRC%\bin\cli_*.dll %_DEST%\bin%_EXT%\cli_*.dll
-+..\%__SRC%\lib\libcli*.so %_DEST%\lib%_EXT%\libcli*.so
- ..\%__SRC%\bin\cli_*.pdb %_DEST%\bin%_EXT%\cli_*.pdb
- ..\%__SRC%\bin\cli_*.config %_DEST%\bin%_EXT%\cli_*.config
- ..\%__SRC%\bin\policy*.dll %_DEST%\bin%_EXT%\policy*.dll
-Index: cli_ure/source/ure/makefile.mk
-===================================================================
---- cli_ure/source/ure/makefile.mk.orig	2006-01-08 20:42:24.000000000 +0100
-+++ cli_ure/source/ure/makefile.mk	2006-01-08 20:51:15.000000000 +0100
-@@ -50,6 +50,7 @@ ECHOQUOTE='
- .ELSE
- ECHOQUOTE=
- .ENDIF
-+# ' emacs is a fool
- 
- .IF "$(BUILD_FOR_CLI)" != ""
- 
-@@ -101,7 +101,7 @@ $(BIN)$/cli_ure.dll : $(CSFILES) $(BIN)$
- 
- #do not forget to deliver cli_ure.config. It is NOT embedded in the policy file.
- $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_ure.config
--	$(WRAPCMD) AL.exe -out:$@ \
-+	$(WRAPCMD) $(AL) -out:$@ \
- 			-version:$(CLI_URE_POLICY_VERSION) \
- 			-keyfile:$(BIN)$/cliuno.snk \
- 			-link:$(BIN)$/cli_ure.config
---- cli_ure/source/basetypes/makefile.mk	2006-03-09 11:51:45.000000000 +0100
-+++ cli_ure/source/basetypes/makefile.mk	2006-03-21 17:21:48.000000000 +0100
-@@ -103,7 +103,7 @@ $(BIN)$/cli_basetypes.dll : $(CSFILES) $
- 
- #do not forget to deliver cli_types.config. It is NOT embedded in the policy file.
- $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_basetypes.config
--	$(WRAPCMD) AL.exe -out:$@ \
-+	$(WRAPCMD) $(AL) -out:$@ \
- 			-version:$(CLI_BASETYPES_POLICY_VERSION) \
- 			-keyfile:$(BIN)$/cliuno.snk \
- 			-link:$(BIN)$/cli_basetypes.config
---- cli_ure/source/native/makefile.mk	2006-03-09 11:53:11.000000000 +0100
-+++ cli_ure/source/native/makefile.mk	2006-03-21 17:22:15.000000000 +0100
-@@ -160,15 +160,15 @@ $(BIN)$/cli_ure.dll : $(CSFILES) $(BIN)$
- .IF "$(CCNUMVER)" >= "001399999999"		
- #.NET 2 and higher	
- $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
--	$(WRAPCMD) AL.exe -out:$@ \
-+	$(WRAPCMD) $(AL) -out:$@ \
- 			-version:$(CLI_CPPUHELPER_POLICY_VERSION) \
- 			-keyfile:$(BIN)$/cliuno.snk \
- 			-link:$(BIN)$/cli_cppuhelper.config \
- 			-platform:x86
- .ELSE
- #.NET 1.1: platform flag not needed
- $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
--	$(WRAPCMD) AL.exe -out:$@ \
-+	$(WRAPCMD) $(AL) -out:$@ \
- 			-version:$(CLI_CPPUHELPER_POLICY_VERSION) \
- 			-keyfile:$(BIN)$/cliuno.snk \
- 			-link:$(BIN)$/cli_cppuhelper.config		

Modified: trunk/patches/mono/mono-climaker-config.diff
==============================================================================
--- trunk/patches/mono/mono-climaker-config.diff	(original)
+++ trunk/patches/mono/mono-climaker-config.diff	Wed Jan 28 04:15:34 2009
@@ -1,5 +1,5 @@
---- config_office-orig/configure.in	2007-02-16 15:26:16.000000000 +0100
-+++ config_office/configure.in	2007-02-20 10:39:18.000000000 +0100
+--- configure.in.old	2007-02-16 15:26:16.000000000 +0100
++++ configure.in	2007-02-20 10:39:18.000000000 +0100
 @@ -1693,6 +1693,21 @@ if test "$_os" = "Linux"; then
  		                "`echo $MCS_VERSION | cut -d"." -f3`" -ge "8"; then
  				ENABLE_MONO=YES
@@ -30,8 +30,8 @@
  
  dnl ===================================================================
  dnl Check if stdc headers are available excluding windows.
---- config_office-orig/set_soenv.in	2007-02-16 15:26:16.000000000 +0100
-+++ config_office/set_soenv.in	2007-02-20 10:39:18.000000000 +0100
+--- set_soenv.in.old	2007-02-16 15:26:16.000000000 +0100
++++ set_soenv.in	2007-02-20 10:39:18.000000000 +0100
 @@ -1630,6 +1627,7 @@ ToFile( "MKDEPENDSOLVER",    "TRUE",    
  ToFile( "Platform dependent constant values.", $empty, "c" );
  ToFile( "SOLAR_JAVA",        $SOLAR_JAVA,        "e" );
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]